Index: ppapi/api/private/ppb_image_capture_private.idl |
diff --git a/ppapi/api/private/ppb_image_capture_private.idl b/ppapi/api/private/ppb_image_capture_private.idl |
index 36c410fa58ef043d7635fd9fde8084ed7f908929..75c75d5df5b29f03c766c97814e868bf77cf4d30 100644 |
--- a/ppapi/api/private/ppb_image_capture_private.idl |
+++ b/ppapi/api/private/ppb_image_capture_private.idl |
@@ -11,7 +11,7 @@ |
[generate_thunk] |
label Chrome { |
- M39 = 0.1 |
+ M42 = 0.1 |
}; |
/** |
@@ -28,22 +28,11 @@ interface PPB_ImageCapture_Private { |
* |
* @param[in] instance A <code>PP_Instance</code> identifying one instance |
* of a module. |
- * @param[in] camera_source_id A <code>PP_Var</code> identifying a camera |
- * source. The type is string. The ID can be obtained from |
- * MediaStreamTrack.getSources() or MediaStreamVideoTrack.id. If a |
- * MediaStreamVideoTrack is associated with the same source and the track |
- * is closed, this PPB_ImageCapture_Private object can still do image capture. |
- * @param[in] error_callback A <code>PPB_ImageCapture_Private_ErrorCallback |
- * </code> callback to indicate the image capture has failed. |
- * @param[inout] user_data An opaque pointer that will be passed to the |
- * callbacks of PPB_ImageCapture_Private. |
* |
* @return A <code>PP_Resource</code> corresponding to a |
* PPB_ImageCapture_Private resource if successful, 0 if failed. |
*/ |
- PP_Resource Create([in] PP_Instance instance, |
- [in] PP_Var camera_source_id, |
- [inout] mem_t user_data); |
+ PP_Resource Create([in] PP_Instance instance); |
/** |
* Determines if a resource is an image capture resource. |
@@ -57,6 +46,24 @@ interface PPB_ImageCapture_Private { |
PP_Bool IsImageCapture([in] PP_Resource resource); |
/** |
+ * Opens a video capture device. |
+ * |
+ * @param[in] image_capture A <code>PP_Resource</code> corresponding to an |
+ * image capture resource. |
+ * @param[in] device_id A <code>PP_Var</code> identifying a camera device. The |
+ * type is string. The ID can be obtained from MediaStreamTrack.getSources() |
+ * or MediaStreamVideoTrack.id. |
+ * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon |
+ * completion of <code>Open()</code>. |
+ * |
+ * @return An error code from <code>pp_errors.h</code>. |
+ */ |
+ int32_t Open( |
+ [in] PP_Resource image_capture, |
+ [in] PP_Var device_id, |
+ [in] PP_CompletionCallback callback); |
+ |
+ /** |
* Disconnects from the camera and cancels all pending capture requests. |
* After this returns, no callbacks will be called. If <code> |
* PPB_ImageCapture_Private</code> is destroyed and is not closed yet, this |
@@ -65,13 +72,8 @@ interface PPB_ImageCapture_Private { |
* |
* @param[in] image_capture A <code>PP_Resource</code> corresponding to an |
* image capture resource. |
- * @param[in] callback <code>PP_CompletionCallback</code> to be called upon |
- * completion of <code>Close()</code>. |
- * |
- * @return An int32_t containing a result code from <code>pp_errors.h</code>. |
*/ |
- int32_t Close([in] PP_Resource resource, |
- [in] PP_CompletionCallback callback); |
+ void Close([in] PP_Resource image_capture); |
/** |
* Gets the camera capabilities. |