Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1309886 - End received tracks when MediaPipelineReceive is detached. r=drno

Browse Source 
MozReview-Commit-ID: 86kqjtMhulR

--HG--
extra : rebase_source : 77265fcd4a038a4cc8edf77682a2b000c6ea506a
This commit is contained in:
Andreas Pehrson 2016-10-13 15:50:29 +02:00
parent 16cfbad982
commit 5b5b7d3bc4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
View File

@ -1907,6 +1907,11 @@ class GenericReceiveListener : public MediaStreamListener
AddListener(source_, this);
}
void EndTrack()
{
source_->EndTrack(track_id_);
}
#ifndef USE_FAKE_MEDIA_STREAMS
// Must be called on the main thread
void SetPrincipalHandle_m(const PrincipalHandle& principal_handle)
@ -1942,7 +1947,7 @@ class GenericReceiveListener : public MediaStreamListener
protected:
SourceMediaStream *source_;
TrackID track_id_;
const TrackID track_id_;
TrackTicks played_ticks_;
PrincipalHandle principal_handle_;
};
@ -2104,7 +2109,8 @@ MediaPipelineReceiveAudio::MediaPipelineReceiveAudio(
void MediaPipelineReceiveAudio::DetachMedia()
{
ASSERT_ON_THREAD(main_thread_);
if (stream_) {
if (stream_ && listener_) {
listener_->EndTrack();
stream_->RemoveListener(listener_);
stream_ = nullptr;
}
@ -2335,7 +2341,8 @@ void MediaPipelineReceiveVideo::DetachMedia()
// avoid cycles, and the render callbacks are invoked from a different
// thread so simple null-checks would cause TSAN bugs without locks.
static_cast<VideoSessionConduit*>(conduit_.get())->DetachRenderer();
if (stream_) {
if (stream_ && listener_) {
listener_->EndTrack();
stream_->RemoveListener(listener_);
stream_ = nullptr;
}