Reason for revert: Chrome has been updated, cl https://codereview.chromium.org/1919283005/ Original issue's description: > Revert of Delete cricket::VideoFrame methods GetYPlane and GetYPitch. (patchset #5 id:80001 of https://codereview.webrtc.org/1901973002/ ) > > Reason for revert: > GetYPlane, GetYPitch etc is used by Chromium. > > Original issue's description: > > Delete cricket::VideoFrame methods GetYPlane and GetYPitch. > > > > (And similarly for U and V). Also change video_frame_buffer method to > > return a const ref to a scoped_ref_ptr. > > > > This cl is analogous to https://codereview.webrtc.org/1900673002/, > > which delete corresponding methods in webrtc::VideoFrame. > > > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/1c27c6bf4cf0476dd2f09425509afaae4cdfe599 > > Cr-Commit-Position: refs/heads/master@{#12492} > > TBR=magjed@webrtc.org,perkj@webrtc.org,pbos@webrtc.org,pthatcher@webrtc.org,nisse@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5682 > > Committed: https://crrev.com/b05f994bb6f3055c852891c8acb531aee916a668 > Cr-Commit-Position: refs/heads/master@{#12494} TBR=magjed@webrtc.org,perkj@webrtc.org,pbos@webrtc.org,pthatcher@webrtc.org,terelius@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/1923903002 Cr-Commit-Position: refs/heads/master@{#12559}
163 lines
5.0 KiB
C++
163 lines
5.0 KiB
C++
/*
|
|
* Copyright 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/base/gunit.h"
|
|
#include "webrtc/media/base/fakevideorenderer.h"
|
|
#include "webrtc/media/base/videobroadcaster.h"
|
|
#include "webrtc/media/engine/webrtcvideoframe.h"
|
|
|
|
using rtc::VideoBroadcaster;
|
|
using rtc::VideoSinkWants;
|
|
using cricket::FakeVideoRenderer;
|
|
using cricket::WebRtcVideoFrame;
|
|
|
|
|
|
TEST(VideoBroadcasterTest, frame_wanted) {
|
|
VideoBroadcaster broadcaster;
|
|
EXPECT_FALSE(broadcaster.frame_wanted());
|
|
|
|
FakeVideoRenderer sink;
|
|
broadcaster.AddOrUpdateSink(&sink, rtc::VideoSinkWants());
|
|
EXPECT_TRUE(broadcaster.frame_wanted());
|
|
|
|
broadcaster.RemoveSink(&sink);
|
|
EXPECT_FALSE(broadcaster.frame_wanted());
|
|
}
|
|
|
|
TEST(VideoBroadcasterTest, OnFrame) {
|
|
VideoBroadcaster broadcaster;
|
|
|
|
FakeVideoRenderer sink1;
|
|
FakeVideoRenderer sink2;
|
|
broadcaster.AddOrUpdateSink(&sink1, rtc::VideoSinkWants());
|
|
broadcaster.AddOrUpdateSink(&sink2, rtc::VideoSinkWants());
|
|
|
|
WebRtcVideoFrame frame;
|
|
|
|
broadcaster.OnFrame(frame);
|
|
EXPECT_EQ(1, sink1.num_rendered_frames());
|
|
EXPECT_EQ(1, sink2.num_rendered_frames());
|
|
|
|
broadcaster.RemoveSink(&sink1);
|
|
broadcaster.OnFrame(frame);
|
|
EXPECT_EQ(1, sink1.num_rendered_frames());
|
|
EXPECT_EQ(2, sink2.num_rendered_frames());
|
|
|
|
broadcaster.AddOrUpdateSink(&sink1, rtc::VideoSinkWants());
|
|
broadcaster.OnFrame(frame);
|
|
EXPECT_EQ(2, sink1.num_rendered_frames());
|
|
EXPECT_EQ(3, sink2.num_rendered_frames());
|
|
}
|
|
|
|
TEST(VideoBroadcasterTest, AppliesRotationIfAnySinkWantsRotationApplied) {
|
|
VideoBroadcaster broadcaster;
|
|
EXPECT_FALSE(broadcaster.wants().rotation_applied);
|
|
|
|
FakeVideoRenderer sink1;
|
|
VideoSinkWants wants1;
|
|
wants1.rotation_applied = false;
|
|
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
EXPECT_FALSE(broadcaster.wants().rotation_applied);
|
|
|
|
FakeVideoRenderer sink2;
|
|
VideoSinkWants wants2;
|
|
wants2.rotation_applied = true;
|
|
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
EXPECT_TRUE(broadcaster.wants().rotation_applied);
|
|
|
|
broadcaster.RemoveSink(&sink2);
|
|
EXPECT_FALSE(broadcaster.wants().rotation_applied);
|
|
}
|
|
|
|
TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxPixelCount) {
|
|
VideoBroadcaster broadcaster;
|
|
EXPECT_TRUE(!broadcaster.wants().max_pixel_count);
|
|
|
|
FakeVideoRenderer sink1;
|
|
VideoSinkWants wants1;
|
|
wants1.max_pixel_count = rtc::Optional<int>(1280 * 720);
|
|
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
EXPECT_EQ(1280 * 720, *broadcaster.wants().max_pixel_count);
|
|
|
|
FakeVideoRenderer sink2;
|
|
VideoSinkWants wants2;
|
|
wants2.max_pixel_count = rtc::Optional<int>(640 * 360);
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
EXPECT_EQ(640 * 360, *broadcaster.wants().max_pixel_count);
|
|
|
|
broadcaster.RemoveSink(&sink2);
|
|
EXPECT_EQ(1280 * 720, *broadcaster.wants().max_pixel_count);
|
|
}
|
|
|
|
TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxPixelCountStepUp) {
|
|
VideoBroadcaster broadcaster;
|
|
EXPECT_TRUE(!broadcaster.wants().max_pixel_count_step_up);
|
|
|
|
FakeVideoRenderer sink1;
|
|
VideoSinkWants wants1;
|
|
wants1.max_pixel_count_step_up = rtc::Optional<int>(1280 * 720);
|
|
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
EXPECT_EQ(1280 * 720, *broadcaster.wants().max_pixel_count_step_up);
|
|
|
|
FakeVideoRenderer sink2;
|
|
VideoSinkWants wants2;
|
|
wants2.max_pixel_count_step_up = rtc::Optional<int>(640 * 360);
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
EXPECT_EQ(640 * 360, *broadcaster.wants().max_pixel_count_step_up);
|
|
|
|
broadcaster.RemoveSink(&sink2);
|
|
EXPECT_EQ(1280 * 720, *broadcaster.wants().max_pixel_count_step_up);
|
|
}
|
|
|
|
TEST(VideoBroadcasterTest, SinkWantsBlackFrames) {
|
|
VideoBroadcaster broadcaster;
|
|
EXPECT_TRUE(!broadcaster.wants().black_frames);
|
|
|
|
FakeVideoRenderer sink1;
|
|
VideoSinkWants wants1;
|
|
wants1.black_frames = true;
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
|
|
FakeVideoRenderer sink2;
|
|
VideoSinkWants wants2;
|
|
wants1.black_frames = false;
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
|
|
cricket::WebRtcVideoFrame frame1;
|
|
frame1.InitToBlack(100, 200, 10000 /*ts*/);
|
|
// Make it not all-black
|
|
frame1.video_frame_buffer()->MutableDataU()[0] = 0;
|
|
broadcaster.OnFrame(frame1);
|
|
EXPECT_TRUE(sink1.black_frame());
|
|
EXPECT_EQ(10000, sink1.timestamp());
|
|
EXPECT_FALSE(sink2.black_frame());
|
|
EXPECT_EQ(10000, sink2.timestamp());
|
|
|
|
// Switch the sink wants.
|
|
wants1.black_frames = false;
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
wants2.black_frames = true;
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
|
|
cricket::WebRtcVideoFrame frame2;
|
|
frame2.InitToBlack(100, 200, 30000 /*ts*/);
|
|
// Make it not all-black
|
|
frame2.video_frame_buffer()->MutableDataU()[0] = 0;
|
|
broadcaster.OnFrame(frame2);
|
|
EXPECT_FALSE(sink1.black_frame());
|
|
EXPECT_EQ(30000, sink1.timestamp());
|
|
EXPECT_TRUE(sink2.black_frame());
|
|
EXPECT_EQ(30000, sink2.timestamp());
|
|
}
|