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

Commit f481670d authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Remove "camera3.h" dependencies 

Migrate and rework all "camera3.h" types
so that camerserver can be built without
this header file.

Bug: 153383067
Test: Camera CTS

Change-Id: Iad056c641e2c72c053f59ab9a05dbeb7ce394646
parent ca362e8f

services/camera/libcameraservice/api1/Camera2Client.cpp

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ status_t Camera2Client::initialize(sp<CameraProviderManager> manager, const Stri 
bool Camera2Client::isZslEnabledInStillTemplate() {

    bool zslEnabled = false;

    CameraMetadata stillTemplate;

    status_t res = mDevice->createDefaultRequest(CAMERA2_TEMPLATE_STILL_CAPTURE, &stillTemplate);

    status_t res = mDevice->createDefaultRequest(

            camera_request_template_t::CAMERA_TEMPLATE_STILL_CAPTURE, &stillTemplate);

    if (res == OK) {

        camera_metadata_entry_t enableZsl = stillTemplate.find(ANDROID_CONTROL_ENABLE_ZSL);

        if (enableZsl.count == 1) {

services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
namespace android {

namespace camera2 {



using android::camera3::CAMERA_STREAM_ROTATION_0;



CallbackProcessor::CallbackProcessor(sp<Camera2Client> client):

        Thread(false),

        mClient(client),
@@ -154,7 +156,7 @@ status_t CallbackProcessor::updateStream(const Parameters &params) { 
                callbackFormat, params.previewFormat);

        res = device->createStream(mCallbackWindow,

                params.previewWidth, params.previewHeight, callbackFormat,

                HAL_DATASPACE_V0_JFIF, CAMERA3_STREAM_ROTATION_0, &mCallbackStreamId,

                HAL_DATASPACE_V0_JFIF, CAMERA_STREAM_ROTATION_0, &mCallbackStreamId,

                String8());

        if (res != OK) {

            ALOGE("%s: Camera %d: Can't create output stream for callbacks: "

services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ status_t CaptureSequencer::updateCaptureRequest(const Parameters &params, 


    if (mCaptureRequest.entryCount() == 0) {

        res = client->getCameraDevice()->createDefaultRequest(

                CAMERA2_TEMPLATE_STILL_CAPTURE,

                camera_request_template_t::CAMERA_TEMPLATE_STILL_CAPTURE,

                &mCaptureRequest);

        if (res != OK) {

            ALOGE("%s: Camera %d: Unable to create default still image request:"

services/camera/libcameraservice/api1/client2/JpegProcessor.cpp

+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
namespace android {

namespace camera2 {



using android::camera3::CAMERA_STREAM_ROTATION_0;



JpegProcessor::JpegProcessor(

    sp<Camera2Client> client,

    wp<CaptureSequencer> sequencer):
@@ -148,7 +150,7 @@ status_t JpegProcessor::updateStream(const Parameters &params) { 
        res = device->createStream(mCaptureWindow,

                params.pictureWidth, params.pictureHeight,

                HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_V0_JFIF,

                CAMERA3_STREAM_ROTATION_0, &mCaptureStreamId,

                CAMERA_STREAM_ROTATION_0, &mCaptureStreamId,

                String8());

        if (res != OK) {

            ALOGE("%s: Camera %d: Can't create output stream for capture: "

services/camera/libcameraservice/api1/client2/Parameters.cpp

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
namespace android {

namespace camera2 {



using android::camera3::CAMERA_TEMPLATE_PREVIEW;



Parameters::Parameters(int cameraId,

        int cameraFacing) :

        cameraId(cameraId),
@@ -2468,7 +2470,7 @@ status_t Parameters::getDefaultFocalLength(CameraDeviceBase *device) { 


        // Use focal length in preview template if it exists

        CameraMetadata previewTemplate;

        status_t res = device->createDefaultRequest(CAMERA3_TEMPLATE_PREVIEW, &previewTemplate);

        status_t res = device->createDefaultRequest(CAMERA_TEMPLATE_PREVIEW, &previewTemplate);

        if (res != OK) {

            ALOGE("%s: Failed to create default PREVIEW request: %s (%d)",

                    __FUNCTION__, strerror(-res), res);