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

Side by Side Diff: media/engine/webrtcvideoengine_unittest.cc

Issue 3010003002: Set protected_by_flexfec flag properly in tests. (Closed)
Patch Set: Rebase. Created 3 years, 3 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 | « no previous file | test/call_test.cc » ('j') | 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 2636 matching lines...) Expand 10 before | Expand all | Expand 10 after
2647 2647
2648 const std::vector<FakeFlexfecReceiveStream*>& streams = 2648 const std::vector<FakeFlexfecReceiveStream*>& streams =
2649 fake_call_->GetFlexfecReceiveStreams(); 2649 fake_call_->GetFlexfecReceiveStreams();
2650 ASSERT_EQ(1U, streams.size()); 2650 ASSERT_EQ(1U, streams.size());
2651 const FakeFlexfecReceiveStream* stream = streams.front(); 2651 const FakeFlexfecReceiveStream* stream = streams.front();
2652 const webrtc::FlexfecReceiveStream::Config& config = stream->GetConfig(); 2652 const webrtc::FlexfecReceiveStream::Config& config = stream->GetConfig();
2653 EXPECT_EQ(GetEngineCodec("flexfec-03").id, config.payload_type); 2653 EXPECT_EQ(GetEngineCodec("flexfec-03").id, config.payload_type);
2654 EXPECT_EQ(kFlexfecSsrc, config.remote_ssrc); 2654 EXPECT_EQ(kFlexfecSsrc, config.remote_ssrc);
2655 ASSERT_EQ(1U, config.protected_media_ssrcs.size()); 2655 ASSERT_EQ(1U, config.protected_media_ssrcs.size());
2656 EXPECT_EQ(kSsrcs1[0], config.protected_media_ssrcs[0]); 2656 EXPECT_EQ(kSsrcs1[0], config.protected_media_ssrcs[0]);
2657
2658 const std::vector<FakeVideoReceiveStream*>& video_streams =
2659 fake_call_->GetVideoReceiveStreams();
2660 ASSERT_EQ(1U, video_streams.size());
2661 const webrtc::VideoReceiveStream::Config& video_config =
2662 video_streams.front()->GetConfig();
2663 EXPECT_TRUE(video_config.rtp.protected_by_flexfec);
2657 } 2664 }
2658 2665
2659 TEST_F(WebRtcVideoChannelFlexfecRecvTest, 2666 TEST_F(WebRtcVideoChannelFlexfecRecvTest,
2660 EnablingFlexfecDoesNotRecreateVideoReceiveStream) { 2667 EnablingFlexfecDoesNotRecreateVideoReceiveStream) {
2661 cricket::VideoRecvParameters recv_parameters; 2668 cricket::VideoRecvParameters recv_parameters;
2662 recv_parameters.codecs.push_back(GetEngineCodec("VP8")); 2669 recv_parameters.codecs.push_back(GetEngineCodec("VP8"));
2663 ASSERT_TRUE(channel_->SetRecvParameters(recv_parameters)); 2670 ASSERT_TRUE(channel_->SetRecvParameters(recv_parameters));
2664 2671
2665 AddRecvStream( 2672 AddRecvStream(
2666 CreatePrimaryWithFecFrStreamParams("cname", kSsrcs1[0], kFlexfecSsrc)); 2673 CreatePrimaryWithFecFrStreamParams("cname", kSsrcs1[0], kFlexfecSsrc));
(...skipping 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after
4778 4785
4779 TEST_F(WebRtcVideoChannelSimulcastTest, 4786 TEST_F(WebRtcVideoChannelSimulcastTest,
4780 NoSimulcastScreenshareWithoutConference) { 4787 NoSimulcastScreenshareWithoutConference) {
4781 webrtc::test::ScopedFieldTrials override_field_trials_( 4788 webrtc::test::ScopedFieldTrials override_field_trials_(
4782 "WebRTC-SimulcastScreenshare/Enabled/"); 4789 "WebRTC-SimulcastScreenshare/Enabled/");
4783 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true, 4790 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 1, true,
4784 false); 4791 false);
4785 } 4792 }
4786 4793
4787 } // namespace cricket 4794 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | test/call_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698