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

Commit 0263e720 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12742097 from 7dca430c to 25Q1-release 

Change-Id: I367516a7f82c14eaefb05a1b0881fc8770b35a90
parents 6e1affe3 7dca430c

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 */

























media/audioaidlconversion/AidlConversionCppNdk.cpp



+37
−1




























Original line number
Diff line number
Diff line








@@ -803,6 +803,42 @@ const detail::AudioFormatPairs& getAudioFormatPairs() {













            {// Note: not in the IANA registry.















             AUDIO_FORMAT_APTX_ADAPTIVE_R4,















             make_AudioFormatDescription("audio/vnd.qcom.aptx.adaptive.r4")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_SIMPLE_OPUS, make_AudioFormatDescription(













                     std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".simple.opus")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_SIMPLE_AAC, make_AudioFormatDescription(













                     std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".simple.aac")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_SIMPLE_FLAC, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".simple.flac")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_SIMPLE_PCM, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".simple.pcm")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_BASE_OPUS, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base.opus")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_BASE_AAC, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base.aac")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_BASE_FLAC, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base.flac")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_BASE_PCM, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base.pcm")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base_enhanced.opus")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base_enhanced.aac")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base_enhanced.flac")},













            {// Note: not in the IANA registry.













             AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM, make_AudioFormatDescription(













                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base_enhanced.pcm")},















    }};















    return pairs;















}










@@ -1064,7 +1100,7 @@ namespace {













    // Use '01' for LSB bits 0 and 1 as Bluetooth MAC addresses are never multicast















    // and universaly administered















    constexpr std::array<uint8_t, 4> BTANON_PREFIX {0xFD, 0xFF, 0xFF, 0xFF};













    // Keep sync with ServiceUtilities.cpp mustAnonymizeBluetoothAddress













    // Keep sync with ServiceUtilities.cpp anonymizeBluetoothAddress















    constexpr const char * BTANON_PREFIX_STR = "XX:XX:XX:XX:";















}

















































media/codec2/components/apv/C2SoftApvEnc.cpp



+336
−125


























File changed.
Preview size limit exceeded, changes collapsed.