| Index: ppapi/c/private/ppb_image_capture_private.h
|
| diff --git a/ppapi/c/private/ppb_image_capture_private.h b/ppapi/c/private/ppb_image_capture_private.h
|
| index b4e1c5540400dbd1a28801ead22fc3dde1e24973..59613aac86722f54485e77a1e251b952ec98c74e 100644
|
| --- a/ppapi/c/private/ppb_image_capture_private.h
|
| +++ b/ppapi/c/private/ppb_image_capture_private.h
|
| @@ -4,7 +4,7 @@
|
| */
|
|
|
| /* From private/ppb_image_capture_private.idl,
|
| - * modified Mon Feb 2 21:41:55 2015.
|
| + * modified Tue Feb 3 22:24:35 2015.
|
| */
|
|
|
| #ifndef PPAPI_C_PRIVATE_PPB_IMAGE_CAPTURE_PRIVATE_H_
|
| @@ -30,79 +30,6 @@
|
|
|
|
|
| /**
|
| - * @addtogroup Typedefs
|
| - * @{
|
| - */
|
| -/**
|
| - * Callback function for <code>PPB_ImageCapture_Private.CaptureStillImage
|
| - * </code> to indicate the image has been captured from the sensor. This is a
|
| - * good opportunity to play a shutter sound or give other feedback of camera
|
| - * operation. This will occur after the image was captured, but before the
|
| - * actual data is available.
|
| - *
|
| - * Parameters:
|
| - * |user_data| The same pointer that was passed into <code>
|
| - * PPB_ImageCapture_Private.Create()</code>.
|
| - * |sequence_id| The sequence ID of the image capture, same as the one from
|
| - * CaptureStillImage.
|
| - */
|
| -typedef void (*PPB_ImageCapture_Private_ShutterCallback)(void* user_data,
|
| - int64_t sequence_id);
|
| -
|
| -/**
|
| - * Callback function for <code>PPB_ImageCapture_Private.CaptureStillImage
|
| - * </code> to deliver a preview image. The client can use this to show the
|
| - * captured image. See <code>PPB_ImageCapture_Private.CaptureStillImage
|
| - * </code> for more information.
|
| - *
|
| - * Parameters:
|
| - * |user_data| The same pointer that was passed into <code>
|
| - * PPB_ImageCapture_Private.Create()</code>.
|
| - * |sequence_id| The sequence ID of the image capture, same as the one from
|
| - * CaptureStillImage.
|
| - * |preview| A <code>PP_Resource</code> corresponding to a VideoFrame
|
| - * resource used to store the preview image.
|
| - */
|
| -typedef void (*PPB_ImageCapture_Private_PreviewCallback)(void* user_data,
|
| - int64_t sequence_id,
|
| - PP_Resource preview);
|
| -
|
| -/**
|
| - * Callback function for <code>PPB_ImageCapture_Private.CaptureStillImage
|
| - * </code> to deliver a still JPEG image. See <code>
|
| - * PPB_ImageCapture_Private.CaptureStillImage</code> for more information.
|
| - *
|
| - * Parameters:
|
| - * |user_data| The same pointer that was passed into <code>
|
| - * PPB_ImageCapture_Private.Create()</code>.
|
| - * |sequence_id| The sequence ID of the image capture, same as the one from
|
| - * CaptureStillImage.
|
| - * |jpeg| A <code>PP_Resource</code> corresponding to a VideoFrame
|
| - * resource used to store the JPEG image.
|
| - */
|
| -typedef void (*PPB_ImageCapture_Private_JpegCallback)(void* user_data,
|
| - int64_t sequence_id,
|
| - PP_Resource jpeg);
|
| -
|
| -/**
|
| - * Callback function for <code>PPB_ImageCapture_Private.CaptureStillImage
|
| - * </code> to indicate the image capture has failed.
|
| - *
|
| - * Parameters:
|
| - * |user_data| The same pointer that was passed into <code>
|
| - * PPB_ImageCapture_Private.Create()</code>.
|
| - * |sequence_id| The sequence ID of the image capture, same as the one from
|
| - * CaptureStillImage.
|
| - * |int32_t| An error code from <code>pp_errors.h</code>.
|
| - */
|
| -typedef void (*PPB_ImageCapture_Private_ErrorCallback)(void* user_data,
|
| - int64_t sequence_id,
|
| - int32_t pp_error);
|
| -/**
|
| - * @}
|
| - */
|
| -
|
| -/**
|
| * @addtogroup Interfaces
|
| * @{
|
| */
|
| @@ -113,10 +40,6 @@ typedef void (*PPB_ImageCapture_Private_ErrorCallback)(void* user_data,
|
| * 3. For optimal performance, set one of the supported preview size as the
|
| * constraints of getUserMedia. Use the created MediaStreamVideoTrack for
|
| * camera previews.
|
| - * 4. Set the same preview size and other settings by SetConfig.
|
| - * 5. Call CaptureStillImage to capture a still image. Play the shutter sound in
|
| - * the shutter callback. The image from the preview callback can be used for
|
| - * display. JPEG image will be returned to the JPEG callback.
|
| */
|
| struct PPB_ImageCapture_Private_0_1 {
|
| /**
|
| @@ -169,40 +92,6 @@ struct PPB_ImageCapture_Private_0_1 {
|
| */
|
| void (*Close)(PP_Resource image_capture);
|
| /**
|
| - * Sets the configuration of the image capture.
|
| - * If <code>SetConfig()</code> is not called, default settings will be used.
|
| - *
|
| - * @param[in] image_capture A <code>PP_Resource</code> corresponding to an
|
| - * image capture resource.
|
| - * @param[in] config A <code>PP_ImageCaptureConfig_Private</code> object.
|
| - * @param[in] callback <code>PP_CompletionCallback</code> to be called upon
|
| - * completion of <code>SetConfig()</code>.
|
| - *
|
| - * @return An int32_t containing a result code from <code>pp_errors.h</code>.
|
| - * Returns <code>PP_ERROR_INPROGRESS</code> if there is a pending call of
|
| - * <code>SetConfig()</code> or <code>CaptureStillImage()</code>.
|
| - * If an error is returned, the configuration will not be changed.
|
| - */
|
| - int32_t (*SetConfig)(PP_Resource image_capture,
|
| - PP_Resource config,
|
| - struct PP_CompletionCallback callback);
|
| - /**
|
| - * Gets the configuration of the image capture.
|
| - *
|
| - * @param[in] image_capture A <code>PP_Resource</code> corresponding to an
|
| - * image capture resource.
|
| - * @param[out] config A <code>PP_ImageCaptureConfig_Private</code> for storing
|
| - * the current image capture config on success. Otherwise, the values will not
|
| - * be changed.
|
| - * @param[in] callback <code>PP_CompletionCallback</code> to be called upon
|
| - * completion of <code>GetConfig()</code>.
|
| - *
|
| - * @return An int32_t containing a result code from <code>pp_errors.h</code>.
|
| - */
|
| - int32_t (*GetConfig)(PP_Resource image_capture,
|
| - PP_Resource* config,
|
| - struct PP_CompletionCallback callback);
|
| - /**
|
| * Gets the camera capabilities.
|
| *
|
| * The camera capabilities do not change for a given camera source.
|
| @@ -220,59 +109,6 @@ struct PPB_ImageCapture_Private_0_1 {
|
| int32_t (*GetCameraCapabilities)(PP_Resource image_capture,
|
| PP_Resource* capabilities,
|
| struct PP_CompletionCallback callback);
|
| - /**
|
| - * Captures a still JPEG image from the camera.
|
| - *
|
| - * Triggers an asynchronous image capture. The camera will initiate a series
|
| - * of callbacks to the application as the image capture progresses. The
|
| - * callbacks will be invoked in the order of shutter callback, preview
|
| - * callback, and JPEG callback. The shutter callback occurs after the image is
|
| - * captured. This can be used to trigger a sound to let the user know that
|
| - * image has been captured. The preview callback occurs when a scaled, fully
|
| - * processed preview image is available. The JPEG callback occurs when the
|
| - * compressed image is available. If there is an error after the capture is in
|
| - * progress, the error callback passed to <code>
|
| - * PPB_ImageCapture_Private.Create()</code> will be invoked. All the callbacks
|
| - * are invoked by the thread that calls this function.
|
| - *
|
| - * The size of the preview image in preview callback is determined by
|
| - * <code>PPB_ImageCaptureConfig_Private.SetPreviewSize</code>. The format is
|
| - * decided by the camera and can be got from <code>PPB_VideoFrame.GetFormat
|
| - * </code>. The size of the JPEG image is determined by <code>
|
| - * PPB_ImageCaptureConfig_Private.SetJpegSize</code>.
|
| - *
|
| - * The camera may need to stop and re-start streaming during image capture. If
|
| - * some MediaStreamVideoTrack are associated with the camera source, they will
|
| - * receive mute and unmute events. The mute event will be received before all
|
| - * the callbacks. The unmute event will be received after all the callbacks.
|
| - * The preview image will not be sent to the video tracks associated with the
|
| - * camera.
|
| - *
|
| - * @param[in] image_capture A <code>PP_Resource</code> corresponding to an
|
| - * image capture resource.
|
| - * @param[in] shutter_callback A <code>
|
| - * PPB_ImageCapture_Private_ShutterCallback</code> callback to indicate the
|
| - * image has been taken.
|
| - * @param[in] preview_callback A <code>
|
| - * PPB_ImageCapture_Private_PreviewCallback</code> callback to return a
|
| - * preview of the captured image.
|
| - * @param[in] jpeg_callback A <code>
|
| - * PPB_ImageCapture_Private_JpegCallback</code> callback to return captured
|
| - * JPEG image.
|
| - * @param[out] sequence_id The sequence ID is a unique monotonically
|
| - * increasing value starting from 0, incremented every time a new request like
|
| - * image capture is submitted.
|
| - *
|
| - * @return An int32_t containing a result code from <code>pp_errors.h</code>.
|
| - * PP_OK means the callbacks will be triggered. Other values mean the
|
| - * callbacks will not be triggered.
|
| - */
|
| - int32_t (*CaptureStillImage)(
|
| - PP_Resource image_capture,
|
| - PPB_ImageCapture_Private_ShutterCallback shutter_callback,
|
| - PPB_ImageCapture_Private_PreviewCallback preview_callback,
|
| - PPB_ImageCapture_Private_JpegCallback jpeg_callback,
|
| - int64_t* sequence_id);
|
| };
|
|
|
| typedef struct PPB_ImageCapture_Private_0_1 PPB_ImageCapture_Private;
|
|
|