Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/media/engine/webrtcvideoengine2_unittest.cc

Issue 1836043004: Cleanup the VideoAdapter (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed scale size 0. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/media/engine/webrtcvideoengine2.h ('K') | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/webrtcvideoengine2_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
index a8d743e1d57319a18d50b0f77501234ce5eedc5b..c9fe3fdaf552b8b5ed0ce16aea929557ccc36bd3 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -2012,29 +2012,99 @@ TEST_F(WebRtcVideoChannel2Test, AdaptsOnOveruseAndChangeResolution) {
EXPECT_EQ(1280 * 2 / 4, send_stream->GetLastWidth());
EXPECT_EQ(720 * 2 / 4, send_stream->GetLastHeight());
+ // Trigger overuse again. This should not decrease the resolution since we
+ // should only adapt the resolution down max two steps.
+ overuse_callback->OnLoadUpdate(webrtc::LoadObserver::kOveruse);
+ EXPECT_TRUE(capturer.CaptureCustomFrame(1280, 720, cricket::FOURCC_I420));
+ EXPECT_EQ(4, send_stream->GetNumberOfSwappedFrames());
+ EXPECT_EQ(1280 * 2 / 4, send_stream->GetLastWidth());
+ EXPECT_EQ(720 * 2 / 4, send_stream->GetLastHeight());
+
// Change input resolution.
EXPECT_TRUE(capturer.CaptureCustomFrame(1284, 724, cricket::FOURCC_I420));
- EXPECT_EQ(4, send_stream->GetNumberOfSwappedFrames());
+ EXPECT_EQ(5, send_stream->GetNumberOfSwappedFrames());
EXPECT_EQ(1284 / 2, send_stream->GetLastWidth());
EXPECT_EQ(724 / 2, send_stream->GetLastHeight());
// Trigger underuse which should go back up in resolution.
overuse_callback->OnLoadUpdate(webrtc::LoadObserver::kUnderuse);
EXPECT_TRUE(capturer.CaptureCustomFrame(1284, 724, cricket::FOURCC_I420));
- EXPECT_EQ(5, send_stream->GetNumberOfSwappedFrames());
+ EXPECT_EQ(6, send_stream->GetNumberOfSwappedFrames());
EXPECT_EQ(1284 * 3 / 4, send_stream->GetLastWidth());
EXPECT_EQ(724 * 3 / 4, send_stream->GetLastHeight());
// Trigger underuse which should go back up in resolution.
overuse_callback->OnLoadUpdate(webrtc::LoadObserver::kUnderuse);
EXPECT_TRUE(capturer.CaptureCustomFrame(1284, 724, cricket::FOURCC_I420));
- EXPECT_EQ(6, send_stream->GetNumberOfSwappedFrames());
+ EXPECT_EQ(7, send_stream->GetNumberOfSwappedFrames());
EXPECT_EQ(1284, send_stream->GetLastWidth());
EXPECT_EQ(724, send_stream->GetLastHeight());
EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, NULL));
}
+TEST_F(WebRtcVideoChannel2Test, AdaptsOnOveruseAndSwitchToScreenShare) {
+ cricket::VideoCodec codec = kVp8Codec720p;
+ cricket::VideoSendParameters parameters;
+ parameters.codecs.push_back(codec);
+
+ MediaConfig media_config = MediaConfig();
+ channel_.reset(
+ engine_.CreateChannel(fake_call_.get(), media_config, VideoOptions()));
+ ASSERT_TRUE(channel_->SetSendParameters(parameters));
+
+ AddSendStream();
+
+ cricket::FakeVideoCapturer capturer;
+ ASSERT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
+ ASSERT_EQ(cricket::CS_RUNNING,
+ capturer.Start(capturer.GetSupportedFormats()->front()));
+ ASSERT_TRUE(channel_->SetSend(true));
+ cricket::VideoOptions camera_options;
+ channel_->SetVideoSend(last_ssrc_, true /* enable */, &camera_options);
+
+ ASSERT_EQ(1u, fake_call_->GetVideoSendStreams().size());
+ FakeVideoSendStream* send_stream = fake_call_->GetVideoSendStreams().front();
+ webrtc::LoadObserver* overuse_callback =
+ send_stream->GetConfig().overuse_callback;
+ ASSERT_TRUE(overuse_callback != NULL);
+
+ EXPECT_TRUE(capturer.CaptureCustomFrame(1280, 720, cricket::FOURCC_I420));
+ EXPECT_EQ(1, send_stream->GetNumberOfSwappedFrames());
+ EXPECT_EQ(1280, send_stream->GetLastWidth());
+ EXPECT_EQ(720, send_stream->GetLastHeight());
+
+ // Trigger overuse.
+ overuse_callback->OnLoadUpdate(webrtc::LoadObserver::kOveruse);
+ EXPECT_TRUE(capturer.CaptureCustomFrame(1280, 720, cricket::FOURCC_I420));
+ EXPECT_EQ(2, send_stream->GetNumberOfSwappedFrames());
+ EXPECT_EQ(1280 * 3 / 4, send_stream->GetLastWidth());
+ EXPECT_EQ(720 * 3 / 4, send_stream->GetLastHeight());
+
+ // Switch to screen share. Expect no CPU adaptation.
+ cricket::FakeVideoCapturer screen_share(true);
+ ASSERT_EQ(cricket::CS_RUNNING,
+ screen_share.Start(screen_share.GetSupportedFormats()->front()));
+ ASSERT_TRUE(channel_->SetCapturer(last_ssrc_, &screen_share));
+ cricket::VideoOptions screenshare_options;
+ screenshare_options.is_screencast = rtc::Optional<bool>(true);
+ channel_->SetVideoSend(last_ssrc_, true /* enable */, &screenshare_options);
+ EXPECT_TRUE(screen_share.CaptureCustomFrame(1284, 724, cricket::FOURCC_I420));
+ EXPECT_EQ(3, send_stream->GetNumberOfSwappedFrames());
+ EXPECT_EQ(1284, send_stream->GetLastWidth());
+ EXPECT_EQ(724, send_stream->GetLastHeight());
+
+ // Switch back to the normal capturer. Expect the frame to be CPU adapted.
+ ASSERT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
+ channel_->SetVideoSend(last_ssrc_, true /* enable */, &camera_options);
+ EXPECT_TRUE(capturer.CaptureCustomFrame(1280, 720, cricket::FOURCC_I420));
+ EXPECT_EQ(4, send_stream->GetNumberOfSwappedFrames());
+ EXPECT_EQ(1280 * 3 / 4, send_stream->GetLastWidth());
+ EXPECT_EQ(720 * 3 / 4, send_stream->GetLastHeight());
+
+ EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, NULL));
+}
+
void WebRtcVideoChannel2Test::TestCpuAdaptation(bool enable_overuse,
bool is_screenshare) {
cricket::VideoCodec codec = kVp8Codec720p;
@@ -2759,8 +2829,7 @@ TEST_F(WebRtcVideoChannel2Test, GetStatsTracksAdaptationStats) {
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
EXPECT_EQ(1, info.senders[0].adapt_changes);
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_CPU,
- info.senders[0].adapt_reason);
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_CPU, info.senders[0].adapt_reason);
// Trigger upgrade and verify that we adapt back up to VGA.
overuse_callback->OnLoadUpdate(webrtc::LoadObserver::kUnderuse);
@@ -2769,7 +2838,7 @@ TEST_F(WebRtcVideoChannel2Test, GetStatsTracksAdaptationStats) {
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
EXPECT_EQ(2, info.senders[0].adapt_changes);
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_NONE,
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_NONE,
info.senders[0].adapt_reason);
// No capturer (no adapter). Adapt changes from old adapter should be kept.
@@ -2778,7 +2847,7 @@ TEST_F(WebRtcVideoChannel2Test, GetStatsTracksAdaptationStats) {
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
EXPECT_EQ(2, info.senders[0].adapt_changes);
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_NONE,
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_NONE,
info.senders[0].adapt_reason);
// Set new capturer, capture format HD.
@@ -2795,8 +2864,7 @@ TEST_F(WebRtcVideoChannel2Test, GetStatsTracksAdaptationStats) {
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
EXPECT_EQ(3, info.senders[0].adapt_changes);
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_CPU,
- info.senders[0].adapt_reason);
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_CPU, info.senders[0].adapt_reason);
EXPECT_TRUE(channel_->SetCapturer(kSsrcs3[0], NULL));
}
@@ -2831,8 +2899,7 @@ TEST_F(WebRtcVideoChannel2Test, GetStatsTracksAdaptationAndBandwidthStats) {
cricket::VideoMediaInfo info;
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_CPU,
- info.senders[0].adapt_reason);
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_CPU, info.senders[0].adapt_reason);
// Set bandwidth limitation stats for the stream -> adapt CPU + BW.
webrtc::VideoSendStream::Stats stats;
@@ -2841,8 +2908,8 @@ TEST_F(WebRtcVideoChannel2Test, GetStatsTracksAdaptationAndBandwidthStats) {
info.Clear();
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_CPU +
- CoordinatedVideoAdapter::ADAPTREASON_BANDWIDTH,
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_CPU +
+ WebRtcVideoChannel2::ADAPTREASON_BANDWIDTH,
nisse-webrtc 2016/04/04 06:54:18 Prefer | over +, if the intention is to or togethe
perkj_webrtc 2016/04/04 07:13:26 Done.
info.senders[0].adapt_reason);
// Trigger upgrade -> adapt BW.
@@ -2851,7 +2918,7 @@ TEST_F(WebRtcVideoChannel2Test, GetStatsTracksAdaptationAndBandwidthStats) {
info.Clear();
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_BANDWIDTH,
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_BANDWIDTH,
info.senders[0].adapt_reason);
// Reset bandwidth limitation state -> adapt NONE.
@@ -2860,7 +2927,7 @@ TEST_F(WebRtcVideoChannel2Test, GetStatsTracksAdaptationAndBandwidthStats) {
info.Clear();
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_NONE,
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_NONE,
info.senders[0].adapt_reason);
EXPECT_TRUE(channel_->SetCapturer(kSsrcs3[0], NULL));
@@ -2876,7 +2943,7 @@ TEST_F(WebRtcVideoChannel2Test,
cricket::VideoMediaInfo info;
EXPECT_TRUE(channel_->GetStats(&info));
ASSERT_EQ(1U, info.senders.size());
- EXPECT_EQ(CoordinatedVideoAdapter::ADAPTREASON_BANDWIDTH,
+ EXPECT_EQ(WebRtcVideoChannel2::ADAPTREASON_BANDWIDTH,
info.senders[0].adapt_reason);
}
« webrtc/media/engine/webrtcvideoengine2.h ('K') | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698