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

Commit b7765027 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "avc/hevc: Align 128 everywhere"

parents 9d33c634 48dfc8c1

media/codec2/components/avc/C2SoftAvcDec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ void C2SoftAvcDec::getVersion() { 
status_t C2SoftAvcDec::initDecoder() {

    if (OK != createDecoder()) return UNKNOWN_ERROR;

    mNumCores = MIN(getCpuCoreCount(), MAX_NUM_CORES);

    mStride = ALIGN64(mWidth);

    mStride = ALIGN128(mWidth);

    mSignalledError = false;

    resetPlugin();

    (void) setNumCores();
@@ -908,7 +908,7 @@ void C2SoftAvcDec::process( 
        if (0 < s_decode_op.u4_pic_wd && 0 < s_decode_op.u4_pic_ht) {

            if (mHeaderDecoded == false) {

                mHeaderDecoded = true;

                setParams(ALIGN64(s_decode_op.u4_pic_wd), IVD_DECODE_FRAME);

                setParams(ALIGN128(s_decode_op.u4_pic_wd), IVD_DECODE_FRAME);

            }

            if (s_decode_op.u4_pic_wd != mWidth || s_decode_op.u4_pic_ht != mHeight) {

                mWidth = s_decode_op.u4_pic_wd;

media/codec2/components/hevc/C2SoftHevcDec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ status_t C2SoftHevcDec::getVersion() { 
status_t C2SoftHevcDec::initDecoder() {

    if (OK != createDecoder()) return UNKNOWN_ERROR;

    mNumCores = MIN(getCpuCoreCount(), MAX_NUM_CORES);

    mStride = ALIGN64(mWidth);

    mStride = ALIGN128(mWidth);

    mSignalledError = false;

    resetPlugin();

    (void) setNumCores();
@@ -904,7 +904,7 @@ void C2SoftHevcDec::process( 
        if (0 < s_decode_op.u4_pic_wd && 0 < s_decode_op.u4_pic_ht) {

            if (mHeaderDecoded == false) {

                mHeaderDecoded = true;

                setParams(ALIGN64(s_decode_op.u4_pic_wd), IVD_DECODE_FRAME);

                setParams(ALIGN128(s_decode_op.u4_pic_wd), IVD_DECODE_FRAME);

            }

            if (s_decode_op.u4_pic_wd != mWidth ||  s_decode_op.u4_pic_ht != mHeight) {

                mWidth = s_decode_op.u4_pic_wd;