Chromium Code Reviews| Index: media/capture/video/linux/v4l2_capture_delegate.h |
| diff --git a/media/capture/video/linux/v4l2_capture_delegate.h b/media/capture/video/linux/v4l2_capture_delegate.h |
| index 120272745c9d2d690f44497a23c873d66c221adf..05bc17dd6a360edd842bb40d2469311cd8d705de 100644 |
| --- a/media/capture/video/linux/v4l2_capture_delegate.h |
| +++ b/media/capture/video/linux/v4l2_capture_delegate.h |
| @@ -13,6 +13,10 @@ |
| #include "base/memory/ref_counted.h" |
| #include "build/build_config.h" |
| #include "media/capture/video/video_capture_device.h" |
| +#include "third_party/libyuv/include/libyuv.h" |
| +#include "third_party/skia/include/core/SkImage.h" |
| +#include "third_party/skia/include/core/SkSurface.h" |
| +#include "ui/gfx/codec/png_codec.h" |
|
mcasas
2016/09/16 03:50:37
The skia includes are unnecessary since
we don't u
xianglu
2016/09/16 18:22:34
kN32_SkColorType is from SkImage.
|
| #if defined(OS_OPENBSD) |
| #include <sys/videoio.h> |
| @@ -55,6 +59,8 @@ class V4L2CaptureDelegate final |
| std::unique_ptr<VideoCaptureDevice::Client> client); |
| void StopAndDeAllocate(); |
| + void TakePhoto(VideoCaptureDevice::TakePhotoCallback callback); |
| + |
| void SetRotation(int rotation); |
| private: |
| @@ -67,6 +73,11 @@ class V4L2CaptureDelegate final |
| void DoCapture(); |
| + class BufferTracker; |
| + mojom::BlobPtr GetPhotoBlob( |
| + const scoped_refptr<BufferTracker>& buffer_tracker, |
| + const v4l2_buffer& buffer); |
| + |
| void SetErrorState(const tracked_objects::Location& from_here, |
| const std::string& reason); |
| @@ -78,10 +89,10 @@ class V4L2CaptureDelegate final |
| VideoCaptureFormat capture_format_; |
| v4l2_format video_fmt_; |
| std::unique_ptr<VideoCaptureDevice::Client> client_; |
| + std::queue<VideoCaptureDevice::TakePhotoCallback> take_photo_callbacks_; |
|
mcasas
2016/09/16 03:50:36
The comment in l.88 would affect this member as
we
xianglu
2016/09/16 18:22:33
Done.
|
| base::ScopedFD device_fd_; |
| // Vector of BufferTracker to keep track of mmap()ed pointers and their use. |
| - class BufferTracker; |
| std::vector<scoped_refptr<BufferTracker>> buffer_tracker_pool_; |
| bool is_capturing_; |