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

Commit de714241 authored by Imran Ziad's avatar Imran Ziad Committed by Android (Google) Code Review
Browse files

Merge "Camera: AIDL changes for desktop_effects metadata" into main

parents b70a258e 542b55c6

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSection.aidl

+1 −0
Original line number Diff line number Diff line
@@ -73,5 +73,6 @@ enum CameraMetadataSection { 
  ANDROID_EXTENSION,

  ANDROID_JPEGR,

  ANDROID_SHARED_SESSION,

  ANDROID_DESKTOP_EFFECTS,

  VENDOR_SECTION = 0x8000,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataSectionStart.aidl

+1 −0
Original line number Diff line number Diff line
@@ -73,5 +73,6 @@ enum CameraMetadataSectionStart { 
  ANDROID_EXTENSION_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_EXTENSION << 16) /* 2097152 */,

  ANDROID_JPEGR_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_JPEGR << 16) /* 2162688 */,

  ANDROID_SHARED_SESSION_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_SHARED_SESSION << 16) /* 2228224 */,

  ANDROID_DESKTOP_EFFECTS_START = (android.hardware.camera.metadata.CameraMetadataSection.ANDROID_DESKTOP_EFFECTS << 16) /* 2293760 */,

  VENDOR_SECTION_START = (android.hardware.camera.metadata.CameraMetadataSection.VENDOR_SECTION << 16) /* -2147483648 */,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataTag.aidl

+6 −0
Original line number Diff line number Diff line
@@ -366,4 +366,10 @@ enum CameraMetadataTag { 
  ANDROID_JPEGR_AVAILABLE_JPEG_R_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,

  ANDROID_JPEGR_AVAILABLE_JPEG_R_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,

  ANDROID_JPEGR_AVAILABLE_JPEG_R_STALL_DURATIONS_MAXIMUM_RESOLUTION,

  ANDROID_DESKTOP_EFFECTS_CAPABILITIES = android.hardware.camera.metadata.CameraMetadataSectionStart.ANDROID_DESKTOP_EFFECTS_START /* 2293760 */,

  ANDROID_DESKTOP_EFFECTS_BACKGROUND_BLUR_MODES,

  ANDROID_DESKTOP_EFFECTS_BACKGROUND_BLUR_MODE,

  ANDROID_DESKTOP_EFFECTS_FACE_RETOUCH_MODE,

  ANDROID_DESKTOP_EFFECTS_FACE_RETOUCH_STRENGTH,

  ANDROID_DESKTOP_EFFECTS_PORTRAIT_RELIGHT_MODE,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/DesktopEffectsBackgroundBlurMode.aidl

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *//*

 * Autogenerated from camera metadata definitions in

 * /system/media/camera/docs/metadata_definitions.xml

 * *** DO NOT EDIT BY HAND ***

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.camera.metadata;

@Backing(type="int") @VintfStability

enum DesktopEffectsBackgroundBlurMode {

  ANDROID_DESKTOP_EFFECTS_BACKGROUND_BLUR_MODE_OFF,

  ANDROID_DESKTOP_EFFECTS_BACKGROUND_BLUR_MODE_LIGHT,

  ANDROID_DESKTOP_EFFECTS_BACKGROUND_BLUR_MODE_FULL,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/DesktopEffectsCapabilities.aidl

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *//*

 * Autogenerated from camera metadata definitions in

 * /system/media/camera/docs/metadata_definitions.xml

 * *** DO NOT EDIT BY HAND ***

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.camera.metadata;

@Backing(type="int") @VintfStability

enum DesktopEffectsCapabilities {

  ANDROID_DESKTOP_EFFECTS_CAPABILITIES_BACKGROUND_BLUR,

  ANDROID_DESKTOP_EFFECTS_CAPABILITIES_FACE_RETOUCH,

  ANDROID_DESKTOP_EFFECTS_CAPABILITIES_PORTRAIT_RELIGHT,

}