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

Commit aeb8fd46 authored by Dave Burke's avatar Dave Burke
Browse files

Add Fraunhofer AAC encoder with AAC-ELD support. 

Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
parent e0fa467e

include/media/mediarecorder.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ enum audio_encoder { 
    AUDIO_ENCODER_AAC = 3,

    AUDIO_ENCODER_AAC_PLUS = 4,

    AUDIO_ENCODER_EAAC_PLUS = 5,

    AUDIO_ENCODER_AAC_ELD = 6,



    AUDIO_ENCODER_LIST_END // must be the last - used to validate the audio encoder type

};

include/media/stagefright/AACWriter.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ private: 
    int64_t mEstimatedDurationUs;

    int32_t mChannelCount;

    int32_t mSampleRate;

    int32_t mAACProfile;

    int32_t mFrameDurationUs;



    static void *ThreadWrapper(void *);

include/media/stagefright/ACodec.h

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ private: 
    status_t setupAACCodec(

            bool encoder,

            int32_t numChannels, int32_t sampleRate, int32_t bitRate,

            bool isADTS);

            int32_t aacProfile, bool isADTS);



    status_t selectAudioPortFormat(

            OMX_U32 portIndex, OMX_AUDIO_CODINGTYPE desiredFormat);

include/media/stagefright/MetaData.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ enum { 
    kKeyFrameRate         = 'frmR',  // int32_t (video frame rate fps)

    kKeyBitRate           = 'brte',  // int32_t (bps)

    kKeyESDS              = 'esds',  // raw data

    kKeyAACProfile        = 'aacp',  // int32_t

    kKeyAVCC              = 'avcc',  // raw data

    kKeyD263              = 'd263',  // raw data

    kKeyVorbisInfo        = 'vinf',  // raw data

include/media/stagefright/OMXCodec.h

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ private: 


    status_t setAACFormat(

            int32_t numChannels, int32_t sampleRate, int32_t bitRate,

            bool isADTS);

            int32_t aacProfile, bool isADTS);



    void setG711Format(int32_t numChannels);