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

Side by Side Diff: webrtc/audio/audio_send_stream_unittest.cc

Issue 1628683002: Use separate rtp module lists for send and receive in PacketRouter. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comments addressed. Created 4 years, 10 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/audio/audio_send_stream.cc ('k') | webrtc/call/congestion_controller.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 EXPECT_CALL(*channel_proxy_, SetLocalSSRC(kSsrc)).Times(1); 76 EXPECT_CALL(*channel_proxy_, SetLocalSSRC(kSsrc)).Times(1);
77 EXPECT_CALL(*channel_proxy_, SetRTCP_CNAME(StrEq(kCName))).Times(1); 77 EXPECT_CALL(*channel_proxy_, SetRTCP_CNAME(StrEq(kCName))).Times(1);
78 EXPECT_CALL(*channel_proxy_, 78 EXPECT_CALL(*channel_proxy_,
79 SetSendAbsoluteSenderTimeStatus(true, kAbsSendTimeId)).Times(1); 79 SetSendAbsoluteSenderTimeStatus(true, kAbsSendTimeId)).Times(1);
80 EXPECT_CALL(*channel_proxy_, 80 EXPECT_CALL(*channel_proxy_,
81 SetSendAudioLevelIndicationStatus(true, kAudioLevelId)).Times(1); 81 SetSendAudioLevelIndicationStatus(true, kAudioLevelId)).Times(1);
82 EXPECT_CALL(*channel_proxy_, EnableSendTransportSequenceNumber( 82 EXPECT_CALL(*channel_proxy_, EnableSendTransportSequenceNumber(
83 kTransportSequenceNumberId)) 83 kTransportSequenceNumberId))
84 .Times(1); 84 .Times(1);
85 EXPECT_CALL(*channel_proxy_, 85 EXPECT_CALL(*channel_proxy_,
86 SetCongestionControlObjects( 86 RegisterSenderCongestionControlObjects(
87 congestion_controller_.pacer(), 87 congestion_controller_.pacer(),
88 congestion_controller_.GetTransportFeedbackObserver(), 88 congestion_controller_.GetTransportFeedbackObserver(),
89 congestion_controller_.packet_router())) 89 congestion_controller_.packet_router()))
90 .Times(1); 90 .Times(1);
91 EXPECT_CALL(*channel_proxy_, 91 EXPECT_CALL(*channel_proxy_, ResetCongestionControlObjects())
92 SetCongestionControlObjects(nullptr, nullptr, nullptr))
93 .Times(1); 92 .Times(1);
94 return channel_proxy_; 93 return channel_proxy_;
95 })); 94 }));
96 stream_config_.voe_channel_id = kChannelId; 95 stream_config_.voe_channel_id = kChannelId;
97 stream_config_.rtp.ssrc = kSsrc; 96 stream_config_.rtp.ssrc = kSsrc;
98 stream_config_.rtp.c_name = kCName; 97 stream_config_.rtp.c_name = kCName;
99 stream_config_.rtp.extensions.push_back( 98 stream_config_.rtp.extensions.push_back(
100 RtpExtension(RtpExtension::kAudioLevel, kAudioLevelId)); 99 RtpExtension(RtpExtension::kAudioLevel, kAudioLevelId));
101 stream_config_.rtp.extensions.push_back( 100 stream_config_.rtp.extensions.push_back(
102 RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeId)); 101 RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeId));
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 static_cast<internal::AudioState*>(helper.audio_state().get()); 235 static_cast<internal::AudioState*>(helper.audio_state().get());
237 VoiceEngineObserver* voe_observer = 236 VoiceEngineObserver* voe_observer =
238 static_cast<VoiceEngineObserver*>(internal_audio_state); 237 static_cast<VoiceEngineObserver*>(internal_audio_state);
239 voe_observer->CallbackOnError(-1, VE_TYPING_NOISE_WARNING); 238 voe_observer->CallbackOnError(-1, VE_TYPING_NOISE_WARNING);
240 EXPECT_TRUE(send_stream.GetStats().typing_noise_detected); 239 EXPECT_TRUE(send_stream.GetStats().typing_noise_detected);
241 voe_observer->CallbackOnError(-1, VE_TYPING_NOISE_OFF_WARNING); 240 voe_observer->CallbackOnError(-1, VE_TYPING_NOISE_OFF_WARNING);
242 EXPECT_FALSE(send_stream.GetStats().typing_noise_detected); 241 EXPECT_FALSE(send_stream.GetStats().typing_noise_detected);
243 } 242 }
244 } // namespace test 243 } // namespace test
245 } // namespace webrtc 244 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_send_stream.cc ('k') | webrtc/call/congestion_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698