Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / video / capture / video_capture_types.h

diff --git a/src/media/video/capture/video_capture_types.h b/src/media/video/capture/video_capture_types.h
index a6a13a8..91118b9 100644 (file)
--- a/src/media/video/capture/video_capture_types.h
+++ b/src/media/video/capture/video_capture_types.h
@@ -16,21 +16,38 @@ namespace media {
 // shared with device manager.
 typedef int VideoCaptureSessionId;
 
-// Color formats from camera.
+// Color formats from camera. This list is sorted in order of preference.
 enum VideoPixelFormat {
-  PIXEL_FORMAT_UNKNOWN,  // Color format not set.
   PIXEL_FORMAT_I420,
-  PIXEL_FORMAT_YUY2,
+  PIXEL_FORMAT_YV12,
+  PIXEL_FORMAT_NV21,
   PIXEL_FORMAT_UYVY,
+  PIXEL_FORMAT_YUY2,
   PIXEL_FORMAT_RGB24,
   PIXEL_FORMAT_ARGB,
   PIXEL_FORMAT_MJPEG,
-  PIXEL_FORMAT_NV21,
-  PIXEL_FORMAT_YV12,
   PIXEL_FORMAT_TEXTURE,  // Capture format as a GL texture.
+  PIXEL_FORMAT_UNKNOWN,  // Color format not set.
   PIXEL_FORMAT_MAX,
 };
 
+// Policies for capture devices that has source content with dynamic resolution.
+enum ResolutionChangePolicy {
+  // Capture device outputs a fixed resolution all the time. The resolution of
+  // the first frame is the resolution for all frames.
+  // It is implementation specific for the capture device to scale, letter-box
+  // and pillar-box. The only guarantee is that resolution will never change.
+  RESOLUTION_POLICY_FIXED,
+
+  // Capture device outputs frames with dynamic resolution. The width and height
+  // will not exceed the maximum dimensions specified. The typical scenario is
+  // the frames will have the same aspect ratio as the original content and
+  // scaled down to fit inside the limit.
+  RESOLUTION_POLICY_DYNAMIC_WITHIN_LIMIT,
+
+  RESOLUTION_POLICY_LAST,
+};
+
 // Some drivers use rational time per frame instead of float frame rate, this
 // constant k is used to convert between both: A fps -> [k/k*A] seconds/frame.
 const int kFrameRatePrecision = 10000;
@@ -46,6 +63,7 @@ class MEDIA_EXPORT VideoCaptureFormat {
                      float frame_rate,
                      VideoPixelFormat pixel_format);
 
+  std::string ToString() const;
   static std::string PixelFormatToString(VideoPixelFormat format);
 
   // Checks that all values are in the expected range. All limits are specified
@@ -57,8 +75,25 @@ class MEDIA_EXPORT VideoCaptureFormat {
   VideoPixelFormat pixel_format;
 };
 
+// Image capture format specification.
+// This class is used by the video capture device to specify the format of a
+// still image captured and returned to a client. A list of these is also
+// provided when client queries supported formats for still image capture.
+class MEDIA_EXPORT ImageCaptureFormat {
+ public:
+  ImageCaptureFormat();
+
+  ImageCaptureFormat(const gfx::Size& frame_size,
+                     VideoPixelFormat pixel_format);
+
+  gfx::Size frame_size;
+  VideoPixelFormat pixel_format;
+};
+
 typedef std::vector<VideoCaptureFormat> VideoCaptureFormats;
 
+typedef std::vector<ImageCaptureFormat> ImageCaptureFormats;
+
 // Parameters for starting video capture.
 // This class is used by the client of a video capture device to specify the
 // format of frames in which the client would like to have captured frames
@@ -70,8 +105,8 @@ class MEDIA_EXPORT VideoCaptureParams {
   // Requests a resolution and format at which the capture will occur.
   VideoCaptureFormat requested_format;
 
-  // Allow mid-capture resolution change.
-  bool allow_resolution_change;
+  // Policy for resolution change.
+  ResolutionChangePolicy resolution_change_policy;
 };
 
 }  // namespace media