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

Commit 637df060 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix android.media.cts.ImageReaderDecoderTest fail on MT6580 project"... 

Merge "Fix android.media.cts.ImageReaderDecoderTest fail on MT6580 project" am: 13916e1d am: d520872e

Change-Id: I4fc6dc1fac430f5aaa4e4743e46dbfd3d5194ec6
parents f4b7e72b d520872e

media/codec2/components/avc/C2SoftAvcDec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -755,8 +755,8 @@ c2_status_t C2SoftAvcDec::ensureDecoderState(const std::shared_ptr<C2BlockPool> 
        ALOGE("not supposed to be here, invalid decoder context");

        return C2_CORRUPTED;

    }

    if (mStride != ALIGN64(mWidth)) {

        mStride = ALIGN64(mWidth);

    if (mStride != ALIGN128(mWidth)) {

        mStride = ALIGN128(mWidth);

        if (OK != setParams(mStride, IVD_DECODE_FRAME)) return C2_CORRUPTED;

    }

    if (mOutBlock &&

media/codec2/components/avc/C2SoftAvcDec.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ namespace android { 
#define ivdext_ctl_get_vui_params_ip_t  ih264d_ctl_get_vui_params_ip_t

#define ivdext_ctl_get_vui_params_op_t  ih264d_ctl_get_vui_params_op_t

#define ALIGN64(x)                      ((((x) + 63) >> 6) << 6)

#define ALIGN128(x)                     ((((x) + 127) >> 7) << 7)

#define MAX_NUM_CORES                   4

#define IVDEXT_CMD_CTL_SET_NUM_CORES    \

        (IVD_CONTROL_API_COMMAND_TYPE_T)IH264D_CMD_CTL_SET_NUM_CORES

media/codec2/components/hevc/C2SoftHevcDec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -752,8 +752,8 @@ c2_status_t C2SoftHevcDec::ensureDecoderState(const std::shared_ptr<C2BlockPool> 
        ALOGE("not supposed to be here, invalid decoder context");

        return C2_CORRUPTED;

    }

    if (mStride != ALIGN64(mWidth)) {

        mStride = ALIGN64(mWidth);

    if (mStride != ALIGN128(mWidth)) {

        mStride = ALIGN128(mWidth);

        if (OK != setParams(mStride, IVD_DECODE_FRAME)) return C2_CORRUPTED;

    }

    if (mOutBlock &&

media/codec2/components/hevc/C2SoftHevcDec.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ namespace android { 
#define ivdext_ctl_get_vui_params_ip_t  ihevcd_cxa_ctl_get_vui_params_ip_t

#define ivdext_ctl_get_vui_params_op_t  ihevcd_cxa_ctl_get_vui_params_op_t

#define ALIGN64(x)                      ((((x) + 63) >> 6) << 6)

#define ALIGN128(x)                     ((((x) + 127) >> 7) << 7)

#define MAX_NUM_CORES                   4

#define IVDEXT_CMD_CTL_SET_NUM_CORES    \

        (IVD_CONTROL_API_COMMAND_TYPE_T)IHEVCD_CXA_CMD_CTL_SET_NUM_CORES