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

Commit ad278f22 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I6bce6d87 into eclair-mr2 

* changes:
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
parents 0533aade 6bce6d87

include/media/stagefright/MediaDefs.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_AAC; 
extern const char *MEDIA_MIMETYPE_AUDIO_RAW;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;



}  // namespace android

media/libstagefright/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) 


LOCAL_SRC_FILES +=                \

        AMRExtractor.cpp          \

        AudioPlayer.cpp           \

        CachingDataSource.cpp     \

        CameraSource.cpp          \

        DataSource.cpp            \
@@ -23,17 +24,17 @@ LOCAL_SRC_FILES += \ 
        HTTPDataSource.cpp        \

        HTTPStream.cpp            \

        JPEGSource.cpp            \

        MediaExtractor.cpp        \

        MP3Extractor.cpp          \

        MPEG4Extractor.cpp        \

        MPEG4Writer.cpp           \

        MediaExtractor.cpp        \

        MediaPlayerImpl.cpp       \

        MmapSource.cpp            \

        SampleTable.cpp           \

        ShoutcastSource.cpp       \

        TimeSource.cpp            \

        TimedEventQueue.cpp       \

        AudioPlayer.cpp           \

        WAVExtractor.cpp          \

        string.cpp



endif

media/libstagefright/DataSource.cpp

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "include/AMRExtractor.h"

#include "include/MP3Extractor.h"

#include "include/MPEG4Extractor.h"

#include "include/WAVExtractor.h"



#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaErrors.h>
@@ -87,6 +88,7 @@ void DataSource::RegisterDefaultSniffers() { 
    RegisterSniffer(SniffMP3);

    RegisterSniffer(SniffMPEG4);

    RegisterSniffer(SniffAMR);

    RegisterSniffer(SniffWAV);

}



}  // namespace android

media/libstagefright/MPEG4Extractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,8 @@ bool SniffMPEG4( 
    }



    if (!memcmp(header, "ftyp3gp", 7) || !memcmp(header, "ftypmp42", 8)

        || !memcmp(header, "ftypisom", 8) || !memcmp(header, "ftypM4V ", 8)) {

        || !memcmp(header, "ftypisom", 8) || !memcmp(header, "ftypM4V ", 8)

        || !memcmp(header, "ftypM4A ", 8)) {

        *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4;

        *confidence = 0.1;

media/libstagefright/MediaDefs.cpp

+1 −0
Original line number Diff line number Diff line
@@ -32,5 +32,6 @@ const char *MEDIA_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm"; 
const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";



const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav";



}  // namespace android