commit 201a121f0684dba640e0cb3b9c1775f677d2b416
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 22 22:38:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 22 22:38:11 2022 +0000
tree 6334f0142368583426f3cd5e3c8e586a2a12e803
parent 378358456ae301cb9febff24a152ffb8bbed569e
parent 0c4d66a2e9a4433636d3688ef0d11fb74e869c7a

Merge "CCodec: fix not to use YV12 format on COLOR_FormatYUV420Flexible for pre-S" am: 05ea0be136 am: a9e472724f am: 8c423c71fd am: df172bbd65 am: 0c4d66a2e9

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2226397

Change-Id: I0fec91902253ccf94cf6b04e8bfae8c107803e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 72301db..bdc4828 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1075,8 +1075,7 @@
             } else {
                 if ((config->mDomain & Config::IS_ENCODER) || !surface) {
                     if (vendorSdkVersion < __ANDROID_API_S__ &&
-                            (format == COLOR_FormatYUV420Flexible ||
-                             format == COLOR_FormatYUV420Planar ||
+                            (format == COLOR_FormatYUV420Planar ||
                              format == COLOR_FormatYUV420PackedPlanar ||
                              format == COLOR_FormatYUV420SemiPlanar ||
                              format == COLOR_FormatYUV420PackedSemiPlanar)) {