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

Commit 520b2a70 authored by Andreas Huber's avatar Andreas Huber
Browse files

Support for extracting G.711 a-law and mu-law audio from WAV files and a... 

Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.

Change-Id: I92685d09456c220b8c09842defb721bd55b0b9f6
related-to-bug: 2900021
parent 8fb2e6e4

include/media/stagefright/MediaDefs.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ extern const char *MEDIA_MIMETYPE_AUDIO_MPEG; 
extern const char *MEDIA_MIMETYPE_AUDIO_AAC;

extern const char *MEDIA_MIMETYPE_AUDIO_QCELP;

extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS;

extern const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW;

extern const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW;

extern const char *MEDIA_MIMETYPE_AUDIO_RAW;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_httplive \

        libstagefright_rtsp \

        libstagefright_id3 \

        libstagefright_g711dec \



LOCAL_SHARED_LIBRARIES += \

        libstagefright_amrnb_common \

media/libstagefright/MediaDefs.cpp

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ const char *MEDIA_MIMETYPE_AUDIO_MPEG = "audio/mpeg"; 
const char *MEDIA_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

const char *MEDIA_MIMETYPE_AUDIO_QCELP = "audio/qcelp";

const char *MEDIA_MIMETYPE_AUDIO_VORBIS = "audio/vorbis";

const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";

const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";



const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";

media/libstagefright/OMXCodec.cpp

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "include/AMRWBEncoder.h"

#include "include/AVCDecoder.h"

#include "include/AVCEncoder.h"

#include "include/G711Decoder.h"

#include "include/M4vH263Decoder.h"

#include "include/M4vH263Encoder.h"

#include "include/MP3Decoder.h"
@@ -77,6 +78,7 @@ FACTORY_CREATE(AMRNBDecoder) 
FACTORY_CREATE(AMRWBDecoder)

FACTORY_CREATE(AACDecoder)

FACTORY_CREATE(AVCDecoder)

FACTORY_CREATE(G711Decoder)

FACTORY_CREATE(M4vH263Decoder)

FACTORY_CREATE(VorbisDecoder)

FACTORY_CREATE(VPXDecoder)
@@ -124,6 +126,7 @@ static sp<MediaSource> InstantiateSoftwareCodec( 
        FACTORY_REF(AMRWBDecoder)

        FACTORY_REF(AACDecoder)

        FACTORY_REF(AVCDecoder)

        FACTORY_REF(G711Decoder)

        FACTORY_REF(M4vH263Decoder)

        FACTORY_REF(VorbisDecoder)

        FACTORY_REF(VPXDecoder)
@@ -155,6 +158,8 @@ static const CodecInfo kDecoderInfo[] = { 
    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.decode" },

    { MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" },

//    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacdec" },

    { MEDIA_MIMETYPE_AUDIO_G711_ALAW, "G711Decoder" },

    { MEDIA_MIMETYPE_AUDIO_G711_MLAW, "G711Decoder" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.7x30.video.decoder.mpeg4" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.decoder.mpeg4" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.Decoder" },

media/libstagefright/WAVExtractor.cpp

+76 −40
Original line number Diff line number Diff line
@@ -31,7 +31,11 @@ 


namespace android {



static uint16_t WAVE_FORMAT_PCM = 1;

enum {

    WAVE_FORMAT_PCM = 1,

    WAVE_FORMAT_ALAW = 6,

    WAVE_FORMAT_MULAW = 7,

};



static uint32_t U32_LE_AT(const uint8_t *ptr) {

    return ptr[3] << 24 | ptr[2] << 16 | ptr[1] << 8 | ptr[0];
@@ -45,6 +49,7 @@ struct WAVSource : public MediaSource { 
    WAVSource(

            const sp<DataSource> &dataSource,

            const sp<MetaData> &meta,

            uint16_t waveFormat,

            int32_t bitsPerSample,

            off_t offset, size_t size);
@@ -63,6 +68,7 @@ private: 


    sp<DataSource> mDataSource;

    sp<MetaData> mMeta;

    uint16_t mWaveFormat;

    int32_t mSampleRate;

    int32_t mNumChannels;

    int32_t mBitsPerSample;
@@ -108,7 +114,7 @@ sp<MediaSource> WAVExtractor::getTrack(size_t index) { 


    return new WAVSource(

            mDataSource, mTrackMeta,

            mBitsPerSample, mDataOffset, mDataSize);

            mWaveFormat, mBitsPerSample, mDataOffset, mDataSize);

}



sp<MetaData> WAVExtractor::getTrackMetaData(
@@ -160,8 +166,10 @@ status_t WAVExtractor::init() { 
                return NO_INIT;

            }



            uint16_t format = U16_LE_AT(formatSpec);

            if (format != WAVE_FORMAT_PCM) {

            mWaveFormat = U16_LE_AT(formatSpec);

            if (mWaveFormat != WAVE_FORMAT_PCM

                    && mWaveFormat != WAVE_FORMAT_ALAW

                    && mWaveFormat != WAVE_FORMAT_MULAW) {

                return ERROR_UNSUPPORTED;

            }
@@ -178,10 +186,18 @@ status_t WAVExtractor::init() { 


            mBitsPerSample = U16_LE_AT(&formatSpec[14]);



            if (mWaveFormat == WAVE_FORMAT_PCM) {

                if (mBitsPerSample != 8 && mBitsPerSample != 16

                    && mBitsPerSample != 24) {

                    return ERROR_UNSUPPORTED;

                }

            } else {

                CHECK(mWaveFormat == WAVE_FORMAT_MULAW

                        || mWaveFormat == WAVE_FORMAT_ALAW);

                if (mBitsPerSample != 8) {

                    return ERROR_UNSUPPORTED;

                }

            }



            mValidFormat = true;

        } else if (!memcmp(chunkHeader, "data", 4)) {
@@ -190,7 +206,23 @@ status_t WAVExtractor::init() { 
                mDataSize = chunkSize;



                mTrackMeta = new MetaData;

                mTrackMeta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);



                switch (mWaveFormat) {

                    case WAVE_FORMAT_PCM:

                        mTrackMeta->setCString(

                                kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);

                        break;

                    case WAVE_FORMAT_ALAW:

                        mTrackMeta->setCString(

                                kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_G711_ALAW);

                        break;

                    default:

                        CHECK_EQ(mWaveFormat, WAVE_FORMAT_MULAW);

                        mTrackMeta->setCString(

                                kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_G711_MLAW);

                        break;

                }



                mTrackMeta->setInt32(kKeyChannelCount, mNumChannels);

                mTrackMeta->setInt32(kKeySampleRate, mSampleRate);
@@ -217,10 +249,12 @@ const size_t WAVSource::kMaxFrameSize = 32768; 
WAVSource::WAVSource(

        const sp<DataSource> &dataSource,

        const sp<MetaData> &meta,

        uint16_t waveFormat,

        int32_t bitsPerSample,

        off_t offset, size_t size)

    : mDataSource(dataSource),

      mMeta(meta),

      mWaveFormat(waveFormat),

      mSampleRate(0),

      mNumChannels(0),

      mBitsPerSample(bitsPerSample),
@@ -312,6 +346,7 @@ status_t WAVSource::read( 


    buffer->set_range(0, n);



    if (mWaveFormat == WAVE_FORMAT_PCM) {

        if (mBitsPerSample == 8) {

            // Convert 8-bit unsigned samples to 16-bit signed.
@@ -350,6 +385,7 @@ status_t WAVSource::read( 


            buffer->set_range(buffer->range_offset(), 2 * numSamples);

        }

    }



    size_t bytesPerSample = mBitsPerSample >> 3;