zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor VideoTrackSource, without raw pointer injection.

Browse Source 
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}
This commit is contained in:
Niels Möller
2018-05-23 16:28:17 +02:00
committed by Commit Bot
parent 69c0222108
commit 5d67f82360
9 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pc/rtpreceiver.cc
View File

@ -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(