content/renderer/media/video_track_to_pepper_adapter.cc - Issue 1849003002: Add video frame refresh to MediaStream and VideoCapture stacks.

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/video_track_to_pepper_adapter.cc

Issue 1849003002: Add video frame refresh to MediaStream and VideoCapture stacks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed last round of comments from xjz and emircan. Created 4 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

« content/renderer/media/media_stream_video_track.cc ('K') | « content/renderer/media/video_track_recorder.cc ('k') | content/renderer/media/webrtc/media_stream_video_webrtc_sink.h » ('j') | content/renderer/media/webrtc/media_stream_video_webrtc_sink.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/video_track_to_pepper_adapter.cc

diff --git a/content/renderer/media/video_track_to_pepper_adapter.cc b/content/renderer/media/video_track_to_pepper_adapter.cc

index c59155f85db58769a3f9d44128c45ace1019e0fc..1b0a2436e34d7e5a3e840a0b3ac78517875c5a0b 100644

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

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

@@ -40,13 +40,13 @@ class PpFrameReceiver : public MediaStreamVideoSink {

DCHECK((reader_ && !reader) || (!reader_ && reader))

<< " |reader| = " << reader << ", |reader_| = " << reader_;

if (reader) {

- AddToVideoTrack(this,

- media::BindToCurrentLoop(

- base::Bind(&PpFrameReceiver::OnVideoFrame,

- weak_factory_.GetWeakPtr())),

- track_);

+ MediaStreamVideoSink::ConnectToTrack(

+ track_,

+ media::BindToCurrentLoop(

+ base::Bind(&PpFrameReceiver::OnVideoFrame,

+ weak_factory_.GetWeakPtr())));

} else {

- RemoveFromVideoTrack(this, track_);

+ MediaStreamVideoSink::DisconnectFromTrack();

weak_factory_.InvalidateWeakPtrs();

}

reader_ = reader;