commit bc2b7134e09fda451f878e125dfed436ccff904b
author Praveen Chavan <pchavan@quicinc.com> Wed Jan 19 23:02:56 2022 -0800
committer Lajos Molnar <lajos@google.com> Thu Jan 27 00:19:28 2022 +0000
tree 50155dcfb3d55127a1ad8f5d5c4dab3973378e4c
parent 35c5124850bba0a97aac80e4465dbc243827ffb7

Codec2: optimize plane copy for formats with depth > 8

Amend the condition to check if a buffer qualifies
for plane-copy by including the bit-depth

Test:
    android.media.cts.ImageReaderDecoderTest#testOtherH265_10BitImage

Bug: 210947256
Change-Id: I95f7b42475c3d893061aafb9eba818ca2f1148b5

media/codec2/sfplugin/utils/Codec2BufferUtils.cpp

diff --git a/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp b/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp
index 2213001..b761c35 100644
--- a/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp
+++ b/media/codec2/sfplugin/utils/Codec2BufferUtils.cpp
@@ -88,7 +88,7 @@
         uint32_t planeW = img->mWidth / plane.colSampling;
         uint32_t planeH = img->mHeight / plane.rowSampling;
 
-        bool canCopyByRow = (plane.colInc == 1) && (img->mPlane[i].mColInc == 1);
+        bool canCopyByRow = (plane.colInc == bpp) && (img->mPlane[i].mColInc == bpp);
         bool canCopyByPlane = canCopyByRow && (plane.rowInc == img->mPlane[i].mRowInc);
         if (canCopyByPlane) {
             MemCopier<ToMediaImage, 0>::copy(imgRow, viewRow, plane.rowInc * planeH);