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

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

am 0eb6ef17: Merge "Support for an MPEG2 Program Stream extractor." 

* commit '0eb6ef1798362d15696618debdb2478b386398c5':
  Support for an MPEG2 Program Stream extractor.
parents 37ae0418 f3377726

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/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.

media/libstagefright/DataSource.cpp

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

#include "include/WAVExtractor.h"

#include "include/OggExtractor.h"

#include "include/MPEG2PSExtractor.h"

#include "include/MPEG2TSExtractor.h"

#include "include/NuCachedSource2.h"

#include "include/HTTPBase.h"
@@ -113,6 +114,7 @@ void DataSource::RegisterDefaultSniffers() { 
    RegisterSniffer(SniffMP3);

    RegisterSniffer(SniffAAC);

    RegisterSniffer(SniffAVI);

    RegisterSniffer(SniffMPEG2PS);



    char value[PROPERTY_VALUE_MAX];

    if (property_get("drm.service.enabled", value, NULL)