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

Commit 018d1b7f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13081433 from 4701442e to 25Q2-release 

Change-Id: Ie91a77def34210cb8d531f8f544039f5c8bc13f7
parents 8ca8d6fd 4701442e

media/codec2/components/apv/C2SoftApvEnc.cpp

+12 −0
Original line number Diff line number Diff line
@@ -944,6 +944,18 @@ void C2SoftApvEnc::setParams(oapve_param_t& param) { 
    param.band_idc = mIntf->getBandIdc_l();

    param.profile_idc = mIntf->getProfile_l();

    param.level_idc = mIntf->getLevel_l();

    mColorAspects = mIntf->getColorAspects_l();

    param.color_primaries = mColorAspects->primaries;

    param.transfer_characteristics = mColorAspects->transfer;

    param.matrix_coefficients = mColorAspects->matrix;

    param.full_range_flag = mColorAspects->range;



    if (param.color_primaries != C2Color::PRIMARIES_UNSPECIFIED ||

            param.transfer_characteristics != C2Color::TRANSFER_UNSPECIFIED ||

            param.matrix_coefficients != C2Color::MATRIX_UNSPECIFIED ||

            param.full_range_flag != C2Color::RANGE_UNSPECIFIED) {

        param.color_description_present_flag = 1;

    }

}



c2_status_t C2SoftApvEnc::setEncodeArgs(oapv_frms_t* inputFrames, const C2GraphicView* const input,

media/libaaudio/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -44,3 +44,15 @@ cc_library_headers { 
    export_shared_lib_headers: ["aaudio-aidl-cpp"],

    shared_libs: ["aaudio-aidl-cpp"],

}



cc_library_headers {

    // used in mediametrics's audio analytics

    // just for the defines and typedefs, so no libraries like in libaaudio_headers

    name: "libaaudio_headers-module",

    export_include_dirs: ["include"],

    apex_available: [

        "//apex_available:platform",

        "com.android.media",

    ],

    min_sdk_version: "29",

}

media/libaaudio/src/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -281,5 +281,12 @@ aidl_interface { 
        java: {

            sdk_version: "module_current",

        },

        ndk: {

            min_sdk_version: "29",

            apex_available: [

                "//apex_available:platform",

                "com.android.media",

            ],

        },

    },

}

media/libaudioclient/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -336,6 +336,13 @@ aidl_interface { 
        java: {

            sdk_version: "module_current",

        },

        ndk: {

            min_sdk_version: "29",

            apex_available: [

                "//apex_available:platform",

                "com.android.media",

            ],

        },

    },

}

media/libeffects/dynamicsproc/aidl/DynamicsProcessingContext.cpp

+2 −1
Original line number Diff line number Diff line
@@ -370,7 +370,8 @@ std::vector<DynamicsProcessing::EqBandConfig> DynamicsProcessingContext::getEqBa 
        StageType type) {

    std::vector<DynamicsProcessing::EqBandConfig> eqBands;



    auto maxBand = mEngineArchitecture.preEqStage.bandCount;

    auto maxBand = type == StageType::POSTEQ ? mEngineArchitecture.postEqStage.bandCount

                                             : mEngineArchitecture.preEqStage.bandCount;

    for (int32_t ch = 0; ch < mChannelCount; ch++) {

        auto eq = getEqWithType_l(type, ch);

        if (!eq) {