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

Commit 47dce1a1 authored by Avichal Rakesh's avatar Avichal Rakesh Committed by Android (Google) Code Review
Browse files

Merge "cameraservice: Pipe session identifier to the Camera HAL" into udc-dev

parents cd613104 1fff2d17

services/camera/libcameraservice/device3/Camera3Device.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2451,8 +2451,9 @@ status_t Camera3Device::configureStreamsLocked(int operatingMode, 
    // max_buffers, usage, and priv fields, as well as data_space and format

    // fields for IMPLEMENTATION_DEFINED formats.



    int64_t logId = mCameraServiceProxyWrapper->getCurrentLogIdForCamera(mId);

    const camera_metadata_t *sessionBuffer = sessionParams.getAndLock();

    res = mInterface->configureStreams(sessionBuffer, &config, bufferSizes);

    res = mInterface->configureStreams(sessionBuffer, &config, bufferSizes, logId);

    sessionParams.unlock(sessionBuffer);



    if (res == BAD_VALUE) {

services/camera/libcameraservice/device3/Camera3Device.h

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ class Camera3Device : 


        virtual status_t configureStreams(const camera_metadata_t * sessionParams,

                /*inout*/ camera_stream_configuration_t * config,

                const std::vector<uint32_t>& bufferSizes) = 0;

                const std::vector<uint32_t>& bufferSizes, int64_t logId) = 0;



        // The injection camera configures the streams to hal.

        virtual status_t configureInjectedStreams(

services/camera/libcameraservice/device3/aidl/AidlCamera3Device.cpp

+4 −2
Original line number Diff line number Diff line
@@ -875,7 +875,8 @@ status_t AidlCamera3Device::AidlHalInterface::constructDefaultRequestSettings( 


status_t AidlCamera3Device::AidlHalInterface::configureStreams(

        const camera_metadata_t *sessionParams,

        camera_stream_configuration *config, const std::vector<uint32_t>& bufferSizes) {

        camera_stream_configuration *config, const std::vector<uint32_t>& bufferSizes,

        int64_t logId) {

    using camera::device::StreamType;

    using camera::device::StreamConfigurationMode;
@@ -960,6 +961,7 @@ status_t AidlCamera3Device::AidlHalInterface::configureStreams( 


    requestedConfiguration.streamConfigCounter = mNextStreamConfigCounter++;

    requestedConfiguration.multiResolutionInputImage = config->input_is_multi_resolution;

    requestedConfiguration.logId = logId;

    auto err = mAidlSession->configureStreams(requestedConfiguration, &finalConfiguration);

    if (!err.isOk()) {

        ALOGE("%s: Transaction error: %s", __FUNCTION__, err.getMessage());

services/camera/libcameraservice/device3/aidl/AidlCamera3Device.h

+3 −1
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ class AidlCamera3Device : 


        virtual status_t configureStreams(const camera_metadata_t *sessionParams,

                /*inout*/ camera_stream_configuration_t *config,

                const std::vector<uint32_t>& bufferSizes) override;

                const std::vector<uint32_t>& bufferSizes,

                int64_t logId) override;



        // The injection camera configures the streams to hal.

        virtual status_t configureInjectedStreams(

                const camera_metadata_t* sessionParams,

services/camera/libcameraservice/device3/hidl/HidlCamera3Device.cpp

+2 −1
Original line number Diff line number Diff line
@@ -880,7 +880,8 @@ bool HidlCamera3Device::HidlHalInterface::isReconfigurationRequired( 


status_t HidlCamera3Device::HidlHalInterface::configureStreams(

        const camera_metadata_t *sessionParams,

        camera_stream_configuration *config, const std::vector<uint32_t>& bufferSizes) {

        camera_stream_configuration *config, const std::vector<uint32_t>& bufferSizes,

        int64_t /*logId*/) {

    ATRACE_NAME("CameraHal::configureStreams");

    if (!valid()) return INVALID_OPERATION;

    status_t res = OK;