Camera: Rework CPCam to preserve HAL ABI compatibility

Implemented initialization of camera_device_extended_ops_t.

Moved take_picture_with_parameters into separate function.

Implemented calling CPCam surface callbacks via
preview_stream_extended_ops_t. The default dummy functions always do
no-op and return INVALID_OPERATION.

Change-Id: I00efd08544ea5a0c7b22c7a2135a332871f06792
Signed-off-by: Daniel Levin <dendy@ti.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/camera/BufferSourceAdapter.cpp b/camera/BufferSourceAdapter.cpp
index 2874244..c542741 100644
--- a/camera/BufferSourceAdapter.cpp
+++ b/camera/BufferSourceAdapter.cpp
@@ -469,7 +469,7 @@ CameraBuffer* BufferSourceAdapter::getBufferList(int *num) {
         return NULL;
     }
 
-    err = mBufferSource->update_and_get_buffer(mBufferSource, &handle, &mBuffers[0].stride);
+    err = extendedOps()->update_and_get_buffer(mBufferSource, &handle, &mBuffers[0].stride);
     if (err != 0) {
         CAMHAL_LOGEB("update and get buffer failed: %s (%d)", strerror(-err), -err);
         if ( ENODEV == err ) {
@@ -484,8 +484,8 @@ CameraBuffer* BufferSourceAdapter::getBufferList(int *num) {
     mBuffers[0].type = CAMERA_BUFFER_ANW;
     mFramesWithCameraAdapterMap.add(handle, 0);
 
-    err = mBufferSource->get_buffer_dimension(mBufferSource, &mBuffers[0].width, &mBuffers[0].height);
-    err = mBufferSource->get_buffer_format(mBufferSource, &formatSource);
+    err = extendedOps()->get_buffer_dimension(mBufferSource, &mBuffers[0].width, &mBuffers[0].height);
+    err = extendedOps()->get_buffer_format(mBufferSource, &formatSource);
 
     // lock buffer
     {
@@ -699,7 +699,7 @@ void BufferSourceAdapter::handleFrameCallback(CameraFrame* frame)
     if ( NULL != frame->mMetaData ) {
         camera_metadata_t *metaData = static_cast<camera_metadata_t *> (frame->mMetaData->data);
         metaData->timestamp = frame->mTimestamp;
-        ret = mBufferSource->set_metadata(mBufferSource, frame->mMetaData);
+        ret = extendedOps()->set_metadata(mBufferSource, frame->mMetaData);
         if (ret != 0) {
             CAMHAL_LOGE("Surface::set_metadata returned error %d", ret);
         }