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

Commit 3689dfb9 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "camera2 vndk: Initialize uninitialized members of OutputConfiguration... 

Merge "camera2 vndk: Initialize uninitialized members of OutputConfiguration in wrapper constructor."
parents 5635b7d1 73d25278

camera/ndk/ndk_vendor/impl/ACameraDevice.cpp

+0 −1
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ camera_status_t CameraDevice::updateOutputConfigurationLocked(ACaptureSessionOut 
    OutputConfigurationWrapper outConfigW;

    OutputConfiguration &outConfig = outConfigW.mOutputConfiguration;

    outConfig.rotation = utils::convertToHidl(output->mRotation);

    outConfig.windowGroupId = -1; // ndk doesn't support inter OutputConfiguration buffer sharing.

    outConfig.windowHandles.resize(output->mSharedWindows.size() + 1);

    outConfig.windowHandles[0] = output->mWindow;

    outConfig.physicalCameraId = output->mPhysicalCameraId;

camera/ndk/ndk_vendor/impl/utils.h

+9 −1
Original line number Diff line number Diff line
@@ -99,7 +99,15 @@ struct OutputConfigurationWrapper { 
        return mOutputConfiguration;

    }



    OutputConfigurationWrapper() = default;

    OutputConfigurationWrapper() {

        mOutputConfiguration.rotation = OutputConfiguration::Rotation::R0;

        // The ndk currently doesn't support deferred surfaces

        mOutputConfiguration.isDeferred = false;

        mOutputConfiguration.width = 0;

        mOutputConfiguration.height = 0;

        // ndk doesn't support inter OutputConfiguration buffer sharing.

        mOutputConfiguration.windowGroupId = -1;

    };



    OutputConfigurationWrapper(OutputConfiguration &outputConfiguration)

            : mOutputConfiguration((outputConfiguration)) { }