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

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

Merge "Remove invalid check in avc and hevc dec"

parents ba13bf83 3a8a46c1

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;