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

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

Issue 2531043002: Reland of move RTPPayloadStrategy and simplify RTPPayloadRegistry (Closed)
Patch Set: Remove deprecated RegisterReceivePayload function in RtpReceiver Created 4 years 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 * 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 test_ssrc = 3456; 94 test_ssrc = 3456;
95 test_timestamp = 4567; 95 test_timestamp = 4567;
96 test_sequence_number = 2345; 96 test_sequence_number = 2345;
97 } 97 }
98 ~RtpRtcpAudioTest() {} 98 ~RtpRtcpAudioTest() {}
99 99
100 void SetUp() override { 100 void SetUp() override {
101 receive_statistics1_.reset(ReceiveStatistics::Create(&fake_clock)); 101 receive_statistics1_.reset(ReceiveStatistics::Create(&fake_clock));
102 receive_statistics2_.reset(ReceiveStatistics::Create(&fake_clock)); 102 receive_statistics2_.reset(ReceiveStatistics::Create(&fake_clock));
103 103
104 rtp_payload_registry1_.reset(new RTPPayloadRegistry( 104 rtp_payload_registry1_.reset(new RTPPayloadRegistry());
105 RTPPayloadStrategy::CreateStrategy(true))); 105 rtp_payload_registry2_.reset(new RTPPayloadRegistry());
106 rtp_payload_registry2_.reset(new RTPPayloadRegistry(
107 RTPPayloadStrategy::CreateStrategy(true)));
108 106
109 RtpRtcp::Configuration configuration; 107 RtpRtcp::Configuration configuration;
110 configuration.audio = true; 108 configuration.audio = true;
111 configuration.clock = &fake_clock; 109 configuration.clock = &fake_clock;
112 configuration.receive_statistics = receive_statistics1_.get(); 110 configuration.receive_statistics = receive_statistics1_.get();
113 configuration.outgoing_transport = &transport1; 111 configuration.outgoing_transport = &transport1;
114 configuration.retransmission_rate_limiter = &retransmission_rate_limiter_; 112 configuration.retransmission_rate_limiter = &retransmission_rate_limiter_;
115 113
116 module1.reset(RtpRtcp::CreateRtpRtcp(configuration)); 114 module1.reset(RtpRtcp::CreateRtpRtcp(configuration));
117 rtp_receiver1_.reset(RtpReceiver::CreateAudioReceiver( 115 rtp_receiver1_.reset(RtpReceiver::CreateAudioReceiver(
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 nullptr, nullptr, nullptr)); 281 nullptr, nullptr, nullptr));
284 282
285 EXPECT_EQ(test_ssrc, rtp_receiver2_->SSRC()); 283 EXPECT_EQ(test_ssrc, rtp_receiver2_->SSRC());
286 EXPECT_TRUE(rtp_receiver2_->Timestamp(&timestamp)); 284 EXPECT_TRUE(rtp_receiver2_->Timestamp(&timestamp));
287 EXPECT_EQ(test_timestamp + in_timestamp, timestamp); 285 EXPECT_EQ(test_timestamp + in_timestamp, timestamp);
288 in_timestamp += 10; 286 in_timestamp += 10;
289 } 287 }
290 } 288 }
291 289
292 } // namespace webrtc 290 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc ('k') | webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698