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

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

Merge changes I7838b1e5,I78323abe into main am: 3a5bf76a 

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



Change-Id: I771246fe7352d5973dee1b81f6a8ded108e4d510
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43915f77 3a5bf76a

media/aconfig/codec_fwk.aconfig

+14 −0
Original line number Diff line number Diff line
@@ -47,6 +47,13 @@ flag { 
  bug: "325512893"

}



flag {

  name: "native_capabilites"

  namespace: "codec_fwk"

  description: "Feature flag for native codec capabilities"

  bug: "306023029"

}



flag {

  name: "null_output_surface"

  namespace: "codec_fwk"
@@ -74,3 +81,10 @@ flag { 
  description: "Feature flag for region of interest support"

  bug: "325549730"

}



flag {

  name: "teamfood"

  namespace: "codec_fwk"

  description: "Feature flag to track teamfood population"

  bug: "328770262"

}

media/aconfig/mediacodec_flags.aconfig

+6 −6
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ container: "system" 
# ******************************************************************



flag {

  name: "large_audio_frame"

  name: "aidl_hal"

  namespace: "codec_fwk"

  description: "Feature flags for large audio frame support"

  bug: "297219557"

  description: "Feature flags for enabling AIDL HAL handling"

  bug: "251850069"

}



flag {
@@ -21,8 +21,8 @@ flag { 
}



flag {

  name: "aidl_hal"

  name: "large_audio_frame"

  namespace: "codec_fwk"

  description: "Feature flags for enabling AIDL HAL handling"

  bug: "251850069"

  description: "Feature flags for large audio frame support"

  bug: "297219557"

}