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

Commit 3c797a9f authored by Shashi Kumar's avatar Shashi Kumar Committed by Steve Kondik
Browse files

framework/av:: Add support to decode mp3 data in mp4 container 

- Added support to decode mp3 data in mp4 container packed as mp4a
  atom and .mp3 atom as well.

Change-Id: I1a04022f30a9f6516575440aba7652986ab7dc58
parent c3a4309b

media/libstagefright/MPEG4Extractor.cpp

+13 −7
Original line number Diff line number Diff line
@@ -253,15 +253,15 @@ static const char *FourCC2MIME(uint32_t fourcc) { 
        case FOURCC('m', 'p', '4', 'a'):

            return MEDIA_MIMETYPE_AUDIO_AAC;



        case FOURCC('.', 'm', 'p', '3'):

            return MEDIA_MIMETYPE_AUDIO_MPEG;



        case FOURCC('s', 'a', 'm', 'r'):

            return MEDIA_MIMETYPE_AUDIO_AMR_NB;



        case FOURCC('s', 'a', 'w', 'b'):

            return MEDIA_MIMETYPE_AUDIO_AMR_WB;



        case FOURCC('.', 'm', 'p', '3'):

            return MEDIA_MIMETYPE_AUDIO_MPEG;



        case FOURCC('m', 'p', '4', 'v'):

            return MEDIA_MIMETYPE_VIDEO_MPEG4;
@@ -1042,9 +1042,9 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
        }



        case FOURCC('m', 'p', '4', 'a'):

        case FOURCC('.', 'm', 'p', '3'):

        case FOURCC('s', 'a', 'm', 'r'):

        case FOURCC('s', 'a', 'w', 'b'):

        case FOURCC('.', 'm', 'p', '3'):

#ifdef QCOM_HARDWARE

        case FOURCC('s', 'e', 'v', 'c'):

        case FOURCC('s', 'q', 'c', 'p'):
@@ -1088,8 +1088,14 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
            mLastTrack->meta->setInt32(kKeyChannelCount, num_channels);

            mLastTrack->meta->setInt32(kKeySampleRate, sample_rate);



            off64_t stop_offset = *offset + chunk_size;

            off_t stop_offset = *offset + chunk_size;

            if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_MPEG,

                        FourCC2MIME(chunk_type))) {

               // ESD is not required in mp3

               *offset = stop_offset;

            } else {

               *offset = data_offset + sizeof(buffer);

            }

            while (*offset < stop_offset) {

                status_t err = parseChunk(offset, depth + 1);

                if (err != OK) {
@@ -1957,7 +1963,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio( 
    }



    if (objectTypeIndication  == 0x6b) {

#if !defined(OMAP_ENHANCEMENT) && !defined(OMAP_COMPAT)

#if !defined(OMAP_ENHANCEMENT) && !defined(OMAP_COMPAT) && !defined(QCOM_HARDWARE)

        // The media subtype is MP3 audio

        // Our software MP3 audio decoder may not be able to handle

        // packetized MP3 audio; for now, lets just return ERROR_UNSUPPORTED

media/libstagefright/OMXCodec.cpp

+7 −0
Original line number Diff line number Diff line
@@ -587,8 +587,15 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) { 
            esds.getCodecSpecificInfo(

                    &codec_specific_data, &codec_specific_data_size);



#ifdef QCOM_HARDWARE

            meta->findCString(kKeyMIMEType, &mime_type);

            if (strncmp(mime_type, MEDIA_MIMETYPE_AUDIO_MPEG, 10)) {

#endif

            addCodecSpecificData(

                    codec_specific_data, codec_specific_data_size);

#ifdef QCOM_HARDWARE

            }

#endif

        } else if (meta->findData(kKeyAVCC, &type, &data, &size)) {

            // Parse the AVCDecoderConfigurationRecord