diff options
| -rw-r--r-- | camera/CameraHal.cpp | 8 | ||||
| -rw-r--r-- | camera/CameraHal_Module.cpp | 5 | ||||
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 2 | ||||
| -rw-r--r-- | camera/inc/CameraHal.h | 6 |
4 files changed, 10 insertions, 11 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index 12a41a1..74e4634 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -142,7 +142,7 @@ CameraHal::SocFamily CameraHal::getSocFamily() { } -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM static preview_stream_extended_ops_t dummyPreviewStreamExtendedOps = { #ifdef OMAP_ENHANCEMENT_CPCAM dummy_update_and_get_buffer, @@ -161,12 +161,12 @@ static preview_stream_extended_ops_t dummyPreviewStreamExtendedOps = { DisplayAdapter::DisplayAdapter() { -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM mExtendedOps = &dummyPreviewStreamExtendedOps; #endif } -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM void DisplayAdapter::setExtendedOps(preview_stream_extended_ops_t * extendedOps) { mExtendedOps = extendedOps ? extendedOps : &dummyPreviewStreamExtendedOps; } @@ -2084,7 +2084,7 @@ status_t CameraHal::setPreviewWindow(struct preview_stream_ops *window) CAMHAL_ASSERT(0); } mDisplayAdapter = displayAdapter; -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM mDisplayAdapter->setExtendedOps(mExtendedPreviewStreamOps); #endif ret = NO_ERROR; diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp index 21dcc1a..ddddacd 100644 --- a/camera/CameraHal_Module.cpp +++ b/camera/CameraHal_Module.cpp @@ -524,20 +524,17 @@ int camera_send_command(struct camera_device * device, ti_dev = (ti_camera_device_t*) device; -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM if ( cmd == CAMERA_CMD_SETUP_EXTENDED_OPERATIONS ) { camera_device_extended_ops_t * const ops = static_cast<camera_device_extended_ops_t*>( camera_cmd_send_command_args_to_pointer(arg1, arg2)); -#ifdef OMAP_ENHANCEMENT_CPCAM ops->set_extended_preview_ops = camera_set_extended_preview_ops; ops->set_buffer_source = camera_set_buffer_source; ops->release_buffer_source = camera_release_buffer_source; ops->take_picture_with_parameters = camera_take_picture_with_parameters; ops->reprocess = camera_reprocess; ops->cancel_reprocess = camera_cancel_reprocess; -#endif - return OK; } #endif diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index ce0c117..c3ad9fc 100755 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -4391,6 +4391,7 @@ public: return err; } +#ifdef OMAP_ENHANCEMENT_CPCAM CAMHAL_LOGD("Camera mode: CPCAM "); properties->setMode(MODE_CPCAM); err = fetchCapabiltiesForMode(OMX_TI_CPCam, @@ -4399,6 +4400,7 @@ public: if ( NO_ERROR != err ) { return err; } +#endif #ifdef CAMERAHAL_OMAP5_CAPTURE_MODES diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index 4a21a67..805be06 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -1022,7 +1022,7 @@ class DisplayAdapter : public BufferProvider, public virtual android::RefBase public: DisplayAdapter(); -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM preview_stream_extended_ops_t * extendedOps() const { return mExtendedOps; } @@ -1060,7 +1060,7 @@ public: virtual bool match(const char * str) { return false; } private: -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM preview_stream_extended_ops_t * mExtendedOps; #endif }; @@ -1428,7 +1428,7 @@ public: android::sp<DisplayAdapter> mBufferSourceAdapter_In; android::sp<DisplayAdapter> mBufferSourceAdapter_Out; -#ifdef OMAP_ENHANCEMENT +#ifdef OMAP_ENHANCEMENT_CPCAM preview_stream_extended_ops_t * mExtendedPreviewStreamOps; #endif |