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

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

Issue 2228733004: Skip unit test if GYP_DEFINES="rtc_use_h264=1" is not set. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: add #define to gyp and gn Created 4 years, 4 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/BUILD.gn ('k') | webrtc/media/media.gyp » ('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 3577 matching lines...) Expand 10 before | Expand all | Expand 10 after
3588 parameters.codecs.push_back(kVp9Codec); 3588 parameters.codecs.push_back(kVp9Codec);
3589 EXPECT_TRUE(channel_->SetRecvParameters(parameters)); 3589 EXPECT_TRUE(channel_->SetRecvParameters(parameters));
3590 3590
3591 webrtc::RtpParameters rtp_parameters = 3591 webrtc::RtpParameters rtp_parameters =
3592 channel_->GetRtpReceiveParameters(last_ssrc_); 3592 channel_->GetRtpReceiveParameters(last_ssrc_);
3593 ASSERT_EQ(2u, rtp_parameters.codecs.size()); 3593 ASSERT_EQ(2u, rtp_parameters.codecs.size());
3594 EXPECT_EQ(kVp8Codec.ToCodecParameters(), rtp_parameters.codecs[0]); 3594 EXPECT_EQ(kVp8Codec.ToCodecParameters(), rtp_parameters.codecs[0]);
3595 EXPECT_EQ(kVp9Codec.ToCodecParameters(), rtp_parameters.codecs[1]); 3595 EXPECT_EQ(kVp9Codec.ToCodecParameters(), rtp_parameters.codecs[1]);
3596 } 3596 }
3597 3597
3598 #if defined(WEBRTC_USE_H264)
3598 TEST_F(WebRtcVideoChannel2Test, GetRtpReceiveFmtpSprop) { 3599 TEST_F(WebRtcVideoChannel2Test, GetRtpReceiveFmtpSprop) {
3600 #else
3601 TEST_F(WebRtcVideoChannel2Test, DISABLED_GetRtpReceiveFmtpSprop) {
3602 #endif
3599 cricket::VideoRecvParameters parameters; 3603 cricket::VideoRecvParameters parameters;
3600 cricket::VideoCodec kH264sprop1(101, "H264", 640, 400, 15); 3604 cricket::VideoCodec kH264sprop1(101, "H264", 640, 400, 15);
3601 kH264sprop1.SetParam("sprop-parameter-sets", "uvw"); 3605 kH264sprop1.SetParam("sprop-parameter-sets", "uvw");
3602 parameters.codecs.push_back(kH264sprop1); 3606 parameters.codecs.push_back(kH264sprop1);
3603 cricket::VideoCodec kH264sprop2(102, "H264", 640, 400, 15); 3607 cricket::VideoCodec kH264sprop2(102, "H264", 640, 400, 15);
3604 kH264sprop2.SetParam("sprop-parameter-sets", "xyz"); 3608 kH264sprop2.SetParam("sprop-parameter-sets", "xyz");
3605 parameters.codecs.push_back(kH264sprop2); 3609 parameters.codecs.push_back(kH264sprop2);
3606 EXPECT_TRUE(channel_->SetRecvParameters(parameters)); 3610 EXPECT_TRUE(channel_->SetRecvParameters(parameters));
3607 3611
3608 FakeVideoReceiveStream* recv_stream = AddRecvStream(); 3612 FakeVideoReceiveStream* recv_stream = AddRecvStream();
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
3848 } 3852 }
3849 3853
3850 // Test that we normalize send codec format size in simulcast. 3854 // Test that we normalize send codec format size in simulcast.
3851 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { 3855 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) {
3852 cricket::VideoCodec codec(kVp8Codec270p); 3856 cricket::VideoCodec codec(kVp8Codec270p);
3853 codec.width += 1; 3857 codec.width += 1;
3854 codec.height += 1; 3858 codec.height += 1;
3855 VerifySimulcastSettings(codec, 2, 2); 3859 VerifySimulcastSettings(codec, 2, 2);
3856 } 3860 }
3857 } // namespace cricket 3861 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/BUILD.gn ('k') | webrtc/media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698