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

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

Issue 2623513002: Explicitly only add transport-cc RTCP feedback param to default FlexFEC codec. (Closed)
Patch Set: Rebase. Created 3 years, 11 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
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 2352 matching lines...) Expand 10 before | Expand all | Expand 10 after
2363 // tests that use this test fixture into the corresponding "non-field trial" 2363 // tests that use this test fixture into the corresponding "non-field trial"
2364 // tests. 2364 // tests.
2365 class WebRtcVideoChannel2FlexfecTest : public WebRtcVideoChannel2Test { 2365 class WebRtcVideoChannel2FlexfecTest : public WebRtcVideoChannel2Test {
2366 public: 2366 public:
2367 WebRtcVideoChannel2FlexfecTest() 2367 WebRtcVideoChannel2FlexfecTest()
2368 : WebRtcVideoChannel2Test("WebRTC-FlexFEC-03/Enabled/") {} 2368 : WebRtcVideoChannel2Test("WebRTC-FlexFEC-03/Enabled/") {}
2369 }; 2369 };
2370 2370
2371 // TODO(brandtr): Merge into "non-field trial" test when FlexFEC is enabled 2371 // TODO(brandtr): Merge into "non-field trial" test when FlexFEC is enabled
2372 // by default. 2372 // by default.
2373 TEST_F(WebRtcVideoChannel2FlexfecTest,
2374 DefaultFlexfecCodecHasTransportCcAndRembFeedbackParam) {
2375 EXPECT_TRUE(cricket::HasTransportCc(GetEngineCodec("flexfec-03")));
2376 EXPECT_TRUE(cricket::HasRemb(GetEngineCodec("flexfec-03")));
2377 }
2378
2379 // TODO(brandtr): Merge into "non-field trial" test when FlexFEC is enabled
2380 // by default.
2373 TEST_F(WebRtcVideoChannel2FlexfecTest, SetDefaultSendCodecsWithoutSsrc) { 2381 TEST_F(WebRtcVideoChannel2FlexfecTest, SetDefaultSendCodecsWithoutSsrc) {
2374 FakeVideoSendStream* stream = AddSendStream(); 2382 FakeVideoSendStream* stream = AddSendStream();
2375 webrtc::VideoSendStream::Config config = stream->GetConfig().Copy(); 2383 webrtc::VideoSendStream::Config config = stream->GetConfig().Copy();
2376 2384
2377 EXPECT_EQ(GetEngineCodec("flexfec-03").id, 2385 EXPECT_EQ(GetEngineCodec("flexfec-03").id,
2378 config.rtp.flexfec.flexfec_payload_type); 2386 config.rtp.flexfec.flexfec_payload_type);
2379 EXPECT_FALSE(config.rtp.flexfec.IsCompleteAndEnabled()); 2387 EXPECT_FALSE(config.rtp.flexfec.IsCompleteAndEnabled());
2380 } 2388 }
2381 2389
2382 // TODO(brandtr): Merge into "non-field trial" test when FlexFEC is enabled 2390 // TODO(brandtr): Merge into "non-field trial" test when FlexFEC is enabled
(...skipping 1675 matching lines...) Expand 10 before | Expand all | Expand 10 after
4058 4066
4059 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWith3SimulcastStreams) { 4067 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWith3SimulcastStreams) {
4060 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 3); 4068 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 3);
4061 } 4069 }
4062 4070
4063 // Test that we normalize send codec format size in simulcast. 4071 // Test that we normalize send codec format size in simulcast.
4064 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { 4072 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) {
4065 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 541, 271, 2, 2); 4073 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 541, 271, 2, 2);
4066 } 4074 }
4067 } // namespace cricket 4075 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698