From 40b49be7a6a9d57f6f1b19be1ef8b36b31ea698b Mon Sep 17 00:00:00 2001
From: Surajit Podder <spodder@codeaurora.org>
Date: Tue, 3 Oct 2017 20:53:43 +0530
Subject: mm-core: Prevent exposing Muxer component in registry.

Prevent exposing internal muxer component to VTS tests
Put Muxer component below the dummy component
entry in the registry file.

Change-Id: I69f4b3d99f867c136a269ac2dd9569a4e1785e3b
---
 mm-core/src/msmpeafowl/registry_table_android.c | 20 +++++++++----------
 mm-core/src/sdm670/registry_table_android.c     | 20 +++++++++----------
 mm-core/src/sdm845/registry_table_android.c     | 26 ++++++++++++-------------
 3 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'mm-core')

diff --git a/mm-core/src/msmpeafowl/registry_table_android.c b/mm-core/src/msmpeafowl/registry_table_android.c
index fbc2b9c2..9155c198 100644
--- a/mm-core/src/msmpeafowl/registry_table_android.c
+++ b/mm-core/src/msmpeafowl/registry_table_android.c
@@ -634,35 +634,35 @@ omx_core_cb_type core[] =
     }
   },
   {
-    "OMX.qcom.file.muxer",
-    NULL, // Create instance function
-    // Unique instance handle
+    "OMX.QCOM.CUST.COMP.START",
+    NULL, //Create instance function
+    //Unique instance handle
     {
       NULL,
       NULL,
       NULL,
       NULL
     },
+    NULL,
     NULL,   // Shared object library handle
-    "libOmxMux.so",
     {
-      "container_muxer.mp2"
+      NULL
     }
   },
   {
-    "OMX.QCOM.CUST.COMP.START",
-    NULL, //Create instance function
-    //Unique instance handle
+    "OMX.qcom.file.muxer",
+    NULL, // Create instance function
+    // Unique instance handle
     {
       NULL,
       NULL,
       NULL,
       NULL
     },
-    NULL,
     NULL,   // Shared object library handle
+    "libOmxMux.so",
     {
-      NULL
+      "container_muxer.mp2"
     }
   },
   {
diff --git a/mm-core/src/sdm670/registry_table_android.c b/mm-core/src/sdm670/registry_table_android.c
index fbc2b9c2..9155c198 100644
--- a/mm-core/src/sdm670/registry_table_android.c
+++ b/mm-core/src/sdm670/registry_table_android.c
@@ -634,35 +634,35 @@ omx_core_cb_type core[] =
     }
   },
   {
-    "OMX.qcom.file.muxer",
-    NULL, // Create instance function
-    // Unique instance handle
+    "OMX.QCOM.CUST.COMP.START",
+    NULL, //Create instance function
+    //Unique instance handle
     {
       NULL,
       NULL,
       NULL,
       NULL
     },
+    NULL,
     NULL,   // Shared object library handle
-    "libOmxMux.so",
     {
-      "container_muxer.mp2"
+      NULL
     }
   },
   {
-    "OMX.QCOM.CUST.COMP.START",
-    NULL, //Create instance function
-    //Unique instance handle
+    "OMX.qcom.file.muxer",
+    NULL, // Create instance function
+    // Unique instance handle
     {
       NULL,
       NULL,
       NULL,
       NULL
     },
-    NULL,
     NULL,   // Shared object library handle
+    "libOmxMux.so",
     {
-      NULL
+      "container_muxer.mp2"
     }
   },
   {
diff --git a/mm-core/src/sdm845/registry_table_android.c b/mm-core/src/sdm845/registry_table_android.c
index e76cabda..e9d23c0a 100644
--- a/mm-core/src/sdm845/registry_table_android.c
+++ b/mm-core/src/sdm845/registry_table_android.c
@@ -602,7 +602,7 @@ omx_core_cb_type core[] =
     }
   },
   {
-    "OMX.qcom.file.muxer",
+    "OMX.qti.vdec.vpp",
     NULL, // Create instance function
     // Unique instance handle
     {
@@ -612,41 +612,41 @@ omx_core_cb_type core[] =
       NULL
     },
     NULL,   // Shared object library handle
-    "libOmxMux.so",
+    "libOmxVpp.so",
     {
-      "container_muxer.mp2"
+      "iv_processor.yuv"
     }
   },
   {
-    "OMX.qti.vdec.vpp",
-    NULL, // Create instance function
-    // Unique instance handle
+    "OMX.QCOM.CUST.COMP.START",
+    NULL, //Create instance function
+    //Unique instance handle
     {
       NULL,
       NULL,
       NULL,
       NULL
     },
+    NULL,
     NULL,   // Shared object library handle
-    "libOmxVpp.so",
     {
-      "iv_processor.yuv"
+      NULL
     }
   },
   {
-    "OMX.QCOM.CUST.COMP.START",
-    NULL, //Create instance function
-    //Unique instance handle
+    "OMX.qcom.file.muxer",
+    NULL, // Create instance function
+    // Unique instance handle
     {
       NULL,
       NULL,
       NULL,
       NULL
     },
-    NULL,
     NULL,   // Shared object library handle
+    "libOmxMux.so",
     {
-      NULL
+      "container_muxer.mp2"
     }
   },
   {
-- 
cgit v1.2.3