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

Commit a5b2df72 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: I9471d54704f55400c9bf30f1fd69e926a89ffe18
parents d42afb97 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 Diff line number Diff line
@@ -35,32 +35,26 @@ 


#define MAX_MEM_ALLOCS 100



extern "C" IA_ERRORCODE ixheaacd_dec_api(pVOID p_ia_module_obj,

                        WORD32 i_cmd, WORD32 i_idx, pVOID pv_value);

extern "C" IA_ERRORCODE ia_drc_dec_api(pVOID p_ia_module_obj,

                        WORD32 i_cmd, WORD32 i_idx, pVOID pv_value);

extern "C"  IA_ERRORCODE ixheaacd_get_config_param(pVOID p_ia_process_api_obj,

                                       pWORD32 pi_samp_freq,

                                       pWORD32 pi_num_chan,

                                       pWORD32 pi_pcm_wd_sz,

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

                                         pVOID pv_value);

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

                                       pVOID pv_value);

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

                                                  pWORD32 pi_num_chan, pWORD32 pi_pcm_wd_sz,

                                                  pWORD32 pi_channel_mask);



namespace android {



struct SoftXAAC : public SimpleSoftOMXComponent {

    SoftXAAC(const char *name,

            const OMX_CALLBACKTYPE *callbacks,

            OMX_PTR appData,

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

             OMX_COMPONENTTYPE** component);



   protected:

    virtual ~SoftXAAC();



    virtual OMX_ERRORTYPE internalGetParameter(

            OMX_INDEXTYPE index, OMX_PTR params);

    virtual OMX_ERRORTYPE internalGetParameter(OMX_INDEXTYPE index, OMX_PTR params);



    virtual OMX_ERRORTYPE internalSetParameter(

            OMX_INDEXTYPE index, const OMX_PTR params);

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



    virtual void onQueueFilled(OMX_U32 portIndex);

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

    uint32_t mBufSize;



    enum {

        NONE,

        AWAITING_DISABLED,

        AWAITING_ENABLED

    } mOutputPortSettingsChange;

    enum { NONE, AWAITING_DISABLED, AWAITING_ENABLED } mOutputPortSettingsChange;



    void initPorts();

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


    int configXAACDecoder(uint8_t* inBuffer, uint32_t inBufferLength);

    int configMPEGDDrc();

    int decodeXAACStream(uint8_t* inBuffer,

                         uint32_t inBufferLength,

                         int32_t *bytesConsumed,

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

                         int32_t* outBytes);



    int configflushDecode();

    IA_ERRORCODE getXAACStreamInfo();

    IA_ERRORCODE setXAACDRCInfo(int32_t drcCut,

                                int32_t drcBoost,

                                int32_t drcRefLevel,

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

                                int32_t drcHeavyCompression

#ifdef ENABLE_MPEG_D_DRC

                                ,int32_t drEffectType

                                ,

                                int32_t drEffectType

#endif

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

    int32_t mDRCFlag;





    void* mMemoryArray[MAX_MEM_ALLOCS];

    int32_t mMallocCount;



    DISALLOW_EVIL_CONSTRUCTORS(SoftXAAC);



};



}  // namespace android