commit 79da7ae5d6f5c5b1f2d3aa4fcd596b5b2e6f9ce4
author Malathi Gottam <mgottam@codeaurora.org> Fri Sep 06 15:05:14 2019 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 06 02:58:10 2019 -0700
tree 2922f2f7194ac9f839395fc5c624944d767eb4dc
parent 08072fde1d32f51bae83743c4020b9b68dbe4954

mm-core: properly disable VC1 decoder for trinket and atoll

Disable VC1 for atoll and trinket.

Change-Id: I4608fb80469ab5856e1d70297fde4f0ae6ba8ab4

mm-core/src/registry_table.c

diff --git a/mm-core/src/registry_table.c b/mm-core/src/registry_table.c
index 82ac3cc..9a484aa 100644
--- a/mm-core/src/registry_table.c
+++ b/mm-core/src/registry_table.c
@@ -83,7 +83,7 @@
     OMX_REGISTRY_ENTRY("OMX.qti.vdec.vpp", "libOmxVpp.so", "video_decoder.vpp"),
 #endif //_STEPPE_ || _ATOLL_
 
-#if !defined(_ATOLL_) || !defined(_TRINKET)
+#if !defined(_ATOLL_) && !defined(_TRINKET_)
     OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.vc1sw", "libOmxSwVdec.so", "video_decoder.vc1"),
     OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.wmvsw", "libOmxSwVdec.so", "video_decoder.vc1"),
 #endif //_ATOLL_ || _TRINKET_

mm-core/src/registry_table_android.c

diff --git a/mm-core/src/registry_table_android.c b/mm-core/src/registry_table_android.c
index 3b9e303..1379dfd 100644
--- a/mm-core/src/registry_table_android.c
+++ b/mm-core/src/registry_table_android.c
@@ -90,7 +90,7 @@
     OMX_REGISTRY_ENTRY("OMX.qti.vdec.vpp", "libOmxVpp.so", "iv_processor.yuv"),
 #endif //_STEPPE_
 
-#if !defined(_ATOLL_) || !defined(_TRINKET)
+#if !defined(_ATOLL_) && !defined(_TRINKET_)
     OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.vc1sw", "libOmxSwVdec.so", "video_decoder.vc1"),
 #endif //_ATOLL_ || _TRINKET_