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

Commit b4350af6 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "Opus Matroska support in OpenMax"

parents feac1a43 bf927f8e

include/media/stagefright/MediaDefs.h

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

extern const char *MEDIA_MIMETYPE_AUDIO_OPUS;

extern const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW;

extern const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW;

extern const char *MEDIA_MIMETYPE_AUDIO_RAW;

include/media/stagefright/MetaData.h

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ enum { 
    kKeyD263              = 'd263',  // raw data

    kKeyVorbisInfo        = 'vinf',  // raw data

    kKeyVorbisBooks       = 'vboo',  // raw data

    kKeyOpusHeader        = 'ohdr',  // raw data

    kKeyOpusCodecDelay    = 'ocod',  // uint64_t (codec delay in ns)

    kKeyOpusSeekPreRoll   = 'ospr',  // uint64_t (seek preroll in ns)

    kKeyWantsNALFragments = 'NALf',

    kKeyIsSyncFrame       = 'sync',  // int32_t (bool)

    kKeyIsCodecConfig     = 'conf',  // int32_t (bool)

media/libstagefright/ACodec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -964,6 +964,8 @@ status_t ACodec::setComponentRole( 
            "audio_decoder.aac", "audio_encoder.aac" },

        { MEDIA_MIMETYPE_AUDIO_VORBIS,

            "audio_decoder.vorbis", "audio_encoder.vorbis" },

        { MEDIA_MIMETYPE_AUDIO_OPUS,

            "audio_decoder.opus", "audio_encoder.opus" },

        { MEDIA_MIMETYPE_AUDIO_G711_MLAW,

            "audio_decoder.g711mlaw", "audio_encoder.g711mlaw" },

        { MEDIA_MIMETYPE_AUDIO_G711_ALAW,

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ LOCAL_SHARED_LIBRARIES := \ 
        libicuuc \

        liblog \

        libmedia \

        libopus \

        libsonivox \

        libssl \

        libstagefright_omx \

media/libstagefright/MediaDefs.cpp

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II = "audio/mpeg-L2"; 
const char *MEDIA_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";

const char *MEDIA_MIMETYPE_AUDIO_QCELP = "audio/qcelp";

const char *MEDIA_MIMETYPE_AUDIO_VORBIS = "audio/vorbis";

const char *MEDIA_MIMETYPE_AUDIO_OPUS = "audio/opus";

const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";

const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";