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

Commit cfdb605a authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AAC decoder: fix KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into rvc-dev am: 7f21c552 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11827369

Change-Id: I9428005510de23682a3b702681d89258264a1a69
parents e0f65a2c 7f21c552

media/codec2/components/aac/C2SoftAacDec.cpp

+19 −4
Original line number Original line Diff line number Diff line
@@ -89,10 +89,17 @@ public: 
        addParameter(

        addParameter(

                DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)

                DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)

                .withDefault(new C2StreamChannelCountInfo::output(0u, 1))

                .withDefault(new C2StreamChannelCountInfo::output(0u, 1))

                .withFields({C2F(mChannelCount, value).inRange(1, 8)})

                .withFields({C2F(mChannelCount, value).inRange(1, MAX_CHANNEL_COUNT)})

                .withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)

                .withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)

                .build());

                .build());





        addParameter(

                DefineParam(mMaxChannelCount, C2_PARAMKEY_MAX_CHANNEL_COUNT)

                .withDefault(new C2StreamMaxChannelCountInfo::input(0u, MAX_CHANNEL_COUNT))

                .withFields({C2F(mMaxChannelCount, value).inRange(1, MAX_CHANNEL_COUNT)})

                .withSetter(Setter<decltype(*mMaxChannelCount)>::StrictValueWithNoDeps)

                .build());



        addParameter(

        addParameter(

                DefineParam(mBitrate, C2_PARAMKEY_BITRATE)

                DefineParam(mBitrate, C2_PARAMKEY_BITRATE)

                .withDefault(new C2StreamBitrateInfo::input(0u, 64000))

                .withDefault(new C2StreamBitrateInfo::input(0u, 64000))
@@ -225,6 +232,7 @@ public: 
    int32_t getDrcAttenuationFactor() const { return mDrcAttenuationFactor->value * 127. + 0.5; }

    int32_t getDrcAttenuationFactor() const { return mDrcAttenuationFactor->value * 127. + 0.5; }

    int32_t getDrcEffectType() const { return mDrcEffectType->value; }

    int32_t getDrcEffectType() const { return mDrcEffectType->value; }

    int32_t getDrcAlbumMode() const { return mDrcAlbumMode->value; }

    int32_t getDrcAlbumMode() const { return mDrcAlbumMode->value; }

    u_int32_t getMaxChannelCount() const { return mMaxChannelCount->value; }

    int32_t getDrcOutputLoudness() const { return (mDrcOutputLoudness->value <= 0 ? -mDrcOutputLoudness->value * 4. + 0.5 : -1); }

    int32_t getDrcOutputLoudness() const { return (mDrcOutputLoudness->value <= 0 ? -mDrcOutputLoudness->value * 4. + 0.5 : -1); }





private:

private:
@@ -241,6 +249,7 @@ private: 
    std::shared_ptr<C2StreamDrcAttenuationFactorTuning::input> mDrcAttenuationFactor;

    std::shared_ptr<C2StreamDrcAttenuationFactorTuning::input> mDrcAttenuationFactor;

    std::shared_ptr<C2StreamDrcEffectTypeTuning::input> mDrcEffectType;

    std::shared_ptr<C2StreamDrcEffectTypeTuning::input> mDrcEffectType;

    std::shared_ptr<C2StreamDrcAlbumModeTuning::input> mDrcAlbumMode;

    std::shared_ptr<C2StreamDrcAlbumModeTuning::input> mDrcAlbumMode;

    std::shared_ptr<C2StreamMaxChannelCountInfo::input> mMaxChannelCount;

    std::shared_ptr<C2StreamDrcOutputLoudnessTuning::output> mDrcOutputLoudness;

    std::shared_ptr<C2StreamDrcOutputLoudnessTuning::output> mDrcOutputLoudness;

    // TODO Add : C2StreamAacSbrModeTuning

    // TODO Add : C2StreamAacSbrModeTuning

};

};
@@ -366,9 +375,10 @@ status_t C2SoftAacDec::initDecoder() { 
    ALOGV("AAC decoder using MPEG-D DRC album mode %d", albumMode);

    ALOGV("AAC decoder using MPEG-D DRC album mode %d", albumMode);

    aacDecoder_SetParam(mAACDecoder, AAC_UNIDRC_ALBUM_MODE, albumMode);

    aacDecoder_SetParam(mAACDecoder, AAC_UNIDRC_ALBUM_MODE, albumMode);





    // By default, the decoder creates a 5.1 channel downmix signal.

    // AAC_PCM_MAX_OUTPUT_CHANNELS

    // For seven and eight channel input streams, enable 6.1 and 7.1 channel output

    u_int32_t maxChannelCount = mIntf->getMaxChannelCount();

    aacDecoder_SetParam(mAACDecoder, AAC_PCM_MAX_OUTPUT_CHANNELS, -1);

    ALOGV("AAC decoder using maximum output channel count %d", maxChannelCount);

    aacDecoder_SetParam(mAACDecoder, AAC_PCM_MAX_OUTPUT_CHANNELS, maxChannelCount);





    return status;

    return status;

}

}
@@ -707,6 +717,11 @@ void C2SoftAacDec::process( 
        ALOGV("AAC decoder using MPEG-D DRC album mode %d", albumMode);

        ALOGV("AAC decoder using MPEG-D DRC album mode %d", albumMode);

        aacDecoder_SetParam(mAACDecoder, AAC_UNIDRC_ALBUM_MODE, albumMode);

        aacDecoder_SetParam(mAACDecoder, AAC_UNIDRC_ALBUM_MODE, albumMode);





        // AAC_PCM_MAX_OUTPUT_CHANNELS

        int32_t maxChannelCount = mIntf->getMaxChannelCount();

        ALOGV("AAC decoder using maximum output channel count %d", maxChannelCount);

        aacDecoder_SetParam(mAACDecoder, AAC_PCM_MAX_OUTPUT_CHANNELS, maxChannelCount);



        mDrcWrap.update();

        mDrcWrap.update();





        UINT inBufferUsedLength = inBufferLength[0] - bytesValid[0];

        UINT inBufferUsedLength = inBufferLength[0] - bytesValid[0];