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

Side by Side Diff: content/renderer/media/webrtc/media_stream_remote_video_source.cc

Issue 287313002: Pass a TimeTicks along video capture pipeline to represent capture time (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged and land Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/webrtc/media_stream_remote_video_source.h" 5 #include "content/renderer/media/webrtc/media_stream_remote_video_source.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 FROM_HERE, 113 FROM_HERE,
114 base::Bind(&RemoteVideoSourceDelegate::DoRenderFrameOnIOThread, 114 base::Bind(&RemoteVideoSourceDelegate::DoRenderFrameOnIOThread,
115 this, video_frame, format)); 115 this, video_frame, format));
116 } 116 }
117 117
118 void MediaStreamRemoteVideoSource:: 118 void MediaStreamRemoteVideoSource::
119 RemoteVideoSourceDelegate::DoRenderFrameOnIOThread( 119 RemoteVideoSourceDelegate::DoRenderFrameOnIOThread(
120 scoped_refptr<media::VideoFrame> video_frame, 120 scoped_refptr<media::VideoFrame> video_frame,
121 const media::VideoCaptureFormat& format) { 121 const media::VideoCaptureFormat& format) {
122 DCHECK(io_message_loop_->BelongsToCurrentThread()); 122 DCHECK(io_message_loop_->BelongsToCurrentThread());
123 frame_callback_.Run(video_frame, format); 123 // TODO(hclam): Give the estimated capture time.
124 frame_callback_.Run(video_frame, format, base::TimeTicks());
124 } 125 }
125 126
126 MediaStreamRemoteVideoSource::MediaStreamRemoteVideoSource( 127 MediaStreamRemoteVideoSource::MediaStreamRemoteVideoSource(
127 webrtc::VideoTrackInterface* remote_track) 128 webrtc::VideoTrackInterface* remote_track)
128 : remote_track_(remote_track), 129 : remote_track_(remote_track),
129 last_state_(remote_track->state()) { 130 last_state_(remote_track->state()) {
130 remote_track_->RegisterObserver(this); 131 remote_track_->RegisterObserver(this);
131 } 132 }
132 133
133 MediaStreamRemoteVideoSource::~MediaStreamRemoteVideoSource() { 134 MediaStreamRemoteVideoSource::~MediaStreamRemoteVideoSource() {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded); 184 SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded);
184 break; 185 break;
185 default: 186 default:
186 NOTREACHED(); 187 NOTREACHED();
187 break; 188 break;
188 } 189 }
189 } 190 }
190 } 191 }
191 192
192 } // namespace content 193 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/video_track_adapter.cc ('k') | content/renderer/media/webrtc/video_destination_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698