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

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

Merge changes from topic "b376797335" into main 

* changes:
  Camera: Add desktop effects metadata tags
  Camera: Add desktop_effects feature flag
parents 6c3be6f6 778ccd18

camera/camera_platform.aconfig

+8 −1
Original line number Diff line number Diff line
@@ -273,3 +273,10 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "camera_platform"

    name: "desktop_effects"

    description: "Applies system controlled effects targetting video conferencing"

    bug: "376797335"

}

camera/ndk/impl/ACameraMetadata.cpp

+6 −0
Original line number Diff line number Diff line
@@ -654,6 +654,12 @@ std::unordered_set<uint32_t> ACameraMetadata::sSystemTags ({ 
    ANDROID_DEPTH_MAX_DEPTH_SAMPLES,

    ANDROID_HEIC_INFO_SUPPORTED,

    ANDROID_HEIC_INFO_MAX_JPEG_APP_SEGMENTS_COUNT,

    ANDROID_DESKTOP_EFFECTS_CAPABILITIES,

    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/ndk/include/camera/NdkCameraMetadataTags.h

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ typedef enum acamera_metadata_section { 
    ACAMERA_EXTENSION,

    ACAMERA_JPEGR,

    ACAMERA_SHARED_SESSION,

    ACAMERA_DESKTOP_EFFECTS,

    ACAMERA_SECTION_COUNT,















    ACAMERA_VENDOR = 0x8000










@@ -140,6 +141,7 @@ typedef enum acamera_metadata_section_start {













    ACAMERA_EXTENSION_START        = ACAMERA_EXTENSION         << 16,















    ACAMERA_JPEGR_START            = ACAMERA_JPEGR             << 16,















    ACAMERA_SHARED_SESSION_START   = ACAMERA_SHARED_SESSION    << 16,













    ACAMERA_DESKTOP_EFFECTS_START  = ACAMERA_DESKTOP_EFFECTS   << 16,















    ACAMERA_VENDOR_START           = ACAMERA_VENDOR            << 16















} acamera_metadata_section_start_t;
























@@ -12082,6 +12084,7 @@ typedef enum acamera_metadata_enum_acamera_jpegr_available_jpeg_r_stream_configu



































































__END_DECLS





























#endif /* _NDK_CAMERA_METADATA_TAGS_H */