content/renderer/media/media_stream_video_track.cc - Issue 246433006: Change MediaStreamVideoSource to output different resolutions to different tracks depending on the …

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 246433006: Change MediaStreamVideoSource to output different resolutions to different tracks depending on the … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed missed comments. Created 6 years, 7 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

« content/browser/media/webrtc_getusermedia_browsertest.cc ('K') | « content/renderer/media/media_stream_video_source_unittest.cc ('k') | content/renderer/media/mock_media_stream_video_source.cc » ('j') | content/renderer/media/video_track_adapter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 32c19c9ece60f9100e8fcbbad34ea1d77ee1f40e..2d9d1f27b6f9dc0f6d906845df114da3a3671929 100644

--- a/content/renderer/media/media_stream_video_track.cc

+++ b/content/renderer/media/media_stream_video_track.cc

@@ -65,6 +65,7 @@ class MediaStreamVideoTrack::FrameDeliverer : public VideoFrameDeliverer {

protected:

virtual ~FrameDeliverer() {

DCHECK(sinks_.empty());

+ DCHECK(thread_checker().CalledOnValidThread());

}

void SetEnabledOnIO(bool enabled) {

@@ -122,6 +123,7 @@ MediaStreamVideoTrack::MediaStreamVideoTrack(

}

MediaStreamVideoTrack::~MediaStreamVideoTrack() {

+ DCHECK(thread_checker_.CalledOnValidThread());

Stop();

DVLOG(3) << "~MediaStreamVideoTrack()";

}