commit dfca1ce852e8223656c7883d3b32d61cc091ac59
author Wonsik Kim <wonsik@google.com> Wed Mar 31 07:57:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 31 07:57:44 2021 +0000
tree 92877e55993473608ee822286dee131b9e861c25
parent 271fe6eddd9e9f846c3185b6e6df3c2d8e2fdfed
parent 0cd597d70313494fe754a6ee80fa9cccb911cdc4

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

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

Change-Id: I286fe0727c632786919ce0d297c3ea7a5df85b00

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index c881407..63ae5cd 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -997,7 +997,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;
                     }