OLD | NEW |
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/mock_media_stream_video_source.h" | 5 #include "content/renderer/media/mock_media_stream_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 | 10 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 void MockMediaStreamVideoSource::StopSourceImpl() { | 70 void MockMediaStreamVideoSource::StopSourceImpl() { |
71 } | 71 } |
72 | 72 |
73 void MockMediaStreamVideoSource::DeliverVideoFrame( | 73 void MockMediaStreamVideoSource::DeliverVideoFrame( |
74 const scoped_refptr<media::VideoFrame>& frame) { | 74 const scoped_refptr<media::VideoFrame>& frame) { |
75 DCHECK(!frame_callback_.is_null()); | 75 DCHECK(!frame_callback_.is_null()); |
76 io_message_loop()->PostTask( | 76 io_message_loop()->PostTask( |
77 FROM_HERE, | 77 FROM_HERE, |
78 base::Bind(&MockMediaStreamVideoSource::DeliverVideoFrameOnIO, | 78 base::Bind(&MockMediaStreamVideoSource::DeliverVideoFrameOnIO, |
79 base::Unretained(this), frame, params_.requested_format, | 79 base::Unretained(this), frame, params_.requested_format, |
80 frame_callback_)); | 80 base::TimeTicks(), frame_callback_)); |
81 } | 81 } |
82 | 82 |
83 void MockMediaStreamVideoSource::DeliverVideoFrameOnIO( | 83 void MockMediaStreamVideoSource::DeliverVideoFrameOnIO( |
84 const scoped_refptr<media::VideoFrame>& frame, | 84 const scoped_refptr<media::VideoFrame>& frame, |
85 media::VideoCaptureFormat format, | 85 media::VideoCaptureFormat format, |
| 86 const base::TimeTicks& estimated_capture_time, |
86 const VideoCaptureDeliverFrameCB& frame_callback) { | 87 const VideoCaptureDeliverFrameCB& frame_callback) { |
87 frame_callback.Run(frame, format); | 88 frame_callback.Run(frame, format, estimated_capture_time); |
88 } | 89 } |
89 | 90 |
90 } // namespace content | 91 } // namespace content |
OLD | NEW |