| Index: content/renderer/pepper/pepper_media_stream_video_track_host.cc
|
| diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
|
| index e12ed4012043d92c4b4493804ba64eae7803e869..4b0caab4e293ad3c08120d0896454a05e9a618c7 100644
|
| --- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc
|
| +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
|
| @@ -225,7 +225,9 @@ void PepperMediaStreamVideoTrackHost::FrameDeliverer::DeliverFrameOnIO(
|
| const scoped_refptr<media::VideoFrame>& frame,
|
| const media::VideoCaptureFormat& format) {
|
| DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| - new_frame_callback_.Run(frame, format);
|
| + // The time when this stream starts is unknown so give a null value to
|
| + // |start_ticks|.
|
| + new_frame_callback_.Run(frame, format, base::TimeTicks());
|
| }
|
|
|
| PepperMediaStreamVideoTrackHost::PepperMediaStreamVideoTrackHost(
|
| @@ -381,7 +383,8 @@ int32_t PepperMediaStreamVideoTrackHost::SendFrameToTrack(int32_t index) {
|
|
|
| void PepperMediaStreamVideoTrackHost::OnVideoFrame(
|
| const scoped_refptr<VideoFrame>& frame,
|
| - const media::VideoCaptureFormat& format) {
|
| + const media::VideoCaptureFormat& format,
|
| + const base::TimeTicks& start_ticks) {
|
| DCHECK(frame);
|
| // TODO(penghuang): Check |frame->end_of_stream()| and close the track.
|
| PP_VideoFrame_Format ppformat = ToPpapiFormat(frame->format());
|
|
|