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

Commit 7f81d4cb authored by Dima Zavin's avatar Dima Zavin Committed by Android (Google) Code Review
Browse files

Merge changes Ic94c18a6,Iff770de1,Ifed6b4dc 

* changes:
  libstagefright: enable tegra hw audio decoders
  libstagefright: Enable tegra hw video decoders
  libstagefright: Enable tegra hw encoder
parents 81b5db04 30ba6cb9

media/libstagefright/OMXCodec.cpp

+23 −0
Original line number Diff line number Diff line
@@ -146,29 +146,36 @@ 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.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, "AMRNBDecoder" },

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

    { 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.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.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.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.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" },
@@ -199,6 +206,7 @@ static const CodecInfo kEncoderInfo[] = { 
    { 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, "AVCEncoder" },

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

};
@@ -337,6 +345,13 @@ static int CompareSoftwareCodecsFirst( 
uint32_t OMXCodec::getComponentQuirks(const char *componentName) {

    uint32_t quirks = 0;



    if (!strcmp(componentName, "OMX.Nvidia.amr.decoder") ||

         !strcmp(componentName, "OMX.Nvidia.amrwb.decoder") ||

         !strcmp(componentName, "OMX.Nvidia.aac.decoder") ||

         !strcmp(componentName, "OMX.Nvidia.mp3.decoder")) {

        quirks |= kDecoderLiesAboutNumberOfChannels;

    }



    if (!strcmp(componentName, "OMX.PV.avcdec")) {

        quirks |= kWantsNALFragments;

    }
@@ -854,6 +869,10 @@ void OMXCodec::setVideoInputFormat( 
    OMX_COLOR_FORMATTYPE colorFormat;

    CHECK_EQ(OK, findTargetColorFormat(meta, &colorFormat));



    if (!strcasecmp("OMX.Nvidia.h264.encoder", mComponentName)) {

        colorFormat = OMX_COLOR_FormatYUV420Planar;

    }



    status_t err;

    OMX_PARAM_PORTDEFINITIONTYPE def;

    OMX_VIDEO_PORTDEFINITIONTYPE *video_def = &def.format.video;
@@ -1193,6 +1212,10 @@ status_t OMXCodec::setupAVCEncoderParameters(const sp<MetaData>& meta) { 
    h264type.bMBAFF = OMX_FALSE;

    h264type.eLoopFilterMode = OMX_VIDEO_AVCLoopFilterEnable;



    if (!strcasecmp("OMX.Nvidia.h264.encoder", mComponentName)) {

        h264type.eLevel = OMX_VIDEO_AVCLevelMax;

    }



    err = mOMX->setParameter(

            mNode, OMX_IndexParamVideoAvc, &h264type, sizeof(h264type));

    CHECK_EQ(err, OK);