diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-31 17:08:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-31 17:08:14 +0000 |
| commit | fea07af2cecae9a7c262b67d892cee7c89de5146 (patch) | |
| tree | a37f8bc5bbbf6651ecd25da52ea0b9992a1f4de4 | |
| parent | 7f822771dad5c9b9f03a70b44f094c80f5a71d2c (diff) | |
| parent | af7ae3bf72c9cac13616959247dd3c51b2bc08d4 (diff) | |
Merge "C2SoftAvcEnc: Use dimensions from mSize instead of input buffer" into rvc-qpr-dev
| -rw-r--r-- | media/codec2/components/avc/C2SoftAvcEnc.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/media/codec2/components/avc/C2SoftAvcEnc.cpp b/media/codec2/components/avc/C2SoftAvcEnc.cpp index ab93ce39f5..566895fa6b 100644 --- a/media/codec2/components/avc/C2SoftAvcEnc.cpp +++ b/media/codec2/components/avc/C2SoftAvcEnc.cpp @@ -1328,13 +1328,13 @@ c2_status_t C2SoftAvcEnc::setEncodeArgs( ps_inp_raw_buf->apv_bufs[1] = uPlane; ps_inp_raw_buf->apv_bufs[2] = vPlane; - ps_inp_raw_buf->au4_wd[0] = input->width(); - ps_inp_raw_buf->au4_wd[1] = input->width() / 2; - ps_inp_raw_buf->au4_wd[2] = input->width() / 2; + ps_inp_raw_buf->au4_wd[0] = mSize->width; + ps_inp_raw_buf->au4_wd[1] = mSize->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[1] = input->height() / 2; - ps_inp_raw_buf->au4_ht[2] = input->height() / 2; + ps_inp_raw_buf->au4_ht[0] = mSize->height; + ps_inp_raw_buf->au4_ht[1] = mSize->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[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[1] = uPlane; - ps_inp_raw_buf->au4_wd[0] = input->width(); - ps_inp_raw_buf->au4_wd[1] = input->width(); + ps_inp_raw_buf->au4_wd[0] = mSize->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[1] = input->height() / 2; + ps_inp_raw_buf->au4_ht[0] = mSize->height; + ps_inp_raw_buf->au4_ht[1] = mSize->height / 2; ps_inp_raw_buf->au4_strd[0] = yStride; ps_inp_raw_buf->au4_strd[1] = uStride; |