Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: ppapi/cpp/private/image_capture_private.h

Issue 848863002: PPAPI: implement GetSupportedPreviewSizes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo: int32->int32_t Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/cpp/private/camera_capabilities_private.cc ('k') | ppapi/cpp/private/image_capture_private.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/private/image_capture_private.h
diff --git a/ppapi/cpp/private/image_capture_private.h b/ppapi/cpp/private/image_capture_private.h
index eede24a03238c21390c67f37fa6edce47659e96f..98382a2e1c6140bace826eb58f1c25b58005d774 100644
--- a/ppapi/cpp/private/image_capture_private.h
+++ b/ppapi/cpp/private/image_capture_private.h
@@ -7,8 +7,6 @@
#define PPAPI_CPP_PRIVATE_IMAGE_CAPTURE_PRIVATE_H_
#include "ppapi/c/private/ppb_image_capture_private.h"
-#include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/private/camera_capabilities_private.h"
#include "ppapi/cpp/resource.h"
#include "ppapi/cpp/var.h"
@@ -17,63 +15,68 @@
/// acquiring a single still image from a camera source.
namespace pp {
+class CameraCapabilities_Private;
+class CompletionCallback;
+class InstanceHandle;
+
+template <typename T>
+class CompletionCallbackWithOutput;
+
/// To query camera capabilities:
-/// 1. Get a PPB_ImageCapture_Private object by Create().
+/// 1. Create an ImageCapture_Private object.
/// 2. Open() camera device with track id of MediaStream video track.
/// 3. Call GetCameraCapabilities() to get a
-/// <code>PPB_CameraCapabilities_Private</code> object, which can be used to
+/// <code>CameraCapabilities_Private</code> object, which can be used to
/// query camera capabilities.
-class ImageCapture_Private {
+class ImageCapture_Private : public Resource {
public:
/// Default constructor for creating an is_null()
/// <code>ImageCapture_Private</code> object.
ImageCapture_Private();
- /// Creates an ImageCapture_Private resource.
+ /// The copy constructor for <code>ImageCapture_Private</code>.
///
- /// @param[in] instance A <code>PP_Instance</code> identifying one instance
- /// of a module.
- /// @param[in] camera_source_id A <code>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 ImageCapture_Private object can still do image capture.
- /// @param[in] error_callback A <code>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 ImageCapture_Private.
- ImageCapture_Private(const InstanceHandle& instance,
- const Var& camera_source_id,
- void* user_data);
-
- /// Constructs a <code>ImageCapture_Private</code> from a <code>
- /// Resource</code>.
+ /// @param[in] other A reference to a <code>ImageCapture_Private</code>.
+ ImageCapture_Private(const ImageCapture_Private& other);
+
+ /// Constructs an <code>ImageCapture_Private</code> from
+ /// a <code>Resource</code>.
///
- /// @param[in] resource A <code>ImageCapture_Private</code>
- /// resource.
+ /// @param[in] resource A <code>PPB_ImageCapture_Private</code> resource.
explicit ImageCapture_Private(const Resource& resource);
+ /// Constructs an ImageCapture_Private resource.
+ ///
+ /// @param[in] instance A <code>PP_Instance</code> identifying one instance
+ /// of a module.
+ explicit ImageCapture_Private(const InstanceHandle& instance);
+
/// A constructor used when you have received a <code>PP_Resource</code> as a
/// return value that has had 1 ref added for you.
///
- /// @param[in] resource A <code>ImageCapture_Private</code>
- /// resource.
+ /// @param[in] resource A <code>PPB_ImageCapture_Private</code> resource.
ImageCapture_Private(PassRef, PP_Resource resource);
// Destructor.
~ImageCapture_Private();
+ /// Opens a video capture device.
+ ///
+ /// @param[in] device_id A <code>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>CompletionCallback</code> to be called upon
+ /// completion of <code>Open()</code>.
+ ///
+ /// @return An int32_t containing a result code from <code>pp_errors.h</code>.
+ int32_t Open(const Var& device_id, const CompletionCallback& callback);
+
/// Disconnects from the camera and cancels all pending capture requests.
/// After this returns, no callbacks will be called. If <code>
/// ImageCapture_Private</code> is destroyed and is not closed yet, this
/// function will be automatically called. Calling this more than once has no
/// effect.
- ///
- /// @param[in] callback <code>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(const CompletionCallback& callback);
+ void Close();
/// Gets the camera capabilities.
///
@@ -98,4 +101,3 @@ class ImageCapture_Private {
} // namespace pp
#endif /* PPAPI_CPP_PRIVATE_IMAGE_CAPTURE_PRIVATE_H_ */
-
« no previous file with comments | « ppapi/cpp/private/camera_capabilities_private.cc ('k') | ppapi/cpp/private/image_capture_private.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698