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

Commit 6f5f4e4c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11920703 from db57707c to 24Q3-release 

Change-Id: I03d5d56e29fa61d13d2520d8efd8c2f3980c91fa
parents 33b3430a db57707c

media/audio/aconfig/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -118,6 +118,13 @@ aconfig_declarations { 
    visibility: ["//frameworks/base/api"],

}



aconfig_declarations {

    name: "android.media.soundtrigger-aconfig",

    package: "android.media.soundtrigger",

    container: "system",

    srcs: ["soundtrigger.aconfig"],

}



java_aconfig_library {

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

    aconfig_declarations: "android.media.audio-aconfig",
@@ -141,6 +148,12 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

    aconfig_declarations: "android.media.soundtrigger-aconfig",

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

}



cc_aconfig_library {

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

    aconfig_declarations: "android.media.audiopolicy-aconfig",
@@ -153,5 +166,6 @@ aconfig_declarations_group { 
        "android.media.audio-aconfig-java",

        "android.media.audiopolicy-aconfig-java",

        "android.media.midi-aconfig-java",

        "android.media.soundtrigger-aconfig-java",

    ],

}

media/audio/aconfig/OWNERS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# Bug component: 48436

atneya@google.com

elaurent@google.com

include platform/frameworks/av:/media/janitors/audio_OWNERS #{LAST_RESORT_SUGGESTION}

media/audio/aconfig/soundtrigger.aconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# Flags for sound trigger

#

# Please add flags in alphabetical order.



package: "android.media.soundtrigger"

container: "system"



flag {

    name: "sound_trigger_generic_model_api"

    is_exported: true

    namespace: "soundtrigger"

    description: "Feature flag for adding GenericSoundModel to SystemApi"

    bug: "339267254"

}

media/codec2/components/avc/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ cc_library { 


    static_libs: ["libavcdec"],



    cflags: [

        "-DKEEP_THREADS_ACTIVE=1",

    ],



    srcs: ["C2SoftAvcDec.cpp"],



    export_include_dirs: ["."],

media/codec2/components/avc/C2SoftAvcDec.cpp

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "C2SoftAvcDec"

#ifndef KEEP_THREADS_ACTIVE

#define KEEP_THREADS_ACTIVE 0

#endif

#include <log/log.h>



#include <media/stagefright/foundation/MediaDefs.h>
@@ -416,7 +419,7 @@ status_t C2SoftAvcDec::createDecoder() { 
    ivdext_create_op_t s_create_op = {};



    s_create_ip.s_ivd_create_ip_t.u4_size = sizeof(ivdext_create_ip_t);

    s_create_ip.u4_keep_threads_active = 1;

    s_create_ip.u4_keep_threads_active = KEEP_THREADS_ACTIVE;

    s_create_ip.s_ivd_create_ip_t.e_cmd = IVD_CMD_CREATE;

    s_create_ip.s_ivd_create_ip_t.u4_share_disp_buf = 0;

    s_create_ip.s_ivd_create_ip_t.e_output_format = mIvColorFormat;