OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 VerifyVoiceChannelNoInput(); | 162 VerifyVoiceChannelNoInput(); |
163 } | 163 } |
164 | 164 |
165 void DestroyVideoRtpSender() { | 165 void DestroyVideoRtpSender() { |
166 video_rtp_sender_ = nullptr; | 166 video_rtp_sender_ = nullptr; |
167 VerifyVideoChannelNoInput(); | 167 VerifyVideoChannelNoInput(); |
168 } | 168 } |
169 | 169 |
170 void CreateAudioRtpReceiver() { | 170 void CreateAudioRtpReceiver() { |
171 audio_track_ = AudioTrack::Create( | 171 audio_track_ = AudioTrack::Create( |
172 kAudioTrackId, RemoteAudioSource::Create(kAudioSsrc, NULL)); | 172 kAudioTrackId, RemoteAudioSource::Create(kAudioSsrc, nullptr)); |
173 EXPECT_TRUE(stream_->AddTrack(audio_track_)); | 173 EXPECT_TRUE(stream_->AddTrack(audio_track_)); |
174 audio_rtp_receiver_ = new AudioRtpReceiver(stream_, kAudioTrackId, | 174 audio_rtp_receiver_ = new AudioRtpReceiver(stream_, kAudioTrackId, |
175 kAudioSsrc, voice_channel_); | 175 kAudioSsrc, voice_channel_); |
176 audio_track_ = audio_rtp_receiver_->audio_track(); | 176 audio_track_ = audio_rtp_receiver_->audio_track(); |
177 VerifyVoiceChannelOutput(); | 177 VerifyVoiceChannelOutput(); |
178 } | 178 } |
179 | 179 |
180 void CreateVideoRtpReceiver() { | 180 void CreateVideoRtpReceiver() { |
181 video_rtp_receiver_ = | 181 video_rtp_receiver_ = |
182 new VideoRtpReceiver(stream_, kVideoTrackId, rtc::Thread::Current(), | 182 new VideoRtpReceiver(stream_, kVideoTrackId, rtc::Thread::Current(), |
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
798 // Make sure the signal from "GetOnDestroyedSignal()" fires when the sender is | 798 // Make sure the signal from "GetOnDestroyedSignal()" fires when the sender is |
799 // destroyed, which is needed for the DTMF sender. | 799 // destroyed, which is needed for the DTMF sender. |
800 TEST_F(RtpSenderReceiverTest, TestOnDestroyedSignal) { | 800 TEST_F(RtpSenderReceiverTest, TestOnDestroyedSignal) { |
801 CreateAudioRtpSender(); | 801 CreateAudioRtpSender(); |
802 EXPECT_FALSE(audio_sender_destroyed_signal_fired_); | 802 EXPECT_FALSE(audio_sender_destroyed_signal_fired_); |
803 audio_rtp_sender_ = nullptr; | 803 audio_rtp_sender_ = nullptr; |
804 EXPECT_TRUE(audio_sender_destroyed_signal_fired_); | 804 EXPECT_TRUE(audio_sender_destroyed_signal_fired_); |
805 } | 805 } |
806 | 806 |
807 } // namespace webrtc | 807 } // namespace webrtc |
OLD | NEW |