commit f4a629bef8d3a9130e29cb31eec11dad6e6bc8ae
author Praveen Chavan <pchavan@quicinc.com> Sun Dec 23 19:25:35 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 26 00:06:12 2018 +0000
tree 6857fac41d78f976ee4ba2a2ac6d80f3f3c3b7d5
parent ed51f5bbde596516ec05bb1b1af9374d0c35d52e

CCodecInfoBuilder: Avoid adding omx codec infos in full-codec2 mode

If debug.stagefright.ccodec == 4, do not build MediaCodecInfo
from omx since those components will be removed and will instead
end up as empty infos in MediaCodecList.

Bug: 121225951
Bug: 121237410
Bug: 121188614

Test:
  android.media.cts.MediaCodecListTest pass
(cherry picked from commit 8cae25cda45afb9004334265262e885b843663aa)

Change-Id: Ic2f84c4a6905b75894fe7931942514d96e969774

media/sfplugin/Codec2InfoBuilder.cpp

diff --git a/media/sfplugin/Codec2InfoBuilder.cpp b/media/sfplugin/Codec2InfoBuilder.cpp
index 657e29c..d883d46 100644
--- a/media/sfplugin/Codec2InfoBuilder.cpp
+++ b/media/sfplugin/Codec2InfoBuilder.cpp
@@ -351,7 +351,7 @@
     }
 
     bool surfaceTest(Codec2Client::CreateInputSurface());
-    if (option == 0 || !surfaceTest) {
+    if (option == 0 || (option != 4 && !surfaceTest)) {
         buildOmxInfo(parser, writer);
     }