Reason for revert: Chrome has now been updated (cl https://codereview.chromium.org/2317673002/). Original issue's description: > Revert of Delete cricket::VideoFrame::GetTimeStamp. (patchset #2 id:150001 of https://codereview.webrtc.org/2310043002/ ) > > Reason for revert: > Broke Chrome fyi bots. See, e.g., > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win%20Builder/builds/6730/steps/compile/logs/stdio > > Use of GetTimeStamp must be eliminated in Chrome before relanding. > > Original issue's description: > > Reland of Delete cricket::VideoFrame::GetTimeStamp. (patchset #1 id:1 of https://codereview.webrtc.org/2306953002/ ) > > > > Reason for revert: > > Will reland after downstream projects are updated. > > > > Original issue's description: > > > Revert of Delete cricket::VideoFrame::GetTimeStamp. (patchset #1 id:1 of https://codereview.webrtc.org/2305623002/ ) > > > > > > Reason for revert: > > > Broke downstream project. > > > > > > Original issue's description: > > > > Delete cricket::VideoFrame::GetTimeStamp. > > > > > > > > TBR=tkchin@webrtc.org # Trivial change to VideoRendererAdapter > > > > BUG=webrtc:5682 > > > > > > > > Committed: https://crrev.com/fd6c99e43137d01fa6c120f7160f7c2999d1d8a3 > > > > Cr-Commit-Position: refs/heads/master@{#14037} > > > > > > TBR=perkj@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/bca69e87de5df290f728833a4b3d8af3ae5d88e6 > > > Cr-Commit-Position: refs/heads/master@{#14038} > > > > TBR=perkj@webrtc.org > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/fa1ba19c5c7c57c8d16fae1a5da51877770fd53e > > Cr-Commit-Position: refs/heads/master@{#14089} > > TBR=perkj@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/92b2e0852fcbe7765926755ccee884db965b6231 > Cr-Commit-Position: refs/heads/master@{#14090} TBR=perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2316493003 Cr-Commit-Position: refs/heads/master@{#14093}
164 lines
5.1 KiB
C++
164 lines
5.1 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;
|
|
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();
|
|
|
|
cricket::WebRtcVideoFrame frame1(buffer, webrtc::kVideoRotation_0,
|
|
10 /* timestamp_us */, 0 /* frame_id */);
|
|
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);
|
|
|
|
cricket::WebRtcVideoFrame frame2(buffer, webrtc::kVideoRotation_0,
|
|
30 /* timestamp_us */, 0 /* frame_id */);
|
|
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());
|
|
}
|