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

Commit 9c6d495b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove invalid check in avc and hevc dec" am: 366ad0c7 

Change-Id: I9d09bb46b0ca5e9be6e2850fa5208bd24597bf18
parents 46b7e4f9 366ad0c7

media/codec2/components/avc/C2SoftAvcDec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ bool C2SoftAvcDec::setDecodeArgs(ivd_video_decode_ip_t *ps_decode_ip, 
    ps_decode_ip->s_out_buffer.u4_min_out_buf_size[1] = chromaSize;

    ps_decode_ip->s_out_buffer.u4_min_out_buf_size[2] = chromaSize;

    if (outBuffer) {

        if (outBuffer->width() < displayStride || outBuffer->height() < displayHeight) {

        if (outBuffer->height() < displayHeight) {

            ALOGE("Output buffer too small: provided (%dx%d) required (%ux%u)",

                  outBuffer->width(), outBuffer->height(), displayStride, displayHeight);

            return false;

media/codec2/components/hevc/C2SoftHevcDec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ bool C2SoftHevcDec::setDecodeArgs(ivd_video_decode_ip_t *ps_decode_ip, 
    ps_decode_ip->s_out_buffer.u4_min_out_buf_size[1] = chromaSize;

    ps_decode_ip->s_out_buffer.u4_min_out_buf_size[2] = chromaSize;

    if (outBuffer) {

        if (outBuffer->width() < displayStride || outBuffer->height() < displayHeight) {

        if (outBuffer->height() < displayHeight) {

            ALOGE("Output buffer too small: provided (%dx%d) required (%ux%u)",

                  outBuffer->width(), outBuffer->height(), displayStride, displayHeight);

            return false;