commit f7c49e2779445b6d2d2c1526a27d8009f1bd1851
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri May 24 14:19:16 2019 -0700
committer Wonsik Kim <wonsik@google.com> Wed May 29 14:14:12 2019 -0700
tree f7c0d8d10544516c48e4d8352e6d1d4451e47dc3
parent 8cce89de1ae336910f2f5b5d20e027671f34396e

codec2: Fix width and height when output is cropped

Return cropped width and height instead of block's width
and height

Test: cts-tradefed run cts -m CtsMediaBitstreamsTestCases \
 -t android.media.cts.bitstreams.H264Yuv420_8bitBpBitstreamsTest
Bug: 132042537

Change-Id: I72538248fff4aeb9f0ad51e6e0d8844f66f20f92

media/codec2/sfplugin/utils/Codec2BufferUtils.cpp

diff --git a/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp b/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp
index 6b8663f..1e884ef 100644
--- a/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp
+++ b/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp
@@ -118,7 +118,7 @@
 }  // namespace
 
 status_t ImageCopy(uint8_t *imgBase, const MediaImage2 *img, const C2GraphicView &view) {
-    if (view.width() != img->mWidth || view.height() != img->mHeight) {
+    if (view.crop().width != img->mWidth || view.crop().height != img->mHeight) {
         return BAD_VALUE;
     }
     if ((IsNV12(view) && IsI420(img)) || (IsI420(view) && IsNV12(img))) {
@@ -153,7 +153,7 @@
 }
 
 status_t ImageCopy(C2GraphicView &view, const uint8_t *imgBase, const MediaImage2 *img) {
-    if (view.width() != img->mWidth || view.height() != img->mHeight) {
+    if (view.crop().width != img->mWidth || view.crop().height != img->mHeight) {
         return BAD_VALUE;
     }
     if ((IsNV12(img) && IsI420(view)) || (IsI420(img) && IsNV12(view))) {