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

Commit 7b915927 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "new_formats_huawei" 

* changes:
  audiopolicy: fix wrong volume db value for voice call stream
  audio: add new audio formats
parents 87c117f9 fe0fb8b0

media/libmedia/TypeConverter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ const FormatConverter::Table FormatConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM_HE_V2),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_CELT),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_ADAPTIVE),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LHDC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LHDC_LL),

    TERMINATOR

};

services/audiopolicy/common/managerdefinitions/src/VolumeCurve.cpp

+9 −3
Original line number Diff line number Diff line
@@ -26,16 +26,22 @@ float VolumeCurve::volIndexToDb(int indexInUi, int volIndexMin, int volIndexMax) 
{

    ALOG_ASSERT(!mCurvePoints.isEmpty(), "Invalid volume curve");



    size_t nbCurvePoints = mCurvePoints.size();

    // the volume index in the UI is relative to the min and max volume indices for this stream

    int nbSteps = 1 + mCurvePoints[nbCurvePoints - 1].mIndex - mCurvePoints[0].mIndex;

    if (indexInUi < volIndexMin) {

        // an index of 0 means mute request when volIndexMin > 0

        if (indexInUi == 0) {

            ALOGV("VOLUME forcing mute for index 0 with min index %d", volIndexMin);

            return VOLUME_MIN_DB;

        }

        ALOGV("VOLUME remapping index from %d to min index %d", indexInUi, volIndexMin);

        indexInUi = volIndexMin;

    } else if (indexInUi > volIndexMax) {

        ALOGV("VOLUME remapping index from %d to max index %d", indexInUi, volIndexMax);

        indexInUi = volIndexMax;

    }



    size_t nbCurvePoints = mCurvePoints.size();

    // the volume index in the UI is relative to the min and max volume indices for this stream

    int nbSteps = 1 + mCurvePoints[nbCurvePoints - 1].mIndex - mCurvePoints[0].mIndex;

    int volIdx = (nbSteps * (indexInUi - volIndexMin)) / (volIndexMax - volIndexMin);



    // Where would this volume index been inserted in the curve point

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+13 −0
Original line number Diff line number Diff line
@@ -2290,6 +2290,10 @@ void AudioPolicyManager::initStreamVolume(audio_stream_type_t stream, 
                                            int indexMax)

{

    ALOGV("initStreamVolume() stream %d, min %d, max %d", stream , indexMin, indexMax);

    if (indexMin < 0 || indexMax < 0) {

        ALOGE("%s for stream %d: invalid min %d or max %d", __func__, stream , indexMin, indexMax);

        return;

    }

    mVolumeCurves->initStreamVolume(stream, indexMin, indexMax);



    // initialize other private stream volumes which follow this one
@@ -5624,6 +5628,15 @@ int AudioPolicyManager::rescaleVolumeIndex(int srcIndex, 
    float minDst = (float)mVolumeCurves->getVolumeIndexMin(dstStream);

    float maxDst = (float)mVolumeCurves->getVolumeIndexMax(dstStream);



    // preserve mute request or correct range

    if (srcIndex < minSrc) {

        if (srcIndex == 0) {

            return 0;

        }

        srcIndex = minSrc;

    } else if (srcIndex > maxSrc) {

        srcIndex = maxSrc;

    }

    return (int)(minDst + ((srcIndex - minSrc) * (maxDst - minDst)) / (maxSrc - minSrc));

}