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

Unified Diff: content/renderer/media/media_stream_video_track.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/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 04d8817cca46013a0575abcd23ed21eb6e9a445e..8a049a6db17d5e5fd93f762ee8f0d51b3949c4bb 100644
--- a/content/renderer/media/media_stream_video_track.cc
+++ b/content/renderer/media/media_stream_video_track.cc
@@ -45,7 +45,6 @@ class MediaStreamVideoTrack::FrameDeliverer
// Triggers all registered callbacks with |frame|, |format| and
// |estimated_capture_time| as parameters. Must be called on the IO-thread.
void DeliverFrameOnIO(const scoped_refptr<media::VideoFrame>& frame,
- const media::VideoCaptureFormat& format,
const base::TimeTicks& estimated_capture_time);
private:
@@ -145,16 +144,12 @@ void MediaStreamVideoTrack::FrameDeliverer::SetEnabledOnIO(bool enabled) {
void MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO(
const scoped_refptr<media::VideoFrame>& frame,
- const media::VideoCaptureFormat& format,
const base::TimeTicks& estimated_capture_time) {
DCHECK(io_message_loop_->BelongsToCurrentThread());
const scoped_refptr<media::VideoFrame>& video_frame =
enabled_ ? frame : GetBlackFrame(frame);
-
- for (std::vector<VideoIdCallbackPair>::iterator it = callbacks_.begin();
- it != callbacks_.end(); ++it) {
- it->second.Run(video_frame, format, estimated_capture_time);
- }
+ for (const auto& entry : callbacks_)
+ entry.second.Run(video_frame, estimated_capture_time);
}
const scoped_refptr<media::VideoFrame>&

Powered by Google App Engine
This is Rietveld 408576698