diff options
| author | Niels Möller <nisse@webrtc.org> | 2018-05-23 16:28:17 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-05-23 15:42:10 +0000 |
| commit | 5d67f82360660b4bb5c36f719055242dbaf1945a (patch) | |
| tree | 7f7a006031bbd55d68394077322388219ddaf4e7 /pc/rtpreceiver.cc | |
| parent | 69c0222108b7b5140f61c1b9583fa977ce3398e2 (diff) | |
| download | webrtc-5d67f82360660b4bb5c36f719055242dbaf1945a.tar.gz | |
Refactor VideoTrackSource, without raw pointer injection.
Bug: None
Change-Id: If4aa8ba72eb3dbdd7dca8970cd6349f1679bc222
Reviewed-on: https://webrtc-review.googlesource.com/78403
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23370}
Diffstat (limited to 'pc/rtpreceiver.cc')
| -rw-r--r-- | pc/rtpreceiver.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pc/rtpreceiver.cc b/pc/rtpreceiver.cc index ee45c4e547..341261b331 100644 --- a/pc/rtpreceiver.cc +++ b/pc/rtpreceiver.cc @@ -215,8 +215,7 @@ VideoRtpReceiver::VideoRtpReceiver( const std::vector<rtc::scoped_refptr<MediaStreamInterface>>& streams) : worker_thread_(worker_thread), id_(receiver_id), - source_(new RefCountedObject<VideoTrackSource>(&broadcaster_, - true /* remote */)), + source_(new RefCountedObject<VideoRtpTrackSource>()), track_(VideoTrackProxy::Create( rtc::Thread::Current(), worker_thread, @@ -270,7 +269,6 @@ void VideoRtpReceiver::Stop() { return; } source_->SetState(MediaSourceInterface::kEnded); - source_->OnSourceDestroyed(); if (!media_channel_ || !ssrc_) { RTC_LOG(LS_WARNING) << "VideoRtpReceiver::Stop: No video channel exists."; } else { @@ -293,7 +291,7 @@ void VideoRtpReceiver::SetupMediaChannel(uint32_t ssrc) { SetSink(nullptr); } ssrc_ = ssrc; - SetSink(&broadcaster_); + SetSink(source_->sink()); } void VideoRtpReceiver::SetStreams( |