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

Unified Diff: content/renderer/media/media_stream_video_track.cc

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. 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/media_stream_video_track.cc
diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc
index 8d4b83d6b43ff3f9d51a8860c7413b64baf8f230..3935e7bdbac58a47694e27a9d040ce562b26c38d 100644
--- a/content/renderer/media/media_stream_video_track.cc
+++ b/content/renderer/media/media_stream_video_track.cc
@@ -46,7 +46,7 @@ MediaStreamVideoTrack::MediaStreamVideoTrack(
MediaStreamVideoTrack::~MediaStreamVideoTrack() {
DCHECK(sinks_.empty());
- source_->RemoveTrack(this);
+ Stop();
}
void MediaStreamVideoTrack::AddSink(MediaStreamVideoSink* sink) {
@@ -88,6 +88,15 @@ void MediaStreamVideoTrack::SetEnabled(bool enabled) {
}
}
+void MediaStreamVideoTrack::Stop() {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ if (source_) {
+ source_->RemoveTrack(this);
+ source_ = NULL;
+ }
+ OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded);
+}
+
void MediaStreamVideoTrack::OnVideoFrame(
const scoped_refptr<media::VideoFrame>& frame) {
DCHECK(thread_checker_.CalledOnValidThread());
« no previous file with comments | « content/renderer/media/media_stream_video_track.h ('k') | content/renderer/media/media_stream_video_track_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698