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

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

Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken

parents 64105f95 093437c3

include/media/stagefright/MediaDefs.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ namespace android { 


extern const char *MEDIA_MIMETYPE_IMAGE_JPEG;



extern const char *MEDIA_MIMETYPE_VIDEO_VPX;

extern const char *MEDIA_MIMETYPE_VIDEO_AVC;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4;

extern const char *MEDIA_MIMETYPE_VIDEO_H263;
@@ -38,6 +39,7 @@ 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_OGG;

extern const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA;



}  // namespace android

media/libstagefright/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_avcdec \

        libstagefright_m4vh263dec \

        libstagefright_mp3dec \

        libstagefright_vorbisdec

        libstagefright_vorbisdec \

        libstagefright_matroska \



LOCAL_SHARED_LIBRARIES += \

        libstagefright_amrnb_common \

media/libstagefright/DataSource.cpp

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include "include/WAVExtractor.h"

#include "include/OggExtractor.h"



#include "matroska/MatroskaExtractor.h"



#include <media/stagefright/CachingDataSource.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/FileSource.h>
@@ -94,6 +96,7 @@ void DataSource::RegisterDefaultSniffers() { 
    RegisterSniffer(SniffAMR);

    RegisterSniffer(SniffWAV);

    RegisterSniffer(SniffOgg);

    RegisterSniffer(SniffMatroska);

}



// static

media/libstagefright/MediaDefs.cpp

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ namespace android { 


const char *MEDIA_MIMETYPE_IMAGE_JPEG = "image/jpeg";



const char *MEDIA_MIMETYPE_VIDEO_VPX = "video/x-vnd.on2.vp8";

const char *MEDIA_MIMETYPE_VIDEO_AVC = "video/avc";

const char *MEDIA_MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es";

const char *MEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp";
@@ -36,5 +37,6 @@ const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw"; 
const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav";

const char *MEDIA_MIMETYPE_CONTAINER_OGG = "application/ogg";

const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA = "video/x-matroska";



}  // namespace android

media/libstagefright/MediaExtractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "include/WAVExtractor.h"

#include "include/OggExtractor.h"



#include "matroska/MatroskaExtractor.h"



#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaExtractor.h>
@@ -69,6 +71,8 @@ sp<MediaExtractor> MediaExtractor::Create( 
        return new WAVExtractor(source);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_OGG)) {

        return new OggExtractor(source);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MATROSKA)) {

        return new MatroskaExtractor(source);

    }



    return NULL;