| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "media/capture/video/video_capture_device.h" | 5 #include "media/capture/video/video_capture_device.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 DoReserveOutputBuffer(); | 128 DoReserveOutputBuffer(); |
| 129 NOTREACHED() << "This should never be called"; | 129 NOTREACHED() << "This should never be called"; |
| 130 return std::unique_ptr<Buffer>(); | 130 return std::unique_ptr<Buffer>(); |
| 131 } | 131 } |
| 132 void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer, | 132 void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer, |
| 133 const VideoCaptureFormat& format, | 133 const VideoCaptureFormat& format, |
| 134 base::TimeTicks reference_time, | 134 base::TimeTicks reference_time, |
| 135 base::TimeDelta timestamp) override { | 135 base::TimeDelta timestamp) override { |
| 136 DoOnIncomingCapturedBuffer(); | 136 DoOnIncomingCapturedBuffer(); |
| 137 } | 137 } |
| 138 void OnIncomingCapturedVideoFrame(std::unique_ptr<Buffer> buffer, | 138 void OnIncomingCapturedBufferExt( |
| 139 scoped_refptr<VideoFrame> frame) override { | 139 std::unique_ptr<Buffer> buffer, |
| 140 const VideoCaptureFormat& format, |
| 141 base::TimeTicks reference_time, |
| 142 base::TimeDelta timestamp, |
| 143 gfx::Rect visible_rect, |
| 144 const VideoFrameMetadata& additional_metadata) override { |
| 140 DoOnIncomingCapturedVideoFrame(); | 145 DoOnIncomingCapturedVideoFrame(); |
| 141 } | 146 } |
| 142 std::unique_ptr<Buffer> ResurrectLastOutputBuffer( | 147 std::unique_ptr<Buffer> ResurrectLastOutputBuffer( |
| 143 const gfx::Size& dimensions, | 148 const gfx::Size& dimensions, |
| 144 media::VideoPixelFormat format, | 149 media::VideoPixelFormat format, |
| 145 media::VideoPixelStorage storage, | 150 media::VideoPixelStorage storage, |
| 146 int frame_feedback_id) { | 151 int frame_feedback_id) { |
| 147 DoResurrectLastOutputBuffer(); | 152 DoResurrectLastOutputBuffer(); |
| 148 NOTREACHED() << "This should never be called"; | 153 NOTREACHED() << "This should never be called"; |
| 149 return std::unique_ptr<Buffer>(); | 154 return std::unique_ptr<Buffer>(); |
| (...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 | 632 |
| 628 device->GetPhotoCapabilities(std::move(scoped_get_callback)); | 633 device->GetPhotoCapabilities(std::move(scoped_get_callback)); |
| 629 run_loop.Run(); | 634 run_loop.Run(); |
| 630 | 635 |
| 631 ASSERT_TRUE(image_capture_client_->capabilities()); | 636 ASSERT_TRUE(image_capture_client_->capabilities()); |
| 632 | 637 |
| 633 device->StopAndDeAllocate(); | 638 device->StopAndDeAllocate(); |
| 634 } | 639 } |
| 635 | 640 |
| 636 }; // namespace media | 641 }; // namespace media |
| OLD | NEW |