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

Commit 8ed880d7 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Disable all the hardware decoders except for h.264 video decode, since... 

Merge "Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster."
parents deefe553 d222c840

media/libstagefright/OMXCodec.cpp

+7 −6
Original line number Diff line number Diff line
@@ -146,31 +146,31 @@ static sp<MediaSource> InstantiateSoftwareCodec( 


static const CodecInfo kDecoderInfo[] = {

    { MEDIA_MIMETYPE_IMAGE_JPEG, "OMX.TI.JPEG.decode" },

    { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.Nvidia.mp3.decoder" },

//    { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.Nvidia.mp3.decoder" },

//    { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.TI.MP3.decode" },

    { MEDIA_MIMETYPE_AUDIO_MPEG, "MP3Decoder" },

//    { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.PV.mp3dec" },

//    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.TI.AMR.decode" },

    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.Nvidia.amr.decoder" },

//    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.Nvidia.amr.decoder" },

    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBDecoder" },

//    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.PV.amrdec" },

    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.Nvidia.amrwb.decoder" },

//    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.Nvidia.amrwb.decoder" },

    { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.TI.WBAMR.decode" },

    { MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBDecoder" },

//    { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.PV.amrdec" },

    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.Nvidia.aac.decoder" },

//    { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.Nvidia.aac.decoder" },

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

    { MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" },

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

    { MEDIA_MIMETYPE_AUDIO_G711_ALAW, "G711Decoder" },

    { MEDIA_MIMETYPE_AUDIO_G711_MLAW, "G711Decoder" },

    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.Nvidia.mp4.decode" },

//    { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.Nvidia.mp4.decode" },

    { 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.Nvidia.h263.decode" },

//    { 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, "M4vH263Decoder" },
@@ -2188,6 +2188,7 @@ void OMXCodec::disablePortAsync(OMX_U32 portIndex) { 
    CHECK_EQ(mPortStatus[portIndex], ENABLED);

    mPortStatus[portIndex] = DISABLING;



    CODEC_LOGV("sending OMX_CommandPortDisable(%ld)", portIndex);

    status_t err =

        mOMX->sendCommand(mNode, OMX_CommandPortDisable, portIndex);

    CHECK_EQ(err, OK);