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

Commit ab6b1589 authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

Merge "SoftXaac: Formatting changes" into pi-dev 

am: d5217e61

Change-Id: Ifdda7ab28cc7b8f7a66bae01de7083bf3202fe59
parents 0489c82a d5217e61

media/libstagefright/codecs/xaacdec/SoftXAAC.cpp

+599 −840

File changed.

Preview size limit exceeded, changes collapsed.

media/libstagefright/codecs/xaacdec/SoftXAAC.h

+40 −55
Original line number Original line Diff line number Diff line
@@ -35,32 +35,26 @@ 




#define MAX_MEM_ALLOCS 100

#define MAX_MEM_ALLOCS 100





extern "C" IA_ERRORCODE ixheaacd_dec_api(pVOID p_ia_module_obj,

extern "C" IA_ERRORCODE ixheaacd_dec_api(pVOID p_ia_module_obj, WORD32 i_cmd, WORD32 i_idx,

                        WORD32 i_cmd, WORD32 i_idx, pVOID pv_value);

                                         pVOID pv_value);

extern "C" IA_ERRORCODE ia_drc_dec_api(pVOID p_ia_module_obj,

extern "C" IA_ERRORCODE ia_drc_dec_api(pVOID p_ia_module_obj, WORD32 i_cmd, WORD32 i_idx,

                        WORD32 i_cmd, WORD32 i_idx, pVOID pv_value);

                                       pVOID pv_value);

extern "C"  IA_ERRORCODE ixheaacd_get_config_param(pVOID p_ia_process_api_obj,

extern "C" IA_ERRORCODE ixheaacd_get_config_param(pVOID p_ia_process_api_obj, pWORD32 pi_samp_freq,

                                       pWORD32 pi_samp_freq,

                                                  pWORD32 pi_num_chan, pWORD32 pi_pcm_wd_sz,

                                       pWORD32 pi_num_chan,

                                       pWORD32 pi_pcm_wd_sz,

                                                  pWORD32 pi_channel_mask);

                                                  pWORD32 pi_channel_mask);





namespace android {

namespace android {





struct SoftXAAC : public SimpleSoftOMXComponent {

struct SoftXAAC : public SimpleSoftOMXComponent {

    SoftXAAC(const char *name,

    SoftXAAC(const char* name, const OMX_CALLBACKTYPE* callbacks, OMX_PTR appData,

            const OMX_CALLBACKTYPE *callbacks,

            OMX_PTR appData,

             OMX_COMPONENTTYPE** component);

             OMX_COMPONENTTYPE** component);





   protected:

   protected:

    virtual ~SoftXAAC();

    virtual ~SoftXAAC();





    virtual OMX_ERRORTYPE internalGetParameter(

    virtual OMX_ERRORTYPE internalGetParameter(OMX_INDEXTYPE index, OMX_PTR params);

            OMX_INDEXTYPE index, OMX_PTR params);





    virtual OMX_ERRORTYPE internalSetParameter(

    virtual OMX_ERRORTYPE internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR params);

            OMX_INDEXTYPE index, const OMX_PTR params);





    virtual void onQueueFilled(OMX_U32 portIndex);

    virtual void onQueueFilled(OMX_U32 portIndex);

    virtual void onPortFlushCompleted(OMX_U32 portIndex);

    virtual void onPortFlushCompleted(OMX_U32 portIndex);
@@ -83,11 +77,7 @@ private: 
    int64_t mCurrentTimestamp;

    int64_t mCurrentTimestamp;

    uint32_t mBufSize;

    uint32_t mBufSize;





    enum {

    enum { NONE, AWAITING_DISABLED, AWAITING_ENABLED } mOutputPortSettingsChange;

        NONE,

        AWAITING_DISABLED,

        AWAITING_ENABLED

    } mOutputPortSettingsChange;





    void initPorts();

    void initPorts();

    status_t initDecoder();

    status_t initDecoder();
@@ -98,19 +88,16 @@ private: 




    int configXAACDecoder(uint8_t* inBuffer, uint32_t inBufferLength);

    int configXAACDecoder(uint8_t* inBuffer, uint32_t inBufferLength);

    int configMPEGDDrc();

    int configMPEGDDrc();

    int decodeXAACStream(uint8_t* inBuffer,

    int decodeXAACStream(uint8_t* inBuffer, uint32_t inBufferLength, int32_t* bytesConsumed,

                         uint32_t inBufferLength,

                         int32_t *bytesConsumed,

                         int32_t* outBytes);

                         int32_t* outBytes);





    int configflushDecode();

    int configflushDecode();

    IA_ERRORCODE getXAACStreamInfo();

    IA_ERRORCODE getXAACStreamInfo();

    IA_ERRORCODE setXAACDRCInfo(int32_t drcCut,

    IA_ERRORCODE setXAACDRCInfo(int32_t drcCut, int32_t drcBoost, int32_t drcRefLevel,

                                int32_t drcBoost,

                                int32_t drcRefLevel,

                                int32_t drcHeavyCompression

                                int32_t drcHeavyCompression

#ifdef ENABLE_MPEG_D_DRC

#ifdef ENABLE_MPEG_D_DRC

                                ,int32_t drEffectType

                                ,

                                int32_t drEffectType

#endif

#endif

    );

    );
@@ -134,12 +121,10 @@ private: 
    int32_t mMpegDDRCPresent;

    int32_t mMpegDDRCPresent;

    int32_t mDRCFlag;

    int32_t mDRCFlag;







    void* mMemoryArray[MAX_MEM_ALLOCS];

    void* mMemoryArray[MAX_MEM_ALLOCS];

    int32_t mMallocCount;

    int32_t mMallocCount;





    DISALLOW_EVIL_CONSTRUCTORS(SoftXAAC);

    DISALLOW_EVIL_CONSTRUCTORS(SoftXAAC);



};

};





}  // namespace android

}  // namespace android