commit 0cd597d70313494fe754a6ee80fa9cccb911cdc4
author Wonsik Kim <wonsik@google.com> Wed Mar 31 07:13:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 31 07:13:17 2021 +0000
tree 0a65b67a2e944aedfa89b20227ac37547ed20667
parent 96a76d64298017335ef0d0ee8bcdd002c158c5d8
parent ae6ff9517b2a9640cb023ddaafdc010c7c23280d

Merge "CCodec: use known default format for bytebuffer mode decoder" am: c31f15026f am: ae6ff9517b

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

Change-Id: If7c82458f7f81e13984421b0e404cf3616ea4da3

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 60c5901..b203d24 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -996,7 +996,15 @@
                 // needed for decoders.
                 if (!(config->mDomain & Config::IS_ENCODER)) {
                     if (surface == nullptr) {
-                        format = flexPixelFormat.value_or(COLOR_FormatYUV420Flexible);
+                        const char *prefix = "";
+                        if (flexSemiPlanarPixelFormat) {
+                            format = COLOR_FormatYUV420SemiPlanar;
+                            prefix = "semi-";
+                        } else {
+                            format = COLOR_FormatYUV420Planar;
+                        }
+                        ALOGD("Client requested ByteBuffer mode decoder w/o color format set: "
+                                "using default %splanar color format", prefix);
                     } else {
                         format = COLOR_FormatSurface;
                     }