ImageCapture: Implement TakePhoto() for Linux/CrOs

media/capture/video/linux/v4l2_capture_delegate.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_
 #define MEDIA_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/files/scoped_file.h"
 #include "base/macros.h"
 #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 use skia functionality.

Also, move the libyuv and png_coded.h
to the implementation file, since they are
not used in this header.

[xianglu, 2016/09/16 18:22:34]

kN32_SkColorType is from SkImage.

 
 #if defined(OS_OPENBSD)
 #include <sys/videoio.h>
 #else
 #include <linux/videodev2.h>
 #endif
 
 namespace tracked_objects {
 class Location;
 }  // namespace tracked_objects
@@ skipping 22 matching lines @@
       const scoped_refptr<base::SingleThreadTaskRunner>& v4l2_task_runner,
       int power_line_frequency);
 
   // Forward-to versions of VideoCaptureDevice virtual methods.
   void AllocateAndStart(int width,
                         int height,
                         float frame_rate,
                         std::unique_ptr<VideoCaptureDevice::Client> client);
   void StopAndDeAllocate();
 
+  void TakePhoto(VideoCaptureDevice::TakePhotoCallback callback);
+
   void SetRotation(int rotation);
 
  private:
   friend class base::RefCountedThreadSafe<V4L2CaptureDelegate>;
   ~V4L2CaptureDelegate();
 
   // VIDIOC_QUERYBUFs a buffer from V4L2, creates a BufferTracker for it and
   // enqueues it (VIDIOC_QBUF) back into V4L2.
   bool MapAndQueueBuffer(int index);
 
   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);
 
   const scoped_refptr<base::SingleThreadTaskRunner> v4l2_task_runner_;
   const VideoCaptureDeviceDescriptor device_descriptor_;
   const int power_line_frequency_;
 
   // The following members are only known on AllocateAndStart().
   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
well, but |take_photo_callbacks_|, but it doesn't 
apply to it: move this variable to a group on its
own after, e.g. l.94,

[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_;
   int timeout_count_;
 
   // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270.
   int rotation_;
 
   DISALLOW_COPY_AND_ASSIGN(V4L2CaptureDelegate);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_