| 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/video_frame_deliverer.h" | 5 #include "content/renderer/media/video_frame_deliverer.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 | 9 |
| 10 namespace content { | 10 namespace content { |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 } | 65 } |
| 66 message_loop->PostTask( | 66 message_loop->PostTask( |
| 67 FROM_HERE, base::Bind(&ResetCallback, base::Passed(&callback))); | 67 FROM_HERE, base::Bind(&ResetCallback, base::Passed(&callback))); |
| 68 return; | 68 return; |
| 69 } | 69 } |
| 70 } | 70 } |
| 71 } | 71 } |
| 72 | 72 |
| 73 void VideoFrameDeliverer::DeliverFrameOnIO( | 73 void VideoFrameDeliverer::DeliverFrameOnIO( |
| 74 const scoped_refptr<media::VideoFrame>& frame, | 74 const scoped_refptr<media::VideoFrame>& frame, |
| 75 const media::VideoCaptureFormat& format) { | 75 const media::VideoCaptureFormat& format, |
| 76 const base::TimeTicks& estimated_capture_time) { |
| 76 DCHECK(io_message_loop_->BelongsToCurrentThread()); | 77 DCHECK(io_message_loop_->BelongsToCurrentThread()); |
| 77 for (std::vector<VideoIdCallbackPair>::iterator it = callbacks_.begin(); | 78 for (std::vector<VideoIdCallbackPair>::iterator it = callbacks_.begin(); |
| 78 it != callbacks_.end(); ++it) { | 79 it != callbacks_.end(); ++it) { |
| 79 it->second.Run(frame, format); | 80 it->second.Run(frame, format, estimated_capture_time); |
| 80 } | 81 } |
| 81 } | 82 } |
| 82 | 83 |
| 83 } // namespace content | 84 } // namespace content |
| OLD | NEW |