Reason for revert: Relanding after known downstream breakages have been fixed. Original issue's description: > Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (patchset #7 id:120001 of https://codereview.webrtc.org/2383093002/ ) > > Reason for revert: > Breaks chrome, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/19019/steps/compile/logs/stdio > > Analysis: Chrome uses cricket::VideoFrame, without explicitly including webrtc/media/base/videoframe.h, and breaks when that file is no longer included by any other webrtc headers. Will reland after updating Chrome. > > Original issue's description: > > Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. > > > > Replaced with webrtc::VideoFrame. > > > > TBR=mflodman@webrtc.org > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/45c8b8940042bd2574c39920804ade8343cefdba > > Cr-Commit-Position: refs/heads/master@{#14885} > > TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@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/7341ab8e2505c9763d208e069bda269018357e7d > Cr-Commit-Position: refs/heads/master@{#14886} TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2487633002 Cr-Commit-Position: refs/heads/master@{#15039}
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/video_frame.h"
|
|
|
|
using rtc::VideoBroadcaster;
|
|
using rtc::VideoSinkWants;
|
|
using cricket::FakeVideoRenderer;
|
|
|
|
|
|
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());
|
|
|
|
webrtc::VideoFrame 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;
|
|
wants2.black_frames = false;
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
|
|
rtc::scoped_refptr<webrtc::I420Buffer> buffer(
|
|
new rtc::RefCountedObject<webrtc::I420Buffer>(100, 200));
|
|
// Makes it not all black.
|
|
buffer->InitializeData();
|
|
|
|
webrtc::VideoFrame frame1(buffer, webrtc::kVideoRotation_0,
|
|
10 /* timestamp_us */);
|
|
broadcaster.OnFrame(frame1);
|
|
EXPECT_TRUE(sink1.black_frame());
|
|
EXPECT_EQ(10, sink1.timestamp_us());
|
|
EXPECT_FALSE(sink2.black_frame());
|
|
EXPECT_EQ(10, sink2.timestamp_us());
|
|
|
|
// Switch the sink wants.
|
|
wants1.black_frames = false;
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
wants2.black_frames = true;
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
|
|
webrtc::VideoFrame frame2(buffer, webrtc::kVideoRotation_0,
|
|
30 /* timestamp_us */);
|
|
broadcaster.OnFrame(frame2);
|
|
EXPECT_FALSE(sink1.black_frame());
|
|
EXPECT_EQ(30, sink1.timestamp_us());
|
|
EXPECT_TRUE(sink2.black_frame());
|
|
EXPECT_EQ(30, sink2.timestamp_us());
|
|
}
|