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

Side by Side Diff: webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc

Issue 1373903003: Unify newapi::RtcpMode and RTCPMethod. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: ehm, compile the code Created 5 years, 2 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/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc ('k') | webrtc/video/end_to_end_tests.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 receive_statistics_.reset(ReceiveStatistics::Create(&fake_clock)); 46 receive_statistics_.reset(ReceiveStatistics::Create(&fake_clock));
47 RtpRtcp::Configuration configuration; 47 RtpRtcp::Configuration configuration;
48 configuration.audio = false; 48 configuration.audio = false;
49 configuration.clock = &fake_clock; 49 configuration.clock = &fake_clock;
50 configuration.outgoing_transport = transport_; 50 configuration.outgoing_transport = transport_;
51 51
52 video_module_ = RtpRtcp::CreateRtpRtcp(configuration); 52 video_module_ = RtpRtcp::CreateRtpRtcp(configuration);
53 rtp_receiver_.reset(RtpReceiver::CreateVideoReceiver( 53 rtp_receiver_.reset(RtpReceiver::CreateVideoReceiver(
54 &fake_clock, receiver_, NULL, &rtp_payload_registry_)); 54 &fake_clock, receiver_, NULL, &rtp_payload_registry_));
55 55
56 video_module_->SetRTCPStatus(kRtcpCompound); 56 video_module_->SetRTCPStatus(RtcpMode::kCompound);
57 video_module_->SetSSRC(test_ssrc_); 57 video_module_->SetSSRC(test_ssrc_);
58 rtp_receiver_->SetNACKStatus(kNackRtcp); 58 rtp_receiver_->SetNACKStatus(kNackRtcp);
59 video_module_->SetStorePacketsStatus(true, 600); 59 video_module_->SetStorePacketsStatus(true, 600);
60 EXPECT_EQ(0, video_module_->SetSendingStatus(true)); 60 EXPECT_EQ(0, video_module_->SetSendingStatus(true));
61 61
62 transport_->SetSendModule(video_module_, &rtp_payload_registry_, 62 transport_->SetSendModule(video_module_, &rtp_payload_registry_,
63 rtp_receiver_.get(), receive_statistics_.get()); 63 rtp_receiver_.get(), receive_statistics_.get());
64 64
65 VideoCodec video_codec; 65 VideoCodec video_codec;
66 memset(&video_codec, 0, sizeof(video_codec)); 66 memset(&video_codec, 0, sizeof(video_codec));
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 payload_specific, true)); 182 payload_specific, true));
183 EXPECT_EQ(0u, receiver_->payload_size()); 183 EXPECT_EQ(0u, receiver_->payload_size());
184 EXPECT_EQ(payload_length, receiver_->rtp_header().header.paddingLength); 184 EXPECT_EQ(payload_length, receiver_->rtp_header().header.paddingLength);
185 } 185 }
186 timestamp += 3000; 186 timestamp += 3000;
187 fake_clock.AdvanceTimeMilliseconds(33); 187 fake_clock.AdvanceTimeMilliseconds(33);
188 } 188 }
189 } 189 }
190 190
191 } // namespace webrtc 191 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698