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

Side by Side Diff: webrtc/api/rtpreceiver.cc

Issue 1871833002: Rename BEGIN_PROXY_MAP --> BEGIN_SIGNALLING_PROXY_MAP. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 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
11 #include "webrtc/api/rtpreceiver.h" 11 #include "webrtc/api/rtpreceiver.h"
12 12
13 #include "webrtc/api/mediastreamtrackproxy.h" 13 #include "webrtc/api/mediastreamtrackproxy.h"
14 #include "webrtc/api/audiotrack.h" 14 #include "webrtc/api/audiotrack.h"
15 #include "webrtc/api/videosourceproxy.h" 15 #include "webrtc/api/videosourceproxy.h"
16 #include "webrtc/api/videotrack.h" 16 #include "webrtc/api/videotrack.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 19
20 AudioRtpReceiver::AudioRtpReceiver(MediaStreamInterface* stream, 20 AudioRtpReceiver::AudioRtpReceiver(MediaStreamInterface* stream,
21 const std::string& track_id, 21 const std::string& track_id,
22 uint32_t ssrc, 22 uint32_t ssrc,
23 AudioProviderInterface* provider) 23 AudioProviderInterface* provider)
24 : id_(track_id), 24 : id_(track_id),
25 ssrc_(ssrc), 25 ssrc_(ssrc),
26 provider_(provider), 26 provider_(provider),
27 track_(AudioTrackProxy::Create( 27 track_(AudioTrackSignallingProxy::Create(
28 rtc::Thread::Current(), 28 rtc::Thread::Current(),
29 AudioTrack::Create(track_id, 29 AudioTrack::Create(track_id,
30 RemoteAudioSource::Create(ssrc, provider)))), 30 RemoteAudioSource::Create(ssrc, provider)))),
31 cached_track_enabled_(track_->enabled()) { 31 cached_track_enabled_(track_->enabled()) {
32 RTC_DCHECK(track_->GetSource()->remote()); 32 RTC_DCHECK(track_->GetSource()->remote());
33 track_->RegisterObserver(this); 33 track_->RegisterObserver(this);
34 track_->GetSource()->RegisterAudioObserver(this); 34 track_->GetSource()->RegisterAudioObserver(this);
35 Reconfigure(); 35 Reconfigure();
36 stream->AddTrack(track_); 36 stream->AddTrack(track_);
37 } 37 }
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 if (!provider_) { 107 if (!provider_) {
108 return; 108 return;
109 } 109 }
110 source_->SetState(MediaSourceInterface::kEnded); 110 source_->SetState(MediaSourceInterface::kEnded);
111 source_->OnSourceDestroyed(); 111 source_->OnSourceDestroyed();
112 provider_->SetVideoPlayout(ssrc_, false, nullptr); 112 provider_->SetVideoPlayout(ssrc_, false, nullptr);
113 provider_ = nullptr; 113 provider_ = nullptr;
114 } 114 }
115 115
116 } // namespace webrtc 116 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698