From e04cb0a6d89e5757d05e663a264e4059c0197e83 Mon Sep 17 00:00:00 2001 From: jchuang Date: Thu, 5 Feb 2015 10:00:59 -0800 Subject: Image Capture PPAPI: remove unused APIs 1. Remove ppb_image_capture_config_private. 2. Remove PPB_ImageCapture_Private.{Set|Get}Config 3. Remove PPB_ImageCapture_Private.CaptureStillImage BUG=387547 TEST=None Review URL: https://codereview.chromium.org/884483007 Cr-Commit-Position: refs/heads/master@{#314834} --- ppapi/c/private/ppb_image_capture_config_private.h | 115 ------------- ppapi/c/private/ppb_image_capture_private.h | 177 +-------------------- 2 files changed, 6 insertions(+), 286 deletions(-) delete mode 100644 ppapi/c/private/ppb_image_capture_config_private.h (limited to 'ppapi/c') diff --git a/ppapi/c/private/ppb_image_capture_config_private.h b/ppapi/c/private/ppb_image_capture_config_private.h deleted file mode 100644 index 3788b67..0000000 --- a/ppapi/c/private/ppb_image_capture_config_private.h +++ /dev/null @@ -1,115 +0,0 @@ -/* Copyright 2014 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. - */ - -/* From private/ppb_image_capture_config_private.idl, - * modified Wed Aug 13 17:43:55 2014. - */ - -#ifndef PPAPI_C_PRIVATE_PPB_IMAGE_CAPTURE_CONFIG_PRIVATE_H_ -#define PPAPI_C_PRIVATE_PPB_IMAGE_CAPTURE_CONFIG_PRIVATE_H_ - -#include "ppapi/c/pp_bool.h" -#include "ppapi/c/pp_instance.h" -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_resource.h" -#include "ppapi/c/pp_size.h" -#include "ppapi/c/pp_stdint.h" - -#define PPB_IMAGECAPTURECONFIG_PRIVATE_INTERFACE_0_1 \ - "PPB_ImageCaptureConfig_Private;0.1" -#define PPB_IMAGECAPTURECONFIG_PRIVATE_INTERFACE \ - PPB_IMAGECAPTURECONFIG_PRIVATE_INTERFACE_0_1 - -/** - * @file - * This file defines the PPB_ImageCaptureConfig_Private interface for - * establishing an image capture configuration resource within the browser. - */ - - -/** - * @addtogroup Interfaces - * @{ - */ -/** - * The PPB_ImageCaptureConfig_Private interface contains pointers - * to several functions for establishing image capture configuration within the - * browser. The new configuration will take effect after - * PPB_ImageCapture_Private.SetConfig is called. - */ -struct PPB_ImageCaptureConfig_Private_0_1 { - /** - * Creates a PPB_ImageCaptureConfig_Private resource. - * - * @param[in] instance A PP_Instance identifying one instance of - * a module. - * - * @return A PP_Resource corresponding to a - * PPB_ImageCaptureConfig_Private resource if successful, 0 if failed. - */ - PP_Resource (*Create)(PP_Instance instance); - /** - * IsImageCaptureConfig() determines if the given resource is a - * PPB_ImageCaptureConfig_Private. - * - * @param[in] resource A PP_Resource corresponding to an image - * capture config resource. - * - * @return A PP_Bool containing PP_TRUE if the given - * resource is an ImageCaptureConfig_Private resource, otherwise - * PP_FALSE. - */ - PP_Bool (*IsImageCaptureConfig)(PP_Resource resource); - /** - * GetPreviewSize() returns the preview image size in pixels for the given - * PPB_ImageCaptureConfig_Private. - * - * @param[in] config A PP_Resource corresponding to an image - * capture config resource. - * @param[out] preview_size A PP_Size that indicates the - * requested preview image size. - */ - void (*GetPreviewSize)(PP_Resource config, struct PP_Size* preview_size); - /** - * SetPreviewSize() sets the preview image size for the given - * PPB_ImageCaptureConfig_Private. - * - * @param[in] config A PP_Resource corresponding to a - * PPB_ImageCaptureConfig_Private. - * @param[in] preview_size A PP_Size that indicates the requested - * preview image size. - */ - void (*SetPreviewSize)(PP_Resource config, - const struct PP_Size* preview_size); - /** - * GetJpegSize() returns the JPEG image size in pixels for the given - * PPB_ImageCaptureConfig_Private. - * - * @param[in] config A PP_Resource corresponding to an image - * capture config resource. - * @param[out] jpeg_size A PP_Size that indicates the current - * JPEG image size. - */ - void (*GetJpegSize)(PP_Resource config, struct PP_Size* jpeg_size); - /** - * SetJpegSize() sets the JPEG image size for the given - * PPB_ImageCaptureConfig_Private. - * - * @param[in] config A PP_Resource corresponding to a - * PPB_ImageCaptureConfig_Private. - * @param[in] jpeg_size A PP_Size that indicates the requested - * JPEG image size. - */ - void (*SetJpegSize)(PP_Resource config, const struct PP_Size* jpeg_size); -}; - -typedef struct PPB_ImageCaptureConfig_Private_0_1 - PPB_ImageCaptureConfig_Private; -/** - * @} - */ - -#endif /* PPAPI_C_PRIVATE_PPB_IMAGE_CAPTURE_CONFIG_PRIVATE_H_ */ - diff --git a/ppapi/c/private/ppb_image_capture_private.h b/ppapi/c/private/ppb_image_capture_private.h index 190c9a6..0c04c05 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 Wed Aug 13 17:26:13 2014. + * modified Thu Feb 5 22:47:43 2015. */ #ifndef PPAPI_C_PRIVATE_PPB_IMAGE_CAPTURE_PRIVATE_H_ @@ -30,93 +30,16 @@ /** - * @addtogroup Typedefs - * @{ - */ -/** - * Callback function for PPB_ImageCapture_Private.CaptureStillImage - * 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 - * PPB_ImageCapture_Private.Create(). - * |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 PPB_ImageCapture_Private.CaptureStillImage - * to deliver a preview image. The client can use this to show the - * captured image. See PPB_ImageCapture_Private.CaptureStillImage - * for more information. - * - * Parameters: - * |user_data| The same pointer that was passed into - * PPB_ImageCapture_Private.Create(). - * |sequence_id| The sequence ID of the image capture, same as the one from - * CaptureStillImage. - * |preview| A PP_Resource 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 PPB_ImageCapture_Private.CaptureStillImage - * to deliver a still JPEG image. See - * PPB_ImageCapture_Private.CaptureStillImage for more information. - * - * Parameters: - * |user_data| The same pointer that was passed into - * PPB_ImageCapture_Private.Create(). - * |sequence_id| The sequence ID of the image capture, same as the one from - * CaptureStillImage. - * |jpeg| A PP_Resource 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 PPB_ImageCapture_Private.CaptureStillImage - * to indicate the image capture has failed. - * - * Parameters: - * |user_data| The same pointer that was passed into - * PPB_ImageCapture_Private.Create(). - * |sequence_id| The sequence ID of the image capture, same as the one from - * CaptureStillImage. - * |int32_t| An error code from pp_errors.h. - */ -typedef void (*PPB_ImageCapture_Private_ErrorCallback)(void* user_data, - int64_t sequence_id, - int32_t pp_error); -/** - * @} - */ - -/** * @addtogroup Interfaces * @{ */ /** - * To capture a still image with this class, use the following steps. + * To query camera capabilities: * 1. Get a PPB_ImageCapture_Private object by Create(). - * 2. Call GetCameraCapabilities to get the supported preview sizes. - * 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. + * 2. Open() camera device with track id of MediaStream video track. + * 3. Call GetCameraCapabilities() to get a + * PPB_CameraCapabilities_Private object, which can be used to + * query camera capabilities. */ struct PPB_ImageCapture_Private_0_1 { /** @@ -139,7 +62,6 @@ struct PPB_ImageCapture_Private_0_1 { */ PP_Resource (*Create)(PP_Instance instance, struct PP_Var camera_source_id, - PPB_ImageCapture_Private_ErrorCallback error_callback, void* user_data); /** * Determines if a resource is an image capture resource. @@ -167,40 +89,6 @@ struct PPB_ImageCapture_Private_0_1 { */ int32_t (*Close)(PP_Resource resource, struct PP_CompletionCallback callback); /** - * Sets the configuration of the image capture. - * If SetConfig() is not called, default settings will be used. - * - * @param[in] image_capture A PP_Resource corresponding to an - * image capture resource. - * @param[in] config A PP_ImageCaptureConfig_Private object. - * @param[in] callback PP_CompletionCallback to be called upon - * completion of SetConfig(). - * - * @return An int32_t containing a result code from pp_errors.h. - * Returns PP_ERROR_INPROGRESS if there is a pending call of - * SetConfig() or CaptureStillImage(). - * 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 PP_Resource corresponding to an - * image capture resource. - * @param[out] config A PP_ImageCaptureConfig_Private for storing - * the current image capture config on success. Otherwise, the values will not - * be changed. - * @param[in] callback PP_CompletionCallback to be called upon - * completion of GetConfig(). - * - * @return An int32_t containing a result code from pp_errors.h. - */ - 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. @@ -218,59 +106,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 - * PPB_ImageCapture_Private.Create() 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 - * PPB_ImageCaptureConfig_Private.SetPreviewSize. The format is - * decided by the camera and can be got from PPB_VideoFrame.GetFormat - * . The size of the JPEG image is determined by - * PPB_ImageCaptureConfig_Private.SetJpegSize. - * - * 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 PP_Resource corresponding to an - * image capture resource. - * @param[in] shutter_callback A - * PPB_ImageCapture_Private_ShutterCallback callback to indicate the - * image has been taken. - * @param[in] preview_callback A - * PPB_ImageCapture_Private_PreviewCallback callback to return a - * preview of the captured image. - * @param[in] jpeg_callback A - * PPB_ImageCapture_Private_JpegCallback 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 pp_errors.h. - * 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; -- cgit v1.1