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

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

Issue 1802993002: Clean away use of RtpAudioFeedback interface from RTP/RTCP receiver code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@voe_dtmf_7
Patch Set: Reanimate CreateAudioReceiver() with 5 params, to not break downstream code. Created 4 years, 8 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_audio.cc ('k') | webrtc/voice_engine/channel.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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 rtp_payload_registry1_.reset(new RTPPayloadRegistry( 94 rtp_payload_registry1_.reset(new RTPPayloadRegistry(
95 RTPPayloadStrategy::CreateStrategy(true))); 95 RTPPayloadStrategy::CreateStrategy(true)));
96 rtp_payload_registry2_.reset(new RTPPayloadRegistry( 96 rtp_payload_registry2_.reset(new RTPPayloadRegistry(
97 RTPPayloadStrategy::CreateStrategy(true))); 97 RTPPayloadStrategy::CreateStrategy(true)));
98 98
99 module1 = RtpRtcp::CreateRtpRtcp(configuration); 99 module1 = RtpRtcp::CreateRtpRtcp(configuration);
100 100
101 rtp_feedback1_.reset(new TestRtpFeedback(module1)); 101 rtp_feedback1_.reset(new TestRtpFeedback(module1));
102 102
103 rtp_receiver1_.reset(RtpReceiver::CreateAudioReceiver( 103 rtp_receiver1_.reset(RtpReceiver::CreateAudioReceiver(
104 &fake_clock, NULL, receiver, rtp_feedback1_.get(), 104 &fake_clock, receiver, rtp_feedback1_.get(),
105 rtp_payload_registry1_.get())); 105 rtp_payload_registry1_.get()));
106 106
107 configuration.receive_statistics = receive_statistics2_.get(); 107 configuration.receive_statistics = receive_statistics2_.get();
108 configuration.outgoing_transport = transport2; 108 configuration.outgoing_transport = transport2;
109 configuration.intra_frame_callback = myRTCPFeedback2; 109 configuration.intra_frame_callback = myRTCPFeedback2;
110 110
111 module2 = RtpRtcp::CreateRtpRtcp(configuration); 111 module2 = RtpRtcp::CreateRtpRtcp(configuration);
112 112
113 rtp_feedback2_.reset(new TestRtpFeedback(module2)); 113 rtp_feedback2_.reset(new TestRtpFeedback(module2));
114 114
115 rtp_receiver2_.reset(RtpReceiver::CreateAudioReceiver( 115 rtp_receiver2_.reset(RtpReceiver::CreateAudioReceiver(
116 &fake_clock, NULL, receiver, rtp_feedback2_.get(), 116 &fake_clock, receiver, rtp_feedback2_.get(),
117 rtp_payload_registry2_.get())); 117 rtp_payload_registry2_.get()));
118 118
119 transport1->SetSendModule(module2, rtp_payload_registry2_.get(), 119 transport1->SetSendModule(module2, rtp_payload_registry2_.get(),
120 rtp_receiver2_.get(), receive_statistics2_.get()); 120 rtp_receiver2_.get(), receive_statistics2_.get());
121 transport2->SetSendModule(module1, rtp_payload_registry1_.get(), 121 transport2->SetSendModule(module1, rtp_payload_registry1_.get(),
122 rtp_receiver1_.get(), receive_statistics1_.get()); 122 rtp_receiver1_.get(), receive_statistics1_.get());
123 myRTCPFeedback1->SetModule(module1); 123 myRTCPFeedback1->SetModule(module1);
124 myRTCPFeedback2->SetModule(module2); 124 myRTCPFeedback2->SetModule(module2);
125 125
126 module1->SetRTCPStatus(RtcpMode::kCompound); 126 module1->SetRTCPStatus(RtcpMode::kCompound);
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 EXPECT_EQ(test_ssrc, report_blocks[0].sourceSSRC); 262 EXPECT_EQ(test_ssrc, report_blocks[0].sourceSSRC);
263 263
264 EXPECT_EQ(0u, report_blocks[0].cumulativeLost); 264 EXPECT_EQ(0u, report_blocks[0].cumulativeLost);
265 EXPECT_LT(0u, report_blocks[0].delaySinceLastSR); 265 EXPECT_LT(0u, report_blocks[0].delaySinceLastSR);
266 EXPECT_EQ(test_sequence_number, report_blocks[0].extendedHighSeqNum); 266 EXPECT_EQ(test_sequence_number, report_blocks[0].extendedHighSeqNum);
267 EXPECT_EQ(0u, report_blocks[0].fractionLost); 267 EXPECT_EQ(0u, report_blocks[0].fractionLost);
268 } 268 }
269 269
270 } // namespace 270 } // namespace
271 } // namespace webrtc 271 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698