diff --git a/camera/ndk/ndk_vendor/impl/ACameraDevice.cpp b/camera/ndk/ndk_vendor/impl/ACameraDevice.cpp index d7d774b727..6f92a38797 100644 --- a/camera/ndk/ndk_vendor/impl/ACameraDevice.cpp +++ b/camera/ndk/ndk_vendor/impl/ACameraDevice.cpp @@ -299,7 +299,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; diff --git a/camera/ndk/ndk_vendor/impl/utils.h b/camera/ndk/ndk_vendor/impl/utils.h index 2f1006d0eb..a03c7bc5b5 100644 --- a/camera/ndk/ndk_vendor/impl/utils.h +++ b/camera/ndk/ndk_vendor/impl/utils.h @@ -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)) { }