commit c2607559689f358b014808a493fd6d0b431368a5
author Patryk Busse <pbusse@google.com> Mon Sep 05 11:33:07 2022 +0000
committer Patryk Busse <pbusse@google.com> Tue Sep 13 08:33:22 2022 +0000
tree a254a5ff7e2b524059f24c10f798a0678adcf8e8
parent f03a0a2738744303011e77bab326d38861fa09d6

Correct crop size for software encoders

When using surface crop size may be set to incorrect
value and cause errors when copying buffers.
To prevent that, encoders will set crop size to expected
image size.

Bug: b/232396154

Test: android.mediav2.cts.CodecEncoderSurfaceTest
      android.mediav2.cts.CodecEncoderTest

Change-Id: Iafa4f9f1a49760c2b5345b8768b476a2fd7510f6

media/codec2/components/hevc/C2SoftHevcEnc.cpp

diff --git a/media/codec2/components/hevc/C2SoftHevcEnc.cpp b/media/codec2/components/hevc/C2SoftHevcEnc.cpp
index 60d5875..9c26c02 100644
--- a/media/codec2/components/hevc/C2SoftHevcEnc.cpp
+++ b/media/codec2/components/hevc/C2SoftHevcEnc.cpp
@@ -1109,14 +1109,14 @@
         }
     }
 
-    std::shared_ptr<const C2GraphicView> view;
+    std::shared_ptr<C2GraphicView> view;
     std::shared_ptr<C2Buffer> inputBuffer = nullptr;
     bool eos = ((work->input.flags & C2FrameData::FLAG_END_OF_STREAM) != 0);
     if (eos) mSignalledEos = true;
 
     if (!work->input.buffers.empty()) {
         inputBuffer = work->input.buffers[0];
-        view = std::make_shared<const C2GraphicView>(
+        view = std::make_shared<C2GraphicView>(
             inputBuffer->data().graphicBlocks().front().map().get());
         if (view->error() != C2_OK) {
             ALOGE("graphic view map err = %d", view->error());
@@ -1125,6 +1125,9 @@
             work->workletsProcessed = 1u;
             return;
         }
+        //(b/232396154)
+        //workaround for incorrect crop size in view when using surface mode
+        view->setCrop_be(C2Rect(mSize->width, mSize->height));
     }
     IHEVCE_PLUGIN_STATUS_T err = IHEVCE_EOK;