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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2_unittest.cc

Issue 1193513006: In screenshare mode, suppress VP8 bitrate overshoot and increase quality (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 1431
1432 EXPECT_EQ(capture_format_hd.width, encoder_config.streams.front().width); 1432 EXPECT_EQ(capture_format_hd.width, encoder_config.streams.front().width);
1433 EXPECT_EQ(capture_format_hd.height, encoder_config.streams.front().height); 1433 EXPECT_EQ(capture_format_hd.height, encoder_config.streams.front().height);
1434 EXPECT_TRUE(encoder_config.streams[0].temporal_layer_thresholds_bps.empty()); 1434 EXPECT_TRUE(encoder_config.streams[0].temporal_layer_thresholds_bps.empty());
1435 1435
1436 EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, NULL)); 1436 EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, NULL));
1437 } 1437 }
1438 1438
1439 TEST_F(WebRtcVideoChannel2Test, 1439 TEST_F(WebRtcVideoChannel2Test,
1440 ConferenceModeScreencastConfiguresTemporalLayer) { 1440 ConferenceModeScreencastConfiguresTemporalLayer) {
1441 static const int kConferenceScreencastTemporalBitrateBps = 100000; 1441 static const int kConferenceScreencastTemporalBitrateBps =
1442 ScreenshareLayerConfig::GetDefault().tl0_bitrate_kbps * 1000;
1442 VideoOptions options; 1443 VideoOptions options;
1443 options.conference_mode.Set(true); 1444 options.conference_mode.Set(true);
1444 channel_->SetOptions(options); 1445 channel_->SetOptions(options);
1445 1446
1446 AddSendStream(); 1447 AddSendStream();
1447 1448
1448 cricket::FakeVideoCapturer capturer; 1449 cricket::FakeVideoCapturer capturer;
1449 capturer.SetScreencast(true); 1450 capturer.SetScreencast(true);
1450 EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer)); 1451 EXPECT_TRUE(channel_->SetCapturer(last_ssrc_, &capturer));
1451 cricket::VideoFormat capture_format_hd = 1452 cricket::VideoFormat capture_format_hd =
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
3024 // Ensures that the correct settings are applied to the codec when two temporal 3025 // Ensures that the correct settings are applied to the codec when two temporal
3025 // layer screencasting is enabled, and that the correct simulcast settings are 3026 // layer screencasting is enabled, and that the correct simulcast settings are
3026 // reapplied when disabling screencasting. 3027 // reapplied when disabling screencasting.
3027 TEST_F(WebRtcVideoChannel2SimulcastTest, 3028 TEST_F(WebRtcVideoChannel2SimulcastTest,
3028 DISABLED_TwoTemporalLayerScreencastSettings) { 3029 DISABLED_TwoTemporalLayerScreencastSettings) {
3029 // TODO(pbos): Implement. 3030 // TODO(pbos): Implement.
3030 FAIL() << "Not implemented."; 3031 FAIL() << "Not implemented.";
3031 } 3032 }
3032 3033
3033 } // namespace cricket 3034 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/media/webrtc/simulcast.cc ('k') | webrtc/modules/video_coding/codecs/interface/video_error_codes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698