Merge ~chrisccoulson/libhybris/+git/libhybris:oxide-camera into ~libhybris-maintainers/libhybris/+git/libhybris:master

[Chris Coulson]

Various fixes to allow camera access to work in the web browser

[Jim Hodapp (jhodapp)]

Looks good, a few inline comments.

review: Needs Fixing (code)

[Simon Fels (morphis)]

LGTM

review: Approve

[Simon Fels (morphis)]

Overriding Jims review here as his comments were addressed.

diff --git a/compat/camera/camera_compatibility_layer.cpp b/compat/camera/camera_compatibility_layer.cpp
index 3d8e5bc..a6bdeae 100644
--- a/compat/camera/camera_compatibility_layer.cpp
+++ b/compat/camera/camera_compatibility_layer.cpp
@@ -45,6 +45,8 @@
 
 #undef LOG_TAG
 #define LOG_TAG "CameraCompatibilityLayer"
+#include <utils/Debug.h>
+#include <utils/Errors.h>
 #include <utils/KeyedVector.h>
 #include <utils/Log.h>
 #include <utils/String16.h>
@@ -55,6 +57,8 @@
 
 #define REPORT_FUNCTION() ALOGV("%s \n", __PRETTY_FUNCTION__)
 
+using android::CompileTimeAssert; // So COMPILE_TIME_ASSERT works
+
 // From android::GLConsumer::FrameAvailableListener
 #if ANDROID_VERSION_MAJOR==5 && ANDROID_VERSION_MINOR>=1
   void CameraControl::onFrameAvailable(const android::BufferItem& item)
@@ -117,6 +121,9 @@ void CameraControl::postData(
 		if (listener->on_data_compressed_image_cb)
 			listener->on_data_compressed_image_cb(data->pointer(), data->size(), listener->context);
 		break;
+	case CAMERA_MSG_PREVIEW_FRAME:
+		if (listener->on_preview_frame_cb)
+			listener->on_preview_frame_cb(data->pointer(), data->size(), listener->context);
 	default:
 		break;
 	}
@@ -159,38 +166,59 @@ sp<GraphicBuffer> NativeBufferAlloc::createGraphicBuffer(uint32_t w, uint32_t h,
 }
 }
 
-namespace
+int android_camera_get_number_of_devices()
 {
-
-android::sp<CameraControl> camera_control_instance;
-
+	REPORT_FUNCTION();
+	return android::Camera::getNumberOfCameras();
 }
 
-int android_camera_get_number_of_devices()
+int android_camera_get_device_info(int32_t camera_id, int* facing, int* orientation)
 {
 	REPORT_FUNCTION();
-	return android::Camera::getNumberOfCameras();
+
+	if (!facing || !orientation)
+		return android::BAD_VALUE;
+
+	COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CAMERA_FACING_BACK == static_cast<int>(BACK_FACING_CAMERA_TYPE));
+	COMPILE_TIME_ASSERT_FUNCTION_SCOPE(CAMERA_FACING_FRONT == static_cast<int>(FRONT_FACING_CAMERA_TYPE));
+
+	android::CameraInfo ci;
+
+	int rv = android::Camera::getCameraInfo(camera_id, &ci);
+	if (rv != android::OK)
+		return rv;
+
+	*facing = ci.facing;
+	*orientation = ci.orientation;
+
+	return android::OK;
 }
 
 CameraControl* android_camera_connect_to(CameraType camera_type, CameraControlListener* listener)
 {
 	REPORT_FUNCTION();
 
-	int32_t camera_id;
-	int32_t camera_count = camera_id = android::Camera::getNumberOfCameras();
+	const int32_t camera_count = android::Camera::getNumberOfCameras();
 
-	for (camera_id = 0; camera_id < camera_count; camera_id++) {
+	for (int32_t camera_id = 0; camera_id < camera_count; camera_id++) {
 		android::CameraInfo ci;
 		android::Camera::getCameraInfo(camera_id, &ci);
 
-		if (ci.facing == camera_type)
-			break;
+		if (ci.facing != camera_type)
+			continue;
+
+		return android_camera_connect_by_id(camera_id, listener);
 	}
 
-	if (camera_id == camera_count)
+	return NULL;
+}
+
+CameraControl* android_camera_connect_by_id(int32_t camera_id, struct CameraControlListener* listener)
+{
+	if (camera_id < 0 || camera_id >= android::Camera::getNumberOfCameras())
 		return NULL;
 
-	CameraControl* cc = new CameraControl();
+	android::sp<CameraControl> cc = new CameraControl();
 	cc->listener = listener;
 #if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR>=3 || ANDROID_VERSION_MAJOR==5
 	cc->camera = android::Camera::connect(camera_id, android::String16("hybris"), android::Camera::USE_CALLING_UID);
@@ -203,14 +231,15 @@ CameraControl* android_camera_connect_to(CameraType camera_type, CameraControlLi
 
 	cc->camera_parameters = android::CameraParameters(cc->camera->getParameters());
 
-	camera_control_instance = cc;
-	cc->camera->setListener(camera_control_instance);
+	// android::Camera holds a strong reference to the listener, keeping
+	// |cc| alive
+	cc->camera->setListener(cc);
 	cc->camera->lock();
 
 	// TODO: Move this to a more generic component
 	android::ProcessState::self()->startThreadPool();
 
-	return cc;
+	return cc.get();
 }
 
 void android_camera_disconnect(CameraControl* control)
@@ -241,7 +270,9 @@ int android_camera_unlock(CameraControl* control)
 
 void android_camera_delete(CameraControl* control)
 {
-	delete control;
+	android::sp<android::Camera> camera = control->camera;
+	control->camera.clear();
+	camera.clear();
 }
 
 void android_camera_dump_parameters(CameraControl* control)
@@ -814,6 +845,22 @@ void android_camera_take_snapshot(CameraControl* control)
 	control->camera->takePicture(CAMERA_MSG_SHUTTER | CAMERA_MSG_COMPRESSED_IMAGE);
 }
 
+int android_camera_set_preview_callback_mode(CameraControl* control, PreviewCallbackMode mode)
+{
+	REPORT_FUNCTION();
+
+	if (!control)
+		return android::BAD_VALUE;
+
+	android::Mutex::Autolock al(control->guard);
+
+	control->camera->setPreviewCallbackFlags(
+		mode == PREVIEW_CALLBACK_ENABLED ?
+			CAMERA_FRAME_CALLBACK_FLAG_CAMCORDER : CAMERA_FRAME_CALLBACK_FLAG_NOOP);
+
+	return android::OK;
+}
+
 void android_camera_set_preview_format(CameraControl* control, CameraPixelFormat pf)
 {
 	REPORT_FUNCTION();
diff --git a/hybris/camera/camera.c b/hybris/camera/camera.c
index 41071a1..9f1c2d2 100644
--- a/hybris/camera/camera.c
+++ b/hybris/camera/camera.c
@@ -31,8 +31,11 @@
 HYBRIS_LIBRARY_INITIALIZE(camera, COMPAT_LIBRARY_PATH);
 
 HYBRIS_IMPLEMENT_FUNCTION0(camera, int, android_camera_get_number_of_devices);
+HYBRIS_IMPLEMENT_FUNCTION3(camera, int, android_camera_get_device_info, int32_t, int*, int*);
 HYBRIS_IMPLEMENT_FUNCTION2(camera, struct CameraControl*, android_camera_connect_to,
 	CameraType, struct CameraControlListener*);
+HYBRIS_IMPLEMENT_FUNCTION2(camera, struct CameraControl*, android_camera_connect_by_id,
+	int32_t, struct CameraControlListener*);
 HYBRIS_IMPLEMENT_VOID_FUNCTION1(camera, android_camera_disconnect,
 	struct CameraControl*);
 HYBRIS_IMPLEMENT_FUNCTION1(camera, int, android_camera_lock, struct CameraControl*);
@@ -52,6 +55,8 @@ HYBRIS_IMPLEMENT_VOID_FUNCTION2(camera, android_camera_set_scene_mode,
 	struct CameraControl*, SceneMode);
 HYBRIS_IMPLEMENT_VOID_FUNCTION2(camera, android_camera_set_auto_focus_mode,
 	struct CameraControl*, AutoFocusMode);
+HYBRIS_IMPLEMENT_VOID_FUNCTION2(camera, android_camera_set_preview_format,
+	struct CameraControl*, CameraPixelFormat);
 HYBRIS_IMPLEMENT_VOID_FUNCTION3(camera, android_camera_set_picture_size,
 	struct CameraControl*, int, int);
 HYBRIS_IMPLEMENT_VOID_FUNCTION3(camera, android_camera_set_thumbnail_size,
@@ -134,3 +139,6 @@ HYBRIS_IMPLEMENT_VOID_FUNCTION2(camera, android_camera_start_zoom, struct Camera
 HYBRIS_IMPLEMENT_VOID_FUNCTION2(camera, android_camera_set_zoom, struct CameraControl*, int32_t);
 HYBRIS_IMPLEMENT_VOID_FUNCTION1(camera, android_camera_stop_zoom, struct CameraControl*);
 HYBRIS_IMPLEMENT_VOID_FUNCTION1(camera, android_camera_take_snapshot, struct CameraControl*);
+
+HYBRIS_IMPLEMENT_FUNCTION2(camera, int, android_camera_set_preview_callback_mode,
+	struct CameraControl*, PreviewCallbackMode);
diff --git a/hybris/include/hybris/camera/camera_compatibility_layer.h b/hybris/include/hybris/camera/camera_compatibility_layer.h
index 72aabcf..90f12a0 100644
--- a/hybris/include/hybris/camera/camera_compatibility_layer.h
+++ b/hybris/include/hybris/camera/camera_compatibility_layer.h
@@ -37,6 +37,12 @@ extern "C" {
         FRONT_FACING_CAMERA_TYPE
     } CameraType;
 
+    typedef enum
+    {
+        PREVIEW_CALLBACK_DISABLED,
+        PREVIEW_CALLBACK_ENABLED
+    } PreviewCallbackMode;
+
     struct CameraControl;
 
     typedef void (*on_msg_error)(void* context);
@@ -47,6 +53,7 @@ extern "C" {
     typedef void (*on_data_raw_image)(void* data, uint32_t data_size, void* context);
     typedef void (*on_data_compressed_image)(void* data, uint32_t data_size, void* context);
     typedef void (*on_preview_texture_needs_update)(void* context);
+    typedef void (*on_preview_frame)(void* data, uint32_t data_size, void* context);
 
     struct CameraControlListener
     {
@@ -73,10 +80,14 @@ extern "C" {
         on_preview_texture_needs_update on_preview_texture_needs_update_cb;
 
         void* context;
+
+        // Called when there is a new preview frame
+        on_preview_frame on_preview_frame_cb;
     };
 
     // Initializes a connection to the camera, returns NULL on error.
     struct CameraControl* android_camera_connect_to(CameraType camera_type, struct CameraControlListener* listener);
+    struct CameraControl* android_camera_connect_by_id(int32_t camera_id, struct CameraControlListener* listener);
 
     // Disconnects the camera and deletes the pointer
     void android_camera_disconnect(struct CameraControl* control);
@@ -135,6 +146,9 @@ extern "C" {
     // completed. Ideally, this is done from the raw data callback.
     void android_camera_take_snapshot(struct CameraControl* control);
 
+    // Enable or disable the preview callback for clients that want software frames
+    int android_camera_set_preview_callback_mode(struct CameraControl* control, PreviewCallbackMode mode);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/hybris/include/hybris/camera/camera_compatibility_layer_capabilities.h b/hybris/include/hybris/camera/camera_compatibility_layer_capabilities.h
index 66bbaa7..486f9fc 100644
--- a/hybris/include/hybris/camera/camera_compatibility_layer_capabilities.h
+++ b/hybris/include/hybris/camera/camera_compatibility_layer_capabilities.h
@@ -105,6 +105,7 @@ extern "C" {
 
     // Query camera parameters
     int android_camera_get_number_of_devices();
+    int android_camera_get_device_info(int32_t camera_id, int* facing, int* orientation);
     void android_camera_enumerate_supported_preview_sizes(struct CameraControl* control, size_callback cb, void* ctx);
     void android_camera_get_preview_fps_range(struct CameraControl* control, int* min, int* max);
     void android_camera_get_preview_fps(struct CameraControl* control, int* fps);