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

Commit b09a3c0e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2SoftAvcEnc: Use dimensions from mSize instead of input buffer" into... 

Merge "C2SoftAvcEnc: Use dimensions from mSize instead of input buffer" into rvc-qpr-dev am: fea07af2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13991497

Change-Id: I3283df9071de06dce2b93b6c3368c0f72ba497e0
parents 7e2a28f7 fea07af2

media/codec2/components/avc/C2SoftAvcEnc.cpp

+10 −10
Original line number Original line Diff line number Diff line
@@ -1328,13 +1328,13 @@ c2_status_t C2SoftAvcEnc::setEncodeArgs( 
            ps_inp_raw_buf->apv_bufs[1] = uPlane;

            ps_inp_raw_buf->apv_bufs[1] = uPlane;

            ps_inp_raw_buf->apv_bufs[2] = vPlane;

            ps_inp_raw_buf->apv_bufs[2] = vPlane;





            ps_inp_raw_buf->au4_wd[0] = input->width();

            ps_inp_raw_buf->au4_wd[0] = mSize->width;

            ps_inp_raw_buf->au4_wd[1] = input->width() / 2;

            ps_inp_raw_buf->au4_wd[1] = mSize->width / 2;

            ps_inp_raw_buf->au4_wd[2] = input->width() / 2;

            ps_inp_raw_buf->au4_wd[2] = mSize->width / 2;





            ps_inp_raw_buf->au4_ht[0] = input->height();

            ps_inp_raw_buf->au4_ht[0] = mSize->height;

            ps_inp_raw_buf->au4_ht[1] = input->height() / 2;

            ps_inp_raw_buf->au4_ht[1] = mSize->height / 2;

            ps_inp_raw_buf->au4_ht[2] = input->height() / 2;

            ps_inp_raw_buf->au4_ht[2] = mSize->height / 2;





            ps_inp_raw_buf->au4_strd[0] = yStride;

            ps_inp_raw_buf->au4_strd[0] = yStride;

            ps_inp_raw_buf->au4_strd[1] = uStride;

            ps_inp_raw_buf->au4_strd[1] = uStride;
@@ -1359,11 +1359,11 @@ c2_status_t C2SoftAvcEnc::setEncodeArgs( 
            ps_inp_raw_buf->apv_bufs[0] = yPlane;

            ps_inp_raw_buf->apv_bufs[0] = yPlane;

            ps_inp_raw_buf->apv_bufs[1] = uPlane;

            ps_inp_raw_buf->apv_bufs[1] = uPlane;





            ps_inp_raw_buf->au4_wd[0] = input->width();

            ps_inp_raw_buf->au4_wd[0] = mSize->width;

            ps_inp_raw_buf->au4_wd[1] = input->width();

            ps_inp_raw_buf->au4_wd[1] = mSize->width;





            ps_inp_raw_buf->au4_ht[0] = input->height();

            ps_inp_raw_buf->au4_ht[0] = mSize->height;

            ps_inp_raw_buf->au4_ht[1] = input->height() / 2;

            ps_inp_raw_buf->au4_ht[1] = mSize->height / 2;





            ps_inp_raw_buf->au4_strd[0] = yStride;

            ps_inp_raw_buf->au4_strd[0] = yStride;

            ps_inp_raw_buf->au4_strd[1] = uStride;

            ps_inp_raw_buf->au4_strd[1] = uStride;