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

Commit c43d8ebd authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

Merge changes I29bb096c,I86e451e6,Ife32c90d,Id04d81f9 into main am: 43c558fb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2907158



Change-Id: I5c0d1d0ba6d3fb7b6398abf782385cfd18fbf9a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ad4e87f 43c558fb

media/aconfig/Android.bp

+26 −0
Original line number Diff line number Diff line 
// deprecated

aconfig_declarations {

    name: "aconfig_mediacodec_flags",

    package: "com.android.media.codec.flags",

    srcs: ["mediacodec_flags.aconfig"],

}



// deprecated

java_aconfig_library {

    name: "aconfig_mediacodec_flags_java_lib",

    aconfig_declarations: "aconfig_mediacodec_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// deprecated

cc_aconfig_library {

    name: "aconfig_mediacodec_flags_c_lib",

    min_sdk_version: "30",
@@ -21,3 +24,26 @@ cc_aconfig_library { 
    ],

    aconfig_declarations: "aconfig_mediacodec_flags",

}



aconfig_declarations {

    name: "aconfig_codec_fwk_flags",

    package: "android.media.codec",

    srcs: ["codec_fwk.aconfig"],

}



java_aconfig_library {

    name: "android.media.codec-aconfig-java",

    aconfig_declarations: "aconfig_codec_fwk_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "android.media.codec-aconfig-cc",

    min_sdk_version: "30",

    vendor_available: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

    ],

    aconfig_declarations: "aconfig_codec_fwk_flags",

}

media/aconfig/codec_fwk.aconfig

0 → 100644
+26 −0
Original line number Diff line number Diff line 
# Codec framework feature flags.

#

# !!! Please add flags in alphabetical order. !!!



package: "android.media.codec"



flag {

  name: "dynamic_color_aspects"

  namespace: "codec_fwk"

  description: "Feature flag for dynamic color aspect support"

  bug: "297914560"

}



flag {

  name: "hlg_editing"

  namespace: "codec_fwk"

  description: "Feature flag for HLG editing support"

  bug: "316397061"

}



flag {

  name: "null_output_surface"

  namespace: "codec_fwk"

  description: "Feature flag for null output Surface support"

  bug: "297920102"

}

media/aconfig/mediacodec_flags.aconfig

+5 −0
Original line number Diff line number Diff line 
package: "com.android.media.codec.flags"



# ******************************************************************

#            !!! DO NOT ADD FURTHER FLAGS TO THIS FILE !!!

#            !!!     USE codec_fwk.aconfig INSTEAD     !!!

# ******************************************************************



flag {

  name: "large_audio_frame"

  namespace: "codec_fwk"