commit fdd58cb12b7a3a2491c4c375ee8dcfc1595380c7
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Jun 09 07:45:33 2020 +0530
committer Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Jun 11 21:23:17 2020 +0000
tree e5d20abfd2f3e1de555c41d9b14496f99e6ea0b2
parent ed2b8f2314ec58ab045065db681e2287b5f65544

C2SoftVpxEnc: Add support for encoding from a larger graphic block

Currently buffer dimensions are expected to be same as encode dimension.
Updated the checks to allow for encoding from larger graphic block

Bug: 158120386
Test: Encode 340x280 from a decoder surface with dimensions 384x288

Change-Id: I9eed491d3211b42cc4b9f7e42fb386240c745b15
Merged-In: I9eed491d3211b42cc4b9f7e42fb386240c745b15

media/codec2/components/vpx/C2SoftVpxEnc.cpp

diff --git a/media/codec2/components/vpx/C2SoftVpxEnc.cpp b/media/codec2/components/vpx/C2SoftVpxEnc.cpp
index ebc7a8f..a23db16 100644
--- a/media/codec2/components/vpx/C2SoftVpxEnc.cpp
+++ b/media/codec2/components/vpx/C2SoftVpxEnc.cpp
@@ -455,8 +455,8 @@
 
     const C2ConstGraphicBlock inBuffer =
         inputBuffer->data().graphicBlocks().front();
-    if (inBuffer.width() != mSize->width ||
-        inBuffer.height() != mSize->height) {
+    if (inBuffer.width() < mSize->width ||
+        inBuffer.height() < mSize->height) {
         ALOGE("unexpected Input buffer attributes %d(%d) x %d(%d)",
               inBuffer.width(), mSize->width, inBuffer.height(),
               mSize->height);
@@ -467,8 +467,8 @@
     bool eos = ((work->input.flags & C2FrameData::FLAG_END_OF_STREAM) != 0);
     vpx_image_t raw_frame;
     const C2PlanarLayout &layout = rView->layout();
-    uint32_t width = rView->width();
-    uint32_t height = rView->height();
+    uint32_t width = mSize->width;
+    uint32_t height = mSize->height;
     if (width > 0x8000 || height > 0x8000) {
         ALOGE("Image too big: %u x %u", width, height);
         work->result = C2_BAD_VALUE;