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

Unified Diff: ppapi/thunk/ppb_image_capture_private_thunk.cc

Issue 848863002: PPAPI: implement GetSupportedPreviewSizes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error on Linux build Created 5 years, 11 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
Index: ppapi/thunk/ppb_image_capture_private_thunk.cc
diff --git a/ppapi/thunk/ppb_image_capture_private_thunk.cc b/ppapi/thunk/ppb_image_capture_private_thunk.cc
index ae88783cf5aa2c781f40d5515298a2876eb86e63..90db2e7783c84f62e6d73fdaf8a4653160c866cd 100644
--- a/ppapi/thunk/ppb_image_capture_private_thunk.cc
+++ b/ppapi/thunk/ppb_image_capture_private_thunk.cc
@@ -2,7 +2,7 @@
// 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_private.idl modified Wed Nov 5 14:29:15 2014.
+// From private/ppb_image_capture_private.idl modified Tue Dec 9 11:58:37 2014.
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"
@@ -17,16 +17,12 @@ namespace thunk {
namespace {
-PP_Resource Create(PP_Instance instance,
- struct PP_Var camera_source_id,
- PPB_ImageCapture_Private_ErrorCallback error_callback,
- void* user_data) {
+PP_Resource Create(PP_Instance instance) {
VLOG(4) << "PPB_ImageCapture_Private::Create()";
EnterResourceCreation enter(instance);
if (enter.failed())
return 0;
- return enter.functions()->CreateImageCapturePrivate(
- instance, camera_source_id, error_callback, user_data);
+ return enter.functions()->CreateImageCapturePrivate(instance);
}
PP_Bool IsImageCapture(PP_Resource resource) {
@@ -35,12 +31,22 @@ PP_Bool IsImageCapture(PP_Resource resource) {
return PP_FromBool(enter.succeeded());
}
-int32_t Close(PP_Resource resource, struct PP_CompletionCallback callback) {
- VLOG(4) << "PPB_ImageCapture_Private::Close()";
- EnterResource<PPB_ImageCapture_API> enter(resource, callback, true);
+int32_t Open(PP_Resource image_capture,
+ struct PP_Var device_id,
+ struct PP_CompletionCallback callback) {
+ VLOG(4) << "PPB_ImageCapture_Private::Open()";
+ EnterResource<PPB_ImageCapture_API> enter(image_capture, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Close(enter.callback()));
+ return enter.SetResult(enter.object()->Open(device_id, enter.callback()));
+}
+
+void Close(PP_Resource image_capture) {
+ VLOG(4) << "PPB_ImageCapture_Private::Close()";
+ EnterResource<PPB_ImageCapture_API> enter(image_capture, true);
+ if (enter.failed())
+ return;
+ enter.object()->Close();
}
int32_t SetConfig(PP_Resource image_capture,
@@ -74,27 +80,39 @@ int32_t GetCameraCapabilities(PP_Resource image_capture,
enter.object()->GetCameraCapabilities(capabilities, enter.callback()));
}
+int32_t ReuseBuffers(PP_Resource image_capture) {
+ VLOG(4) << "PPB_ImageCapture_Private::ReuseBuffers()";
+ EnterResource<PPB_ImageCapture_API> enter(image_capture, true);
+ if (enter.failed())
+ return enter.retval();
+ return enter.object()->ReuseBuffers();
+}
+
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) {
+ PPB_ImageCapture_Private_ErrorCallback error_callback,
+ uint64_t* sequence_id) {
VLOG(4) << "PPB_ImageCapture_Private::CaptureStillImage()";
EnterResource<PPB_ImageCapture_API> enter(image_capture, true);
if (enter.failed())
return enter.retval();
return enter.object()->CaptureStillImage(shutter_callback, preview_callback,
- jpeg_callback, sequence_id);
+ jpeg_callback, error_callback,
+ sequence_id);
}
const PPB_ImageCapture_Private_0_1 g_ppb_imagecapture_private_thunk_0_1 = {
&Create,
&IsImageCapture,
+ &Open,
&Close,
&SetConfig,
&GetConfig,
&GetCameraCapabilities,
+ &ReuseBuffers,
&CaptureStillImage};
} // namespace

Powered by Google App Engine
This is Rietveld 408576698