commit fc3f741e60c50a6ff18715cbc24db074035f90c9
author Harish Mahendrakar <hmahendrakar@google.com> Thu Mar 21 17:29:37 2024 +0000
committer Harish Mahendrakar <hmahendrakar@google.com> Sat Mar 23 00:22:34 2024 +0000
tree f4602e4f7a95ba032126437b333f415ca43f414b
parent f6b3e5e9284fceffdebefa7c4a5d41928ecced38

media: odd resolution support in vpx and av1 encoders

Since odd dimension support requires some changes in the c2
framework which are merged after Android U release, this is
support is restricted to Android V and above for encoders.

Bug: 329378524
Bug: 325679394
Test: atest CtsMediaEncoderTestCases:VideoEncoderTest
Test: atest CtsMediaV2TestCases:CodecInfoTest

Change-Id: I35af70e4b1e33aa027666791dfe101060b69ab4a

media/codec2/components/aom/C2SoftAomEnc.cpp

diff --git a/media/codec2/components/aom/C2SoftAomEnc.cpp b/media/codec2/components/aom/C2SoftAomEnc.cpp
index 128e16e..256bcb8 100644
--- a/media/codec2/components/aom/C2SoftAomEnc.cpp
+++ b/media/codec2/components/aom/C2SoftAomEnc.cpp
@@ -50,11 +50,13 @@
                                  0u, (uint64_t)C2MemoryUsage::CPU_READ))
                          .build());
 
+    // Odd dimension support in encoders requires Android V and above
+    size_t stepSize = isAtLeastV() ? 1 : 2;
     addParameter(DefineParam(mSize, C2_PARAMKEY_PICTURE_SIZE)
                          .withDefault(new C2StreamPictureSizeInfo::input(0u, 320, 240))
                          .withFields({
-                                 C2F(mSize, width).inRange(2, 2048, 2),
-                                 C2F(mSize, height).inRange(2, 2048, 2),
+                                 C2F(mSize, width).inRange(2, 2048, stepSize),
+                                 C2F(mSize, height).inRange(2, 2048, stepSize),
                          })
                          .withSetter(SizeSetter)
                          .build());