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

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

Issue 955253002: Add metadata to media::VideoFrame and plumb it through IPC/MediaStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tommi's nits addressed Created 5 years, 10 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/mock_media_stream_video_source.cc
diff --git a/content/renderer/media/mock_media_stream_video_source.cc b/content/renderer/media/mock_media_stream_video_source.cc
index 19f7b6f74d1f815817e33c037fffe4fecc562082..b99e4c31596e0513fe2b2e82685db6d137048d17 100644
--- a/content/renderer/media/mock_media_stream_video_source.cc
+++ b/content/renderer/media/mock_media_stream_video_source.cc
@@ -78,17 +78,7 @@ void MockMediaStreamVideoSource::DeliverVideoFrame(
DCHECK(!frame_callback_.is_null());
io_message_loop()->PostTask(
FROM_HERE,
- base::Bind(&MockMediaStreamVideoSource::DeliverVideoFrameOnIO,
- base::Unretained(this), frame, format_,
- base::TimeTicks(), frame_callback_));
-}
-
-void MockMediaStreamVideoSource::DeliverVideoFrameOnIO(
- const scoped_refptr<media::VideoFrame>& frame,
- media::VideoCaptureFormat format,
- const base::TimeTicks& estimated_capture_time,
- const VideoCaptureDeliverFrameCB& frame_callback) {
- frame_callback.Run(frame, format, estimated_capture_time);
+ base::Bind(frame_callback_, frame, base::TimeTicks()));
}
} // namespace content
« no previous file with comments | « content/renderer/media/mock_media_stream_video_source.h ('k') | content/renderer/media/rtc_video_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698