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

Commit 2ac680a0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12630846 from 19635da8 to 25Q1-release 

Change-Id: I718266937703af686782859f4ba606e122e90d63
parents 237fe02a 19635da8

apex/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ apex_defaults { 
        "mediaswcodec",

    ],

    native_shared_libs: [

        "libapexcodecs",

        "libcodec2_hidl@1.0",

        "libcodec2_hidl@1.1",

        "libcodec2_hidl@1.2",

media/aconfig/codec_fwk.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,13 @@ flag { 
  bug: "375464302"

}



flag {

  name: "codec_availability"

  namespace: "codec_fwk"

  description: "Feature flag for codec availability HAL API support"

  bug: "363282971"

}



flag {

  name: "codec_buffer_state_cleanup"

  namespace: "codec_fwk"

media/audio/aconfig/audio_framework.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -198,6 +198,13 @@ flag { 
    bug: "367816690"

}



flag {

    name: "spatial_audio_settings_versioning"

    namespace: "media_audio"

    description: "introduce versioning of spatial audio settings"

    bug: "377977731"

}



flag {

    name: "spatializer_capabilities"

    namespace: "media_audio"

media/codec2/components/apv/C2SoftApvDec.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,10 @@ class C2SoftApvDecFactory : public C2ComponentFactory { 
}  // namespace android



__attribute__((cfi_canonical_jump_table)) extern "C" ::C2ComponentFactory* CreateCodec2Factory() {

    if (!android::media::swcodec::flags::apv_software_codec()) {

        ALOGV("APV SW Codec is not enabled");

        return nullptr;

    }

    return new ::android::C2SoftApvDecFactory();

}

media/codec2/components/apv/C2SoftApvEnc.cpp

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#define LOG_TAG "C2SoftApvEnc"

#include <log/log.h>



#include <android_media_swcodec_flags.h>



#include <media/hardware/VideoAPI.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaErrors.h>
@@ -1267,6 +1269,10 @@ class C2SoftApvEncFactory : public C2ComponentFactory { 
}  // namespace android



__attribute__((cfi_canonical_jump_table)) extern "C" ::C2ComponentFactory* CreateCodec2Factory() {

    if (!android::media::swcodec::flags::apv_software_codec()) {

        ALOGV("APV SW Codec is not enabled");

        return nullptr;

    }

    return new ::android::C2SoftApvEncFactory();

}