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

Commit 3e0f56df authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Get rid of vendor specific video encoder component names from ACodec... 

Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev
parents e5177094 7c25df82

media/libstagefright/ACodec.cpp

+3 −5
Original line number Diff line number Diff line
@@ -1715,7 +1715,9 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) { 
    }



    // XXX

    if (!strncmp(mComponentName.c_str(), "OMX.TI.DUCATI1", 14)) {

    if (h264type.eProfile != OMX_VIDEO_AVCProfileBaseline) {

        ALOGW("Use baseline profile instead of %d for AVC recording",

            h264type.eProfile);

        h264type.eProfile = OMX_VIDEO_AVCProfileBaseline;

    }
@@ -1750,10 +1752,6 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) { 
    h264type.bMBAFF = OMX_FALSE;

    h264type.eLoopFilterMode = OMX_VIDEO_AVCLoopFilterEnable;



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

        h264type.eLevel = OMX_VIDEO_AVCLevelMax;

    }



    err = mOMX->setParameter(

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

media/libstagefright/OMXCodec.cpp

+4 −7
Original line number Diff line number Diff line
@@ -1123,9 +1123,10 @@ status_t OMXCodec::setupAVCEncoderParameters(const sp<MetaData>& meta) { 
    h264type.eProfile = static_cast<OMX_VIDEO_AVCPROFILETYPE>(profileLevel.mProfile);

    h264type.eLevel = static_cast<OMX_VIDEO_AVCLEVELTYPE>(profileLevel.mLevel);



    // FIXME:

    // Remove the workaround after the work in done.

    if (!strncmp(mComponentName, "OMX.TI.DUCATI1", 14)) {

    // XXX

    if (h264type.eProfile != OMX_VIDEO_AVCProfileBaseline) {

        ALOGW("Use baseline profile instead of %d for AVC recording",

            h264type.eProfile);

        h264type.eProfile = OMX_VIDEO_AVCProfileBaseline;

    }
@@ -1160,10 +1161,6 @@ 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, (status_t)OK);