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

Commit d13efb20 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo

parents c69775d6 388379f8

include/media/stagefright/MediaDefs.h

+2 −1
Original line number Diff line number Diff line
@@ -32,11 +32,12 @@ extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB; 
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_RAW;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

extern const char *MEDIA_MIMETYPE_CONTAINER_VORBIS;

extern const char *MEDIA_MIMETYPE_CONTAINER_OGG;



}  // namespace android

include/media/stagefright/MetaData.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ enum { 
    kKeyBitRate           = 'brte',  // int32_t (bps)

    kKeyESDS              = 'esds',  // raw data

    kKeyAVCC              = 'avcc',  // raw data

    kKeyVorbisInfo        = 'vinf',  // raw data

    kKeyVorbisBooks       = 'vboo',  // raw data

    kKeyWantsNALFragments = 'NALf',

    kKeyIsSyncFrame       = 'sync',  // int32_t (bool)

    kKeyIsCodecConfig     = 'conf',  // int32_t (bool)

include/media/stagefright/Utils.h

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ uint16_t U16_AT(const uint8_t *ptr); 
uint32_t U32_AT(const uint8_t *ptr);

uint64_t U64_AT(const uint8_t *ptr);



uint16_t U16LE_AT(const uint8_t *ptr);

uint32_t U32LE_AT(const uint8_t *ptr);

uint64_t U64LE_AT(const uint8_t *ptr);



uint64_t ntoh64(uint64_t x);

uint64_t hton64(uint64_t x);

media/libstagefright/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ LOCAL_SRC_FILES += \ 
        MPEG4Extractor.cpp        \

        MPEG4Writer.cpp           \

        MediaExtractor.cpp        \

        OggExtractor.cpp          \

        Prefetcher.cpp            \

        SampleIterator.cpp        \

        SampleTable.cpp           \
@@ -39,7 +40,6 @@ LOCAL_SRC_FILES += \ 
        StagefrightMetadataRetriever.cpp \

        TimeSource.cpp            \

        TimedEventQueue.cpp       \

        VorbisExtractor.cpp       \

        WAVExtractor.cpp          \

        string.cpp
@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES:= \ 
	$(JNI_H_INCLUDE) \

        $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \

        $(TOP)/external/opencore/android \

        $(TOP)/external/tremolo/Tremolo

        $(TOP)/external/tremolo



LOCAL_SHARED_LIBRARIES := \

        libbinder         \
@@ -70,7 +70,8 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_amrwbdec \

        libstagefright_avcdec \

        libstagefright_m4vh263dec \

        libstagefright_mp3dec

        libstagefright_mp3dec \

        libstagefright_vorbisdec



LOCAL_SHARED_LIBRARIES += \

        libstagefright_amrnb_common \

media/libstagefright/DataSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "include/MP3Extractor.h"

#include "include/MPEG4Extractor.h"

#include "include/WAVExtractor.h"

#include "include/VorbisExtractor.h"

#include "include/OggExtractor.h"



#include <media/stagefright/CachingDataSource.h>

#include <media/stagefright/DataSource.h>
@@ -93,7 +93,7 @@ void DataSource::RegisterDefaultSniffers() { 
    RegisterSniffer(SniffMPEG4);

    RegisterSniffer(SniffAMR);

    RegisterSniffer(SniffWAV);

    RegisterSniffer(SniffVorbis);

    RegisterSniffer(SniffOgg);

}



// static