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

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

resolved conflicts for merge of 1fc97385 to master 

Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
parents 9db8abcd 1fc97385

media/libstagefright/OMXCodec.cpp

+6 −0
Original line number Diff line number Diff line
@@ -174,17 +174,20 @@ static const CodecInfo kDecoderInfo[] = { 
    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.7x30.video.decoder.mpeg4" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.decoder.mpeg4" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.Decoder" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.SEC.MPEG4.Decoder" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Decoder" },

//    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.PV.mpeg4dec" },

//    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.Nvidia.h263.decode" },

    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.7x30.video.decoder.h263" },

    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.video.decoder.h263" },

    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.SEC.H263.Decoder" },

    { MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Decoder" },

//    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.PV.h263dec" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.Nvidia.h264.decode" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.7x30.video.decoder.avc" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.video.decoder.avc" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.Decoder" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.SEC.AVC.Decoder" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder" },

//    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.PV.avcdec" },

    { MEDIA_MIMETYPE_AUDIO_VORBIS, "VorbisDecoder" },
@@ -202,17 +205,20 @@ static const CodecInfo kEncoderInfo[] = { 
    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.7x30.video.encoder.mpeg4" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.encoder.mpeg4" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.encoder" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.SEC.MPEG4.Encoder" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Encoder" },

//    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.PV.mpeg4enc" },

    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.7x30.video.encoder.h263" },

    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.video.encoder.h263" },

    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.TI.Video.encoder" },

    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.SEC.H263.Encoder" },

    { MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Encoder" },

//    { MEDIA_MIMETYPE_VIDEO_H263, "OMX.PV.h263enc" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.7x30.video.encoder.avc" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.video.encoder.avc" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.encoder" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.Nvidia.h264.encoder" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.SEC.AVC.Encoder" },

    { MEDIA_MIMETYPE_VIDEO_AVC, "AVCEncoder" },

//    { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.PV.avcenc" },

};