Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e074a930 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh
Browse files

CameraService: intercept Camera module 

Wrap camera module returned from HAL so get_camera_info returns
static_camera_characteristics processed by framework, which
generates keys added after HAL3.2 is released.

Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
parent 16469200

services/camera/libcameraservice/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ LOCAL_SRC_FILES:= \ 
    CameraDeviceFactory.cpp \

    common/Camera2ClientBase.cpp \

    common/CameraDeviceBase.cpp \

    common/CameraModule.cpp \

    common/FrameProcessorBase.cpp \

    api1/CameraClient.cpp \

    api1/Camera2Client.cpp \

services/camera/libcameraservice/CameraService.cpp

+29 −27
Original line number Diff line number Diff line
@@ -113,14 +113,17 @@ void CameraService::onFirstRef() 


    BnCameraService::onFirstRef();



    camera_module_t *rawModule;

    if (hw_get_module(CAMERA_HARDWARE_MODULE_ID,

                (const hw_module_t **)&mModule) < 0) {

                (const hw_module_t **)&rawModule) < 0) {

        ALOGE("Could not load camera HAL module");

        mNumberOfCameras = 0;

    }

    else {

        ALOGI("Loaded \"%s\" camera module", mModule->common.name);

        mNumberOfCameras = mModule->get_number_of_cameras();

        mModule = new CameraModule(rawModule);

        const hw_module_t *common = mModule->getRawModule();

        ALOGI("Loaded \"%s\" camera module", common->name);

        mNumberOfCameras = mModule->getNumberOfCameras();

        if (mNumberOfCameras > MAX_CAMERAS) {

            ALOGE("Number of cameras(%d) > MAX_CAMERAS(%d).",

                    mNumberOfCameras, MAX_CAMERAS);
@@ -130,14 +133,13 @@ void CameraService::onFirstRef() 
            setCameraFree(i);

        }



        if (mModule->common.module_api_version >=

                CAMERA_MODULE_API_VERSION_2_1) {

            mModule->set_callbacks(this);

        if (common->module_api_version >= CAMERA_MODULE_API_VERSION_2_1) {

            mModule->setCallbacks(this);

        }



        VendorTagDescriptor::clearGlobalVendorTagDescriptor();



        if (mModule->common.module_api_version >= CAMERA_MODULE_API_VERSION_2_2) {

        if (common->module_api_version >= CAMERA_MODULE_API_VERSION_2_2) {

            setUpVendorTags();

        }
@@ -152,6 +154,9 @@ CameraService::~CameraService() { 
        }

    }



    if (mModule) {

        delete mModule;

    }

    VendorTagDescriptor::clearGlobalVendorTagDescriptor();

    gCameraService = NULL;

}
@@ -236,7 +241,7 @@ status_t CameraService::getCameraInfo(int cameraId, 


    struct camera_info info;

    status_t rc = filterGetInfoErrorCode(

        mModule->get_camera_info(cameraId, &info));

        mModule->getCameraInfo(cameraId, &info));

    cameraInfo->facing = info.facing;

    cameraInfo->orientation = info.orientation;

    return rc;
@@ -347,7 +352,7 @@ status_t CameraService::getCameraCharacteristics(int cameraId, 


    int facing;

    status_t ret = OK;

    if (mModule->common.module_api_version < CAMERA_MODULE_API_VERSION_2_0 ||

    if (mModule->getRawModule()->module_api_version < CAMERA_MODULE_API_VERSION_2_0 ||

            getDeviceVersion(cameraId, &facing) <= CAMERA_DEVICE_API_VERSION_2_1 ) {

        /**

         * Backwards compatibility mode for old HALs:
@@ -368,7 +373,7 @@ status_t CameraService::getCameraCharacteristics(int cameraId, 
         * Normal HAL 2.1+ codepath.

         */

        struct camera_info info;

        ret = filterGetInfoErrorCode(mModule->get_camera_info(cameraId, &info));

        ret = filterGetInfoErrorCode(mModule->getCameraInfo(cameraId, &info));

        *cameraInfo = info.static_camera_characteristics;

    }
@@ -387,12 +392,12 @@ status_t CameraService::getCameraVendorTagDescriptor(/*out*/sp<VendorTagDescript 


int CameraService::getDeviceVersion(int cameraId, int* facing) {

    struct camera_info info;

    if (mModule->get_camera_info(cameraId, &info) != OK) {

    if (mModule->getCameraInfo(cameraId, &info) != OK) {

        return -1;

    }



    int deviceVersion;

    if (mModule->common.module_api_version >= CAMERA_MODULE_API_VERSION_2_0) {

    if (mModule->getRawModule()->module_api_version >= CAMERA_MODULE_API_VERSION_2_0) {

        deviceVersion = info.device_version;

    } else {

        deviceVersion = CAMERA_DEVICE_API_VERSION_1_0;
@@ -433,13 +438,13 @@ bool CameraService::setUpVendorTags() { 
    vendor_tag_ops_t vOps = vendor_tag_ops_t();



    // Check if vendor operations have been implemented

    if (mModule->get_vendor_tag_ops == NULL) {

    if (!mModule->isVendorTagDefined()) {

        ALOGI("%s: No vendor tags defined for this device.", __FUNCTION__);

        return false;

    }



    ATRACE_BEGIN("camera3->get_metadata_vendor_tag_ops");

    mModule->get_vendor_tag_ops(&vOps);

    mModule->getVendorTagOps(&vOps);

    ATRACE_END();



    // Ensure all vendor operations are present
@@ -789,8 +794,9 @@ status_t CameraService::connectLegacy( 
        /*out*/

        sp<ICamera>& device) {



    int apiVersion = mModule->getRawModule()->module_api_version;

    if (halVersion != CAMERA_HAL_API_VERSION_UNSPECIFIED &&

            mModule->common.module_api_version < CAMERA_MODULE_API_VERSION_2_3) {

            apiVersion < CAMERA_MODULE_API_VERSION_2_3) {

        /*

         * Either the HAL version is unspecified in which case this just creates

         * a camera client selected by the latest device version, or
@@ -798,7 +804,7 @@ status_t CameraService::connectLegacy( 
         * the open_legacy call

         */

        ALOGE("%s: camera HAL module version %x doesn't support connecting to legacy HAL devices!",

                __FUNCTION__, mModule->common.module_api_version);

                __FUNCTION__, apiVersion);

        return INVALID_OPERATION;

    }
@@ -1633,14 +1639,11 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) { 
            return NO_ERROR;

        }



        result = String8::format("Camera module HAL API version: 0x%x\n",

                mModule->common.hal_api_version);

        result.appendFormat("Camera module API version: 0x%x\n",

                mModule->common.module_api_version);

        result.appendFormat("Camera module name: %s\n",

                mModule->common.name);

        result.appendFormat("Camera module author: %s\n",

                mModule->common.author);

        const hw_module_t* common = mModule->getRawModule();

        result = String8::format("Camera module HAL API version: 0x%x\n", common->hal_api_version);

        result.appendFormat("Camera module API version: 0x%x\n", common->module_api_version);

        result.appendFormat("Camera module name: %s\n", common->name);

        result.appendFormat("Camera module author: %s\n", common->author);

        result.appendFormat("Number of camera devices: %d\n\n", mNumberOfCameras);



        sp<VendorTagDescriptor> desc = VendorTagDescriptor::getGlobalVendorTagDescriptor();
@@ -1660,7 +1663,7 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) { 
            result = String8::format("Camera %d static information:\n", i);

            camera_info info;



            status_t rc = mModule->get_camera_info(i, &info);

            status_t rc = mModule->getCameraInfo(i, &info);

            if (rc != OK) {

                result.appendFormat("  Error reading static information!\n");

                write(fd, result.string(), result.size());
@@ -1669,8 +1672,7 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) { 
                        info.facing == CAMERA_FACING_BACK ? "BACK" : "FRONT");

                result.appendFormat("  Orientation: %d\n", info.orientation);

                int deviceVersion;

                if (mModule->common.module_api_version <

                        CAMERA_MODULE_API_VERSION_2_0) {

                if (common->module_api_version < CAMERA_MODULE_API_VERSION_2_0) {

                    deviceVersion = CAMERA_DEVICE_API_VERSION_1_0;

                } else {

                    deviceVersion = info.device_version;

services/camera/libcameraservice/CameraService.h

+4 −2
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 


#include <camera/ICameraServiceListener.h>



#include "common/CameraModule.h"



/* This needs to be increased if we can have more cameras */

#define MAX_CAMERAS 2
@@ -153,7 +155,7 @@ public: 


    class BasicClient : public virtual RefBase {

    public:

        virtual status_t    initialize(camera_module_t *module) = 0;

        virtual status_t    initialize(CameraModule *module) = 0;

        virtual void        disconnect();



        // because we can't virtually inherit IInterface, which breaks
@@ -385,7 +387,7 @@ private: 
    sp<MediaPlayer>     mSoundPlayer[NUM_SOUNDS];

    int                 mSoundRef;  // reference count (release all MediaPlayer when 0)



    camera_module_t *mModule;

    CameraModule*     mModule;



    Vector<sp<ICameraServiceListener> >

                        mListenerList;

services/camera/libcameraservice/api1/Camera2Client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, 
    mLegacyMode = legacyMode;

}



status_t Camera2Client::initialize(camera_module_t *module)

status_t Camera2Client::initialize(CameraModule *module)

{

    ATRACE_CALL();

    ALOGV("%s: Initializing client for camera %d", __FUNCTION__, mCameraId);

services/camera/libcameraservice/api1/Camera2Client.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public: 


    virtual ~Camera2Client();



    status_t initialize(camera_module_t *module);

    status_t initialize(CameraModule *module);



    virtual status_t dump(int fd, const Vector<String16>& args);