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

Commit b190dd16 authored by Harish Mahendrakar's avatar Harish Mahendrakar Committed by Ray Essick
Browse files

Collected Patches from Ittiam 

Test: CTS android.media.cts.DecoderTest{AacDrc,XheAac}

SoftXaac: Refactor few members in SoftXAAC

Bug: 80493357
Change-Id: I7d5aece88b3c1363b01543e6e0b04af118666410

SoftXAAC: Handle error in setXAACDRCInfo

In case of error in setParameter for setting DRC params,
return an error

Bug: 80315132
Change-Id: I7961151ddc5fcd9fdcf781c3d83e44b756b93ae4

SoftXaac: Modified error handling

Instead of returning for all errors, return only if error is fatal.
For non fatal errors, print a debug message

With this change all return values are being checked now

Bug: 80429165
Change-Id: I0338779e901a39116a56ebf2761af9e6997ff482
parent a5c0d8b4

media/libstagefright/codecs/xaacdec/SoftXAAC.cpp

+177 −116

File changed.

Preview size limit exceeded, changes collapsed.

media/libstagefright/codecs/xaacdec/SoftXAAC.h

+6 −6
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ private: 
                         int32_t *bytesConsumed,

                         int32_t *outBytes);



    void configflushDecode();

    int configflushDecode();

    IA_ERRORCODE getXAACStreamInfo();

    IA_ERRORCODE setXAACDRCInfo(int32_t drcCut,

                                int32_t drcBoost,
@@ -129,11 +129,11 @@ private: 
    int32_t     mChannelMask;

    bool        mIsCodecInitialized;

    bool        mIsCodecConfigFlushRequired;

    int8_t *drc_ip_buf;

    int8_t *drc_op_buf;

    int32_t mpegd_drc_present;

    int32_t drc_flag;

//    int32_t is_drc_enabled;

    int8_t *mDrcInBuf;

    int8_t *mDrcOutBuf;

    int32_t mMpegDDRCPresent;

    int32_t mDRCFlag;





    void*       mMemoryArray[MAX_MEM_ALLOCS];

    int32_t     mMallocCount;