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

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

am a557b24a: Initial checkin of mpeg2 transport stream parser for stagefright.

parents cd4961d9 a557b24a

include/media/stagefright/MediaDefs.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 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;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS;



}  // namespace android

media/java/android/media/MediaFile.java

+4 −1
Original line number Diff line number Diff line
@@ -65,8 +65,9 @@ public class MediaFile { 
    public static final int FILE_TYPE_WMV     = 25;

    public static final int FILE_TYPE_ASF     = 26;

    public static final int FILE_TYPE_MKV     = 27;

    public static final int FILE_TYPE_MP2TS   = 28;

    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_MKV;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_MP2TS;

    

    // Image file types

    public static final int FILE_TYPE_JPEG    = 31;
@@ -156,6 +157,8 @@ public class MediaFile { 
        addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2");

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

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

        addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts");



        if (isWMVEnabled()) {

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

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

media/libstagefright/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -80,11 +80,13 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_matroska \

        libstagefright_vpxdec \

        libvpx \

        libstagefright_mpeg2ts \



LOCAL_SHARED_LIBRARIES += \

        libstagefright_amrnb_common \

        libstagefright_enc_common \

        libstagefright_avc_common

        libstagefright_avc_common \

        libstagefright_foundation \



ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true)

media/libstagefright/DataSource.cpp

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

#include "include/WAVExtractor.h"

#include "include/OggExtractor.h"

#include "include/MPEG2TSExtractor.h"



#include "matroska/MatroskaExtractor.h"
@@ -97,6 +98,7 @@ void DataSource::RegisterDefaultSniffers() { 
    RegisterSniffer(SniffWAV);

    RegisterSniffer(SniffOgg);

    RegisterSniffer(SniffMatroska);

    RegisterSniffer(SniffMPEG2TS);

}



// static

media/libstagefright/MediaDefs.cpp

+1 −0
Original line number Diff line number Diff line
@@ -38,5 +38,6 @@ 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";

const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS = "video/mp2ts";



}  // namespace android