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

Commit bc554956 authored by Andreas Huber's avatar Andreas Huber
Browse files

Support for an MPEG2 Program Stream extractor. 

Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
parent ce0a7ade

cmds/stagefright/stagefright.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1021,6 +1021,7 @@ int main(int argc, char **argv) { 
                syncInfoPresent = false;

            } else {

                extractor = MediaExtractor::Create(dataSource);



                if (extractor == NULL) {

                    fprintf(stderr, "could not create extractor.\n");

                    return -1;

include/media/stagefright/MediaDefs.h

+4 −1
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ extern const char *MEDIA_MIMETYPE_VIDEO_RAW; 


extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB;

extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG;           // layer III

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC;

extern const char *MEDIA_MIMETYPE_AUDIO_QCELP;

extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS;
@@ -47,6 +49,7 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_OGG; 
extern const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS;

extern const char *MEDIA_MIMETYPE_CONTAINER_AVI;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2PS;



extern const char *MEDIA_MIMETYPE_CONTAINER_WVM;

media/java/android/media/MediaFile.java

+10 −1
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ public class MediaFile { 
    private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;

    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_WEBM;

    

    // More video file types

    public static final int FILE_TYPE_MP2PS   = 200;

    private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;

    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;



    // Image file types

    public static final int FILE_TYPE_JPEG    = 31;

    public static final int FILE_TYPE_GIF     = 32;
@@ -235,6 +240,8 @@ public class MediaFile { 
        addFileType("PPT", FILE_TYPE_MS_POWERPOINT, "application/mspowerpoint", MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION);

        addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac", MtpConstants.FORMAT_FLAC);

        addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");

        addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p");

        addFileType("MPEG", FILE_TYPE_MP2PS, "video/mp2p");

    }



    public static boolean isAudioFileType(int fileType) {
@@ -246,7 +253,9 @@ public class MediaFile { 


    public static boolean isVideoFileType(int fileType) {

        return (fileType >= FIRST_VIDEO_FILE_TYPE &&

                fileType <= LAST_VIDEO_FILE_TYPE);

                fileType <= LAST_VIDEO_FILE_TYPE)

            || (fileType >= FIRST_VIDEO_FILE_TYPE2 &&

                fileType <= LAST_VIDEO_FILE_TYPE2);

    }



    public static boolean isImageFileType(int fileType) {

media/libstagefright/ACodec.cpp

+4 −0
Original line number Diff line number Diff line
@@ -681,6 +681,10 @@ void ACodec::setComponentRole( 
    static const MimeToRole kMimeToRole[] = {

        { MEDIA_MIMETYPE_AUDIO_MPEG,

            "audio_decoder.mp3", "audio_encoder.mp3" },

        { MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I,

            "audio_decoder.mp1", "audio_encoder.mp1" },

        { MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II,

            "audio_decoder.mp2", "audio_encoder.mp2" },

        { MEDIA_MIMETYPE_AUDIO_AMR_NB,

            "audio_decoder.amrnb", "audio_encoder.amrnb" },

        { MEDIA_MIMETYPE_AUDIO_AMR_WB,

media/libstagefright/AwesomePlayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,8 @@ void AwesomePlayer::initRenderer_l() { 


    if (USE_SURFACE_ALLOC

            && !strncmp(component, "OMX.", 4)

            && strncmp(component, "OMX.google.", 11)) {

            && strncmp(component, "OMX.google.", 11)

            && strcmp(component, "OMX.Nvidia.mpeg2v.decode")) {

        // Hardware decoders avoid the CPU color conversion by decoding

        // directly to ANativeBuffers, so we must use a renderer that

        // just pushes those buffers to the ANativeWindow.