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

Unified Diff: content/renderer/media/webrtc/media_stream_remote_video_source.cc

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed test WebRtcGetUserMediaBrowserTest.TwoGetUserMediaAndStop Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/media_stream_remote_video_source.cc
diff --git a/content/renderer/media/webrtc/media_stream_remote_video_source.cc b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
index 50468affe8ac06f9f615936d4d590cbf6316221f..9e63502697cec4ad6e4c93995548d1a136da94ea 100644
--- a/content/renderer/media/webrtc/media_stream_remote_video_source.cc
+++ b/content/renderer/media/webrtc/media_stream_remote_video_source.cc
@@ -47,8 +47,10 @@ void MediaStreamRemoteVideoSource::StartSourceImpl(
void MediaStreamRemoteVideoSource::StopSourceImpl() {
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
- remote_track_->RemoveRenderer(this);
- remote_track_->UnregisterObserver(this);
+ if (state() != MediaStreamVideoSource::ENDED) {
+ remote_track_->RemoveRenderer(this);
+ remote_track_->UnregisterObserver(this);
+ }
}
webrtc::VideoSourceInterface* MediaStreamRemoteVideoSource::GetAdapter() {

Powered by Google App Engine
This is Rietveld 408576698