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

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

am d6dcec4f: am fd751426: Merge "Add qcom\'s new OMX components to the list." into gingerbread 

Merge commit 'd6dcec4f'

* commit 'd6dcec4f':
  Add qcom's new OMX components to the list.
parents 2c8b1427 d6dcec4f

media/libstagefright/OMXCodec.cpp

+17 −4
Original line number Diff line number Diff line
@@ -149,13 +149,16 @@ static const CodecInfo kDecoderInfo[] = { 
    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.decode" },

    { MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" },

//    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacdec" },

    { 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, "M4vH263Decoder" },

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

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

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

    { MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Decoder" },

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

    { 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, "AVCDecoder" },
@@ -171,16 +174,19 @@ static const CodecInfo kEncoderInfo[] = { 
    { MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBEncoder" },

    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.encode" },

    { MEDIA_MIMETYPE_AUDIO_AAC, "AACEncoder" },

    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacenc" },

//    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacenc" },

    { 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.PV.mpeg4enc" },

//    { 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.PV.h263enc" },

//    { 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.PV.avcenc" },

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

};



#undef OPTIONAL
@@ -334,10 +340,17 @@ uint32_t OMXCodec::getComponentQuirks(const char *componentName) { 
        quirks |= kRequiresAllocateBufferOnInputPorts;

        quirks |= kRequiresAllocateBufferOnOutputPorts;

    }

    if (!strncmp(componentName, "OMX.qcom.7x30.video.encoder.", 28)) {

    }

    if (!strncmp(componentName, "OMX.qcom.video.decoder.", 23)) {

        quirks |= kRequiresAllocateBufferOnOutputPorts;

        quirks |= kDefersOutputBufferAllocation;

    }

    if (!strncmp(componentName, "OMX.qcom.7x30.video.decoder.", 28)) {

        quirks |= kRequiresAllocateBufferOnInputPorts;

        quirks |= kRequiresAllocateBufferOnOutputPorts;

        quirks |= kDefersOutputBufferAllocation;

    }



    if (!strncmp(componentName, "OMX.TI.", 7)) {

        // Apparently I must not use OMX_UseBuffer on either input or