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

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

Issue 1803923003: Clean away use of RtpAudioFeedback interface from RTP/RTCP sender code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 9 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/source/rtp_sender_unittest.cc ('k') | webrtc/voice_engine/channel.h » ('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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 rtp_payload_registry1_.reset(new RTPPayloadRegistry( 99 rtp_payload_registry1_.reset(new RTPPayloadRegistry(
100 RTPPayloadStrategy::CreateStrategy(true))); 100 RTPPayloadStrategy::CreateStrategy(true)));
101 rtp_payload_registry2_.reset(new RTPPayloadRegistry( 101 rtp_payload_registry2_.reset(new RTPPayloadRegistry(
102 RTPPayloadStrategy::CreateStrategy(true))); 102 RTPPayloadStrategy::CreateStrategy(true)));
103 103
104 RtpRtcp::Configuration configuration; 104 RtpRtcp::Configuration configuration;
105 configuration.audio = true; 105 configuration.audio = true;
106 configuration.clock = &fake_clock; 106 configuration.clock = &fake_clock;
107 configuration.receive_statistics = receive_statistics1_.get(); 107 configuration.receive_statistics = receive_statistics1_.get();
108 configuration.outgoing_transport = transport1; 108 configuration.outgoing_transport = transport1;
109 configuration.audio_messages = audioFeedback;
110 109
111 module1 = RtpRtcp::CreateRtpRtcp(configuration); 110 module1 = RtpRtcp::CreateRtpRtcp(configuration);
112 rtp_receiver1_.reset(RtpReceiver::CreateAudioReceiver( 111 rtp_receiver1_.reset(RtpReceiver::CreateAudioReceiver(
113 &fake_clock, audioFeedback, data_receiver1, NULL, 112 &fake_clock, audioFeedback, data_receiver1, NULL,
114 rtp_payload_registry1_.get())); 113 rtp_payload_registry1_.get()));
115 114
116 configuration.receive_statistics = receive_statistics2_.get(); 115 configuration.receive_statistics = receive_statistics2_.get();
117 configuration.outgoing_transport = transport2; 116 configuration.outgoing_transport = transport2;
118 configuration.audio_messages = audioFeedback;
119 117
120 module2 = RtpRtcp::CreateRtpRtcp(configuration); 118 module2 = RtpRtcp::CreateRtpRtcp(configuration);
121 rtp_receiver2_.reset(RtpReceiver::CreateAudioReceiver( 119 rtp_receiver2_.reset(RtpReceiver::CreateAudioReceiver(
122 &fake_clock, audioFeedback, data_receiver2, NULL, 120 &fake_clock, audioFeedback, data_receiver2, NULL,
123 rtp_payload_registry2_.get())); 121 rtp_payload_registry2_.get()));
124 122
125 transport1->SetSendModule(module2, rtp_payload_registry2_.get(), 123 transport1->SetSendModule(module2, rtp_payload_registry2_.get(),
126 rtp_receiver2_.get(), receive_statistics2_.get()); 124 rtp_receiver2_.get(), receive_statistics2_.get());
127 transport2->SetSendModule(module1, rtp_payload_registry1_.get(), 125 transport2->SetSendModule(module1, rtp_payload_registry1_.get(),
128 rtp_receiver1_.get(), receive_statistics1_.get()); 126 rtp_receiver1_.get(), receive_statistics1_.get());
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 for (; timeStamp <= 740 * 160; timeStamp += 160) { 343 for (; timeStamp <= 740 * 160; timeStamp += 160) {
346 EXPECT_EQ(0, module1->SendOutgoingData(webrtc::kAudioFrameSpeech, 96, 344 EXPECT_EQ(0, module1->SendOutgoingData(webrtc::kAudioFrameSpeech, 96,
347 timeStamp, -1, test, 4)); 345 timeStamp, -1, test, 4));
348 fake_clock.AdvanceTimeMilliseconds(20); 346 fake_clock.AdvanceTimeMilliseconds(20);
349 module1->Process(); 347 module1->Process();
350 } 348 }
351 } 349 }
352 350
353 } // namespace 351 } // namespace
354 } // namespace webrtc 352 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc ('k') | webrtc/voice_engine/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698