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

Commit be61caaa authored by Karthik Reddy Katta's avatar Karthik Reddy Katta Committed by Manish Dewangan
Browse files

mm-audio: omx: add 64 bit support 

-Changes to support omx encoders on 64 bit platform

Change-Id: I05749f619efaf66e107b1438635a38f92a11b523
parent b5728835

mm-audio/aenc-aac/Android.mk

+4 −1
Original line number Diff line number Diff line 
ifeq ($(TARGET_ARCH),arm)

ifneq ($(filter arm aarch64 arm64, $(TARGET_ARCH)),)





AENC_AAC_PATH:= $(call my-dir)
@@ -27,5 +27,8 @@ endif 
ifeq ($(call is-board-platform,msm8916),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif

ifeq ($(call is-board-platform,msm8994),true)

include $(AENC_AAC_PATH)/qdsp6/Android.mk

endif



endif

mm-audio/aenc-aac/qdsp6/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ libOmxAacEnc-def += -D_ANDROID_ 
libOmxAacEnc-def += -D_ENABLE_QC_MSG_LOG_

libOmxAacEnc-def += -DVERBOSE

libOmxAacEnc-def += -D_DEBUG

libOmxAacEnc-def += -Wconversion

ifeq ($(strip $(TARGET_USES_QCOM_MM_AUDIO)),true)

libOmxAacEnc-def += -DAUDIOV2

endif

mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h

+17 −17
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ extern "C" { 




#define PrintFrameHdr(i,bufHdr) \

                           DEBUG_PRINT("i=%d OMX bufHdr[%x]buf[%x]size[%d]TS[%lld]nFlags[0x%x]\n",\

                           DEBUG_PRINT("i=%d OMX bufHdr[%p]buf[%p]size[%d]TS[%lld]nFlags[0x%x]\n",\

                           i,\

                           (unsigned) bufHdr,                                     \

                           (unsigned)((OMX_BUFFERHEADERTYPE *)bufHdr)->pBuffer,   \

                           bufHdr,                                     \

                           ((OMX_BUFFERHEADERTYPE *)bufHdr)->pBuffer,   \

                           (unsigned)((OMX_BUFFERHEADERTYPE *)bufHdr)->nFilledLen,\

                           ((OMX_BUFFERHEADERTYPE *)bufHdr)->nTimeStamp, \

                           (unsigned)((OMX_BUFFERHEADERTYPE *)bufHdr)->nFlags)
@@ -314,7 +314,7 @@ public: 
                                void *                  eglImage);



    bool post_command(unsigned int p1, unsigned int p2,

        unsigned int id);

        unsigned char id);



    // Deferred callback identifiers

    enum
@@ -376,9 +376,9 @@ private: 


    struct omx_event

    {

        unsigned param1;

        unsigned param2;

        unsigned id;

        unsigned long param1;

        unsigned long param2;

        unsigned char id;

    };



    struct omx_cmd_queue
@@ -390,16 +390,16 @@ private: 


        omx_cmd_queue();

        ~omx_cmd_queue();

        bool insert_entry(unsigned p1, unsigned p2, unsigned id);

        bool pop_entry(unsigned *p1,unsigned *p2, unsigned *id);

        bool get_msg_id(unsigned *id);

        bool insert_entry(unsigned long p1, unsigned long p2, unsigned char id);

        bool pop_entry(unsigned long *p1,unsigned long *p2, unsigned char *id);

        bool get_msg_id(unsigned char *id);

        bool get_msg_with_id(unsigned *p1,unsigned *p2, unsigned id);

    };



    typedef struct TIMESTAMP

    {

        unsigned long LowPart;

        unsigned long HighPart;

        unsigned int LowPart;

        unsigned int HighPart;

    }__attribute__((packed)) TIMESTAMP;



    typedef struct metadata_input
@@ -423,7 +423,7 @@ private: 
    {

        OMX_U32 tot_in_buf_len;

        OMX_U32 tot_out_buf_len;

        OMX_U32 tot_pb_time;

        OMX_TICKS tot_pb_time;

        OMX_U32 fbd_cnt;

        OMX_U32 ftb_cnt;

        OMX_U32 etb_cnt;
@@ -588,11 +588,11 @@ private: 


    bool search_output_bufhdr(OMX_BUFFERHEADERTYPE *buffer);



    bool post_input(unsigned int p1, unsigned int p2,

                    unsigned int id);

    bool post_input(unsigned long p1, unsigned long p2,

                    unsigned char id);



    bool post_output(unsigned int p1, unsigned int p2,

                     unsigned int id);

    bool post_output(unsigned long p1, unsigned long p2,

                     unsigned char id);



    void process_events(omx_aac_aenc *client_data);