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

Commit 132f46ff authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am df17b084: Merge "Support for media extraction from .mkv/.mka Matroska files... 

am df17b084: Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
parents 5e03fd5d df17b084

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/java/android/media/MediaFile.java

+7 −2
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ public class MediaFile { 
    public static final int FILE_TYPE_WMA     = 6;

    public static final int FILE_TYPE_OGG     = 7;

    public static final int FILE_TYPE_AAC     = 8;

    public static final int FILE_TYPE_MKA     = 9;

    private static final int FIRST_AUDIO_FILE_TYPE = FILE_TYPE_MP3;

    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_AAC;

    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_MKA;



    // MIDI file types

    public static final int FILE_TYPE_MID     = 11;
@@ -63,8 +64,9 @@ public class MediaFile { 
    public static final int FILE_TYPE_3GPP2   = 24;

    public static final int FILE_TYPE_WMV     = 25;

    public static final int FILE_TYPE_ASF     = 26;

    public static final int FILE_TYPE_MKV     = 27;

    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_ASF;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_MKV;

    

    // Image file types

    public static final int FILE_TYPE_JPEG    = 31;
@@ -134,6 +136,7 @@ public class MediaFile { 
        addFileType("OGG", FILE_TYPE_OGG, "application/ogg");

        addFileType("OGA", FILE_TYPE_OGG, "application/ogg");

        addFileType("AAC", FILE_TYPE_AAC, "audio/aac");

        addFileType("MKA", FILE_TYPE_MKA, "audio/x-matroska");

 

        addFileType("MID", FILE_TYPE_MID, "audio/midi");

        addFileType("MIDI", FILE_TYPE_MID, "audio/midi");
@@ -151,6 +154,8 @@ public class MediaFile { 
        addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp");

        addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2");

        addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2");

        addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska");

        addFileType("WEBM", FILE_TYPE_MKV, "video/x-matroska");

        if (isWMVEnabled()) {

            addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv");

            addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf");

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