Reason for revert: Seem to be a flaky test rather than an issue with this cl. Creating reland, will add code to reduce flakiness to that test. Original issue's description: > Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #8 id:410001 of https://codereview.webrtc.org/2781433002/ ) > > Reason for revert: > This has resulted in failure of CallPerfTest.ReceivesCpuOveruseAndUnderuse test on the Win7 build bot https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1780 > > Original issue's description: > > Reland of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #1 id:1 of https://codereview.webrtc.org/2764133002/ ) > > > > Reason for revert: > > Found issue with test case, will add fix to reland cl. > > > > Original issue's description: > > > Revert of Add framerate to VideoSinkWants and ability to signal on overuse (patchset #14 id:250001 of https://codereview.webrtc.org/2716643002/ ) > > > > > > Reason for revert: > > > Breaks perf tests: > > > https://build.chromium.org/p/client.webrtc.perf/builders/Win7/builds/1679 > > > https://build.chromium.org/p/client.webrtc.perf/builders/Android32%20Tests%20%28L%20Nexus5%29/builds/2325 > > > > > > Original issue's description: > > > > Add framerate to VideoSinkWants and ability to signal on overuse > > > > > > > > In ViEEncoder, try to reduce framerate instead of resolution if the > > > > current degradation preference is maintain-resolution rather than > > > > balanced. > > > > > > > > BUG=webrtc:4172 > > > > > > > > Review-Url: https://codereview.webrtc.org/2716643002 > > > > Cr-Commit-Position: refs/heads/master@{#17327} > > > > Committed:72acf25261> > > > > > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,sprang@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:4172 > > > > > > Review-Url: https://codereview.webrtc.org/2764133002 > > > Cr-Commit-Position: refs/heads/master@{#17331} > > > Committed:8b45b11144> > > > TBR=nisse@webrtc.org,magjed@webrtc.org,kthelgason@webrtc.org,ilnik@webrtc.org,stefan@webrtc.org,skvlad@webrtc.org > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > BUG=webrtc:4172 > > > > Review-Url: https://codereview.webrtc.org/2781433002 > > Cr-Commit-Position: refs/heads/master@{#17474} > > Committed:3ea3c77e93> > TBR=ilnik@webrtc.org,stefan@webrtc.org,asapersson@webrtc.org,sprang@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:4172 > > Review-Url: https://codereview.webrtc.org/2783183003 > Cr-Commit-Position: refs/heads/master@{#17477} > Committed:f9ed235c9bR=ilnik@webrtc.org,stefan@webrtc.org BUG=webrtc:4172 Review-Url: https://codereview.webrtc.org/2789823002 Cr-Commit-Position: refs/heads/master@{#17498}
194 lines
6.0 KiB
C++
194 lines
6.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/api/video/i420_buffer.h"
|
|
#include "webrtc/api/video/video_frame.h"
|
|
#include "webrtc/base/gunit.h"
|
|
#include "webrtc/media/base/fakevideorenderer.h"
|
|
#include "webrtc/media/base/videobroadcaster.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());
|
|
static int kWidth = 100;
|
|
static int kHeight = 50;
|
|
|
|
rtc::scoped_refptr<webrtc::I420Buffer> buffer(
|
|
webrtc::I420Buffer::Create(kWidth, kHeight));
|
|
// Initialize, to avoid warnings on use of initialized values.
|
|
webrtc::I420Buffer::SetBlack(buffer);
|
|
|
|
webrtc::VideoFrame frame(buffer, webrtc::kVideoRotation_0, 0);
|
|
|
|
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_EQ(std::numeric_limits<int>::max(),
|
|
broadcaster.wants().max_pixel_count);
|
|
|
|
FakeVideoRenderer sink1;
|
|
VideoSinkWants wants1;
|
|
wants1.max_pixel_count = 1280 * 720;
|
|
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
EXPECT_EQ(1280 * 720, broadcaster.wants().max_pixel_count);
|
|
|
|
FakeVideoRenderer sink2;
|
|
VideoSinkWants wants2;
|
|
wants2.max_pixel_count = 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, AppliesMinOfSinkWantsMaxAndTargetPixelCount) {
|
|
VideoBroadcaster broadcaster;
|
|
EXPECT_TRUE(!broadcaster.wants().target_pixel_count);
|
|
|
|
FakeVideoRenderer sink1;
|
|
VideoSinkWants wants1;
|
|
wants1.target_pixel_count = rtc::Optional<int>(1280 * 720);
|
|
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
EXPECT_EQ(1280 * 720, *broadcaster.wants().target_pixel_count);
|
|
|
|
FakeVideoRenderer sink2;
|
|
VideoSinkWants wants2;
|
|
wants2.target_pixel_count = rtc::Optional<int>(640 * 360);
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
EXPECT_EQ(640 * 360, *broadcaster.wants().target_pixel_count);
|
|
|
|
broadcaster.RemoveSink(&sink2);
|
|
EXPECT_EQ(1280 * 720, *broadcaster.wants().target_pixel_count);
|
|
}
|
|
|
|
TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxFramerate) {
|
|
VideoBroadcaster broadcaster;
|
|
EXPECT_EQ(std::numeric_limits<int>::max(),
|
|
broadcaster.wants().max_framerate_fps);
|
|
|
|
FakeVideoRenderer sink1;
|
|
VideoSinkWants wants1;
|
|
wants1.max_framerate_fps = 30;
|
|
|
|
broadcaster.AddOrUpdateSink(&sink1, wants1);
|
|
EXPECT_EQ(30, broadcaster.wants().max_framerate_fps);
|
|
|
|
FakeVideoRenderer sink2;
|
|
VideoSinkWants wants2;
|
|
wants2.max_framerate_fps = 15;
|
|
broadcaster.AddOrUpdateSink(&sink2, wants2);
|
|
EXPECT_EQ(15, broadcaster.wants().max_framerate_fps);
|
|
|
|
broadcaster.RemoveSink(&sink2);
|
|
EXPECT_EQ(30, broadcaster.wants().max_framerate_fps);
|
|
}
|
|
|
|
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(
|
|
webrtc::I420Buffer::Create(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());
|
|
}
|