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

Commit 8874fce3 authored by Ravneet Dhanjal's avatar Ravneet Dhanjal
Browse files

Camera: Add logic to switch between vendor and fallback extension impl 

- Enables extensions to switch to a fallback software implementation
if the vendor does not support an extension that is equipped with a
fallback
- Changes the way extensions connect to the proxy service by enabling
a connection per extension. This allows multiple proxy service
connections simultaneously.

Test: Camera CTS Test
Bug: 302582551
Change-Id: I25b4ee7089e4c1e83cde51854322f32d4176e8bb
parent 221395b7

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+260 −104

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java

+10 −5
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 


    private boolean mInitialized;

    private boolean mSessionClosed;

    private int mExtensionType;





    private final Context mContext;
@@ -205,7 +207,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
        CameraAdvancedExtensionSessionImpl ret = new CameraAdvancedExtensionSessionImpl(ctx,

                extender, cameraDevice, characteristicsMapNative, repeatingRequestSurface,

                burstCaptureSurface, postviewSurface, config.getStateCallback(),

                config.getExecutor(), sessionId, token);

                config.getExecutor(), sessionId, token, config.getExtension());



        ret.mStatsAggregator.setClientName(ctx.getOpPackageName());

        ret.mStatsAggregator.setExtensionType(config.getExtension());
@@ -223,7 +225,8 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
            @Nullable Surface postviewSurface,

            @NonNull StateCallback callback, @NonNull Executor executor,

            int sessionId,

            @NonNull IBinder token) {

            @NonNull IBinder token,

            int extension) {

        mContext = ctx;

        mAdvancedExtender = extender;

        mCameraDevice = cameraDevice;
@@ -242,6 +245,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
        mSessionId = sessionId;

        mToken = token;

        mInterfaceLock = cameraDevice.mInterfaceLock;

        mExtensionType = extension;



        mStatsAggregator = new ExtensionSessionStatsAggregator(mCameraDevice.getId(),

                /*isAdvanced=*/true);
@@ -583,9 +587,9 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
            if (mToken != null) {

                if (mInitialized || (mCaptureSession != null)) {

                    notifyClose = true;

                    CameraExtensionCharacteristics.releaseSession();

                    CameraExtensionCharacteristics.releaseSession(mExtensionType);

                }

                CameraExtensionCharacteristics.unregisterClient(mContext, mToken);

                CameraExtensionCharacteristics.unregisterClient(mContext, mToken, mExtensionType);

            }

            mInitialized = false;

            mToken = null;
@@ -654,7 +658,8 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
            }



            try {

                CameraExtensionCharacteristics.initializeSession(mInitializeHandler);

                CameraExtensionCharacteristics.initializeSession(

                        mInitializeHandler, mExtensionType);

            } catch (RemoteException e) {

                Log.e(TAG, "Failed to initialize session! Extension service does"

                        + " not respond!");

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+7 −3
Original line number Diff line number Diff line
@@ -2559,13 +2559,16 @@ public class CameraDeviceImpl extends CameraDevice 
        boolean initializationFailed = true;

        IBinder token = new Binder(TAG + " : " + mNextSessionId++);

        try {

            boolean ret = CameraExtensionCharacteristics.registerClient(mContext, token);

            boolean ret = CameraExtensionCharacteristics.registerClient(mContext, token,

                    extensionConfiguration.getExtension(), mCameraId,

                    CameraExtensionUtils.getCharacteristicsMapNative(characteristicsMap));

            if (!ret) {

                token = null;

                throw new UnsupportedOperationException("Unsupported extension!");

            }



            if (CameraExtensionCharacteristics.areAdvancedExtensionsSupported()) {

            if (CameraExtensionCharacteristics.areAdvancedExtensionsSupported(

                        extensionConfiguration.getExtension())) {

                mCurrentAdvancedExtensionSession =

                        CameraAdvancedExtensionSessionImpl.createCameraAdvancedExtensionSession(

                                this, characteristicsMap, mContext, extensionConfiguration,
@@ -2580,7 +2583,8 @@ public class CameraDeviceImpl extends CameraDevice 
            throw new CameraAccessException(CameraAccessException.CAMERA_ERROR);

        } finally {

            if (initializationFailed && (token != null)) {

                CameraExtensionCharacteristics.unregisterClient(mContext, token);

                CameraExtensionCharacteristics.unregisterClient(mContext, token,

                        extensionConfiguration.getExtension());

            }

        }

    }

core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java

+10 −5
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
    // In case the client doesn't explicitly enable repeating requests, the framework

    // will do so internally.

    private boolean mInternalRepeatingRequestEnabled = true;

    private int mExtensionType;



    private final Context mContext;
@@ -244,7 +245,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
                sessionId,

                token,

                extensionChars.getAvailableCaptureRequestKeys(config.getExtension()),

                extensionChars.getAvailableCaptureResultKeys(config.getExtension()));

                extensionChars.getAvailableCaptureResultKeys(config.getExtension()),

                config.getExtension());



        session.mStatsAggregator.setClientName(ctx.getOpPackageName());

        session.mStatsAggregator.setExtensionType(config.getExtension());
@@ -266,7 +268,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
            int sessionId,

            @NonNull IBinder token,

            @NonNull Set<CaptureRequest.Key> requestKeys,

            @Nullable Set<CaptureResult.Key> resultKeys) {

            @Nullable Set<CaptureResult.Key> resultKeys,

            int extension) {

        mContext = ctx;

        mImageExtender = imageExtender;

        mPreviewExtender = previewExtender;
@@ -289,6 +292,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
        mSupportedResultKeys = resultKeys;

        mCaptureResultsSupported = !resultKeys.isEmpty();

        mInterfaceLock = cameraDevice.mInterfaceLock;

        mExtensionType = extension;



        mStatsAggregator = new ExtensionSessionStatsAggregator(mCameraDevice.getId(),

                /*isAdvanced=*/false);
@@ -881,9 +885,9 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
            if (mToken != null) {

                if (mInitialized || (mCaptureSession != null)) {

                    notifyClose = true;

                    CameraExtensionCharacteristics.releaseSession();

                    CameraExtensionCharacteristics.releaseSession(mExtensionType);

                }

                CameraExtensionCharacteristics.unregisterClient(mContext, mToken);

                CameraExtensionCharacteristics.unregisterClient(mContext, mToken, mExtensionType);

            }

            mInitialized = false;

            mToken = null;
@@ -1000,7 +1004,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
                mStatsAggregator.commit(/*isFinal*/false);

                try {

                    finishPipelineInitialization();

                    CameraExtensionCharacteristics.initializeSession(mInitializeHandler);

                    CameraExtensionCharacteristics.initializeSession(

                            mInitializeHandler, mExtensionType);

                } catch (RemoteException e) {

                    Log.e(TAG, "Failed to initialize session! Extension service does"

                            + " not respond!");

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -11833,6 +11833,7 @@ public final class Settings { 
         * Whether to enable camera extensions software fallback.

         * @hide

         */

        @Readable

        public static final String CAMERA_EXTENSIONS_FALLBACK = "camera_extensions_fallback";















        /**