MediaCodecInfo: Change default alignment and block size to 1x1

Default alignment and block size were set to 2x2 earlier.
And even when the codec advertised alignment of 1x1, MediaCodecInfo
was returning 2x2 because it was picking max of default values and
what was advertised by codecs.

Bug: 325679394
Bug: 329378524
Test: atest CtsMediaMiscTestCases:MediaCodecListTest
Test: atest CtsMediaV2TestCases:CodecInfoTest passes for codecs
 that advertise 1x1 alignment

Change-Id: I25af7fb09ab9edf8e1d1dea7bac633b1353b4e48

1 files changed, 4 insertions, 5 deletions

diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 1e7bc4764dd7..abad46046890 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -2651,11 +2651,10 @@ public final class MediaCodecInfo {
             mBlockAspectRatioRange = POSITIVE_RATIONALS;
             mAspectRatioRange      = POSITIVE_RATIONALS;
 
-            // YUV 4:2:0 requires 2:2 alignment
-            mWidthAlignment = 2;
-            mHeightAlignment = 2;
-            mBlockWidth = 2;
-            mBlockHeight = 2;
+            mWidthAlignment = 1;
+            mHeightAlignment = 1;
+            mBlockWidth = 1;
+            mBlockHeight = 1;
             mSmallerDimensionUpperLimit = getSizeRange().getUpper();
         }