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

Commit 5b376fa7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13097162 from 1847a689 to 25Q2-release 

Change-Id: If4bfcb93fbf2abb2970f694ea89f41cedd469698
parents 2571cddb 1847a689

media/codec2/components/apv/C2SoftApvEnc.cpp

+30 −0
Original line number Diff line number Diff line
@@ -944,6 +944,36 @@ 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();

    ColorAspects sfAspects;

    if (!C2Mapper::map(mColorAspects->primaries, &sfAspects.mPrimaries)) {

        sfAspects.mPrimaries = android::ColorAspects::PrimariesUnspecified;

    }

    if (!C2Mapper::map(mColorAspects->range, &sfAspects.mRange)) {

        sfAspects.mRange = android::ColorAspects::RangeUnspecified;

    }

    if (!C2Mapper::map(mColorAspects->matrix, &sfAspects.mMatrixCoeffs)) {

        sfAspects.mMatrixCoeffs = android::ColorAspects::MatrixUnspecified;

    }

    if (!C2Mapper::map(mColorAspects->transfer, &sfAspects.mTransfer)) {

        sfAspects.mTransfer = android::ColorAspects::TransferUnspecified;

    }



    int32_t isoPrimaries, isoTransfer, isoMatrix;

    bool isoFullRange;

    ColorUtils::convertCodecColorAspectsToIsoAspects(sfAspects,

        &isoPrimaries, &isoTransfer, &isoMatrix, &isoFullRange);

    param.color_primaries = isoPrimaries;

    param.transfer_characteristics = isoTransfer;

    param.matrix_coefficients = isoMatrix;

    param.full_range_flag = isoFullRange;



    if (mColorAspects->primaries != C2Color::PRIMARIES_UNSPECIFIED ||

            mColorAspects->transfer != C2Color::TRANSFER_UNSPECIFIED ||

            mColorAspects->matrix != C2Color::MATRIX_UNSPECIFIED ||

            mColorAspects->range != C2Color::RANGE_UNSPECIFIED) {

        param.color_description_present_flag = 1;

    }

}



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

media/libaaudio/src/core/AudioStream.cpp

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ aaudio_result_t AudioStream::systemStart() { 


    aaudio_result_t result = requestStart_l();

    if (result == AAUDIO_OK) {

        mPlayerBase->baseUpdateDeviceIds(getDeviceIds());

        // We only call this for logging in "dumpsys audio". So ignore return code.

        (void) mPlayerBase->startWithStatus(getDeviceIds());

    }

media/libaudiohal/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ cc_library_shared { 


    shared_libs: [

        "audioclient-types-aidl-cpp",

        "libaudiofoundation",

        "libbinder_ndk",

        "libdl",

        "libhidlbase",
@@ -75,6 +76,7 @@ cc_library_headers { 
    name: "libaudiohal_headers",



    header_libs: [

        "libaudiofoundation_headers",

        "libeffectsconfig_headers",

    ],

media/libaudiohal/impl/EffectHalAidl.cpp

+22 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define LOG_TAG "EffectHalAidl"

//#define LOG_NDEBUG 0



#include <algorithm>

#include <memory>



#include <audio_utils/primitives.h>
@@ -63,7 +64,9 @@ using ::aidl::android::hardware::audio::effect::kEventFlagDataMqNotEmpty; 
using ::aidl::android::hardware::audio::effect::kEventFlagDataMqUpdate;

using ::aidl::android::hardware::audio::effect::kEventFlagNotEmpty;

using ::aidl::android::hardware::audio::effect::kReopenSupportedVersion;

using ::aidl::android::hardware::audio::effect::Parameter;

using ::aidl::android::hardware::audio::effect::State;

using ::aidl::android::media::audio::common::AudioDeviceDescription;



namespace android {

namespace effect {
@@ -388,5 +391,24 @@ status_t EffectHalAidl::dump(int fd) { 
    return mEffect->dump(fd, nullptr, 0);

}



status_t EffectHalAidl::setDevices(const AudioDeviceTypeAddrVector& deviceTypes) {

    TIME_CHECK();



    // TODO: b/397236443 - add this as part of effect dumpsys

    ALOGD("%s %s", __func__,

          dumpAudioDeviceTypeAddrVector(deviceTypes, false /*includeSensitiveInfo*/).c_str());



    std::vector<AudioDeviceDescription> deviceDescs;

    for (const AudioDeviceTypeAddr& deviceType : deviceTypes) {

        AudioDeviceDescription deviceDesc = VALUE_OR_RETURN_STATUS(

                ::aidl::android::legacy2aidl_audio_devices_t_AudioDeviceDescription(

                        deviceType.mType));

        deviceDescs.emplace_back(std::move(deviceDesc));

    }



    return statusTFromBinderStatus(

            mEffect->setParameter(Parameter::make<Parameter::deviceDescription>(deviceDescs)));

}



} // namespace effect

} // namespace android

media/libaudiohal/impl/EffectHalAidl.h

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ class EffectHalAidl : public EffectHalInterface { 
        return mEffect;

    }



    // Set devices in AIDL type

    status_t setDevices(const AudioDeviceTypeAddrVector& deviceTypes);



    // for TIME_CHECK

    const std::string getClassName() const { return "EffectHalAidl"; }