commit 05ea0be13642f381b2df31a0485a2b798130d96f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 22 19:45:36 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 22 19:45:36 2022 +0000
tree ab7161edf71e87a9a203291bff1125386d784d5f
parent 7d7cd6b0e4e7ba09a7283a6b23c3c1f3afa7e18e
parent 43e715d9d91771323fcdd8f5416d5f188914ba0e

Merge "CCodec: fix not to use YV12 format on COLOR_FormatYUV420Flexible for pre-S"

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 296d7ed..a11d789 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)) {