Follow-up - Renaming OMX Master Core methods, to fix build break beca…

…use of missing changes in Player, Author and FMU Test apps.
aosp-mirror · Jul 7, 2009 · e347172 · e347172
1 parent 0a14ae9
commit e347172
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/android/drm/oma1/test/test_pv_player_engine_main.cpp b/android/drm/oma1/test/test_pv_player_engine_main.cpp
@@ -34,6 +34,7 @@
 #include "unit_test_args.h"
 
 #include "OMX_Core.h"
+#include "pv_omxcore.h"
 
 void FindSourceFile( cmd_line* command_line,
                      OSCL_HeapString<OsclMemAllocator> &aFileNameInfo,
@@ -199,7 +200,7 @@ int local_main(cmd_line* command_line )
     OsclErrorTrap::Init();
     OsclMem::Init();
 
-    OMX_Init();
+    OMX_MasterInit();
 
     //Run the test under a trap
     int result = 0;
@@ -219,7 +220,7 @@ int local_main(cmd_line* command_line )
     }
 
     //Cleanup
-    OMX_Deinit();
+    OMX_MasterDeinit();
 
     OsclMem::Cleanup();
     OsclErrorTrap::Cleanup();

diff --git a/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.cpp b/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.cpp
@@ -35,6 +35,7 @@
 #include "oscl_string_utils.h"
 
 #include "OMX_Core.h"
+#include "pv_omxcore.h"
 
 #ifndef DEFAULTSOURCEFILENAME
 #error // The default source file needs to be defined in config file
@@ -740,7 +741,7 @@ int local_main(FILE* filehandle, cmd_line* command_line)
     OsclBase::Init();
     OsclErrorTrap::Init();
     OsclMem::Init();
-    OMX_Init();
+    OMX_MasterInit();
 
     const int numArgs = 10; //change as per the number of args below
     char *argv[numArgs];
@@ -798,7 +799,7 @@ int local_main(FILE* filehandle, cmd_line* command_line)
     }
 
     //Cleanup
-    OMX_Deinit();
+    OMX_MasterDeinit();
 #if !(OSCL_BYPASS_MEMMGT)
     //Check for memory leaks before cleaning up OsclMem.
     OsclAuditCB auditCB;

diff --git a/engines/author/test/src/pvaetest.cpp b/engines/author/test/src/pvaetest.cpp
@@ -41,6 +41,7 @@
 
 #if USE_OMX_ENC_NODE
 #include "OMX_Core.h"
+#include "pv_omxcore.h"
 #endif
 
 FILE* file;
@@ -1712,7 +1713,7 @@ int local_main(FILE* filehandle, cmd_line* command_line)
     OsclMem::Init();
 
 #if USE_OMX_ENC_NODE
-    OMX_Init();
+    OMX_MasterInit();
 #endif
 
     {
@@ -1739,7 +1740,7 @@ int local_main(FILE* filehandle, cmd_line* command_line)
         fprintf(file, "Error!  Leave %d\n", err);
     }
 #if USE_OMX_ENC_NODE
-    OMX_Deinit();
+    OMX_MasterDeinit();
 #endif
     //Cleanup
 #if !(OSCL_BYPASS_MEMMGT)

diff --git a/engines/player/test/src/test_pv_player_engine.cpp b/engines/player/test/src/test_pv_player_engine.cpp
@@ -144,6 +144,7 @@
 #endif
 
 #include "OMX_Core.h"
+#include "pv_omxcore.h"
 
 #ifndef OSCL_UTF8CONV_H
 #include "oscl_utf8conv.h"
@@ -1696,7 +1697,7 @@ int local_main(FILE *filehandle, cmd_line* command_line)
     OsclBase::Init();
     OsclErrorTrap::Init();
     OsclMem::Init();
-    OMX_Init();
+    OMX_MasterInit();
 
 
     {
@@ -1722,7 +1723,7 @@ int local_main(FILE *filehandle, cmd_line* command_line)
         fprintf(file, "Error!  Leave %d\n", err);
     }
     //Cleanup
-    OMX_Deinit();
+    OMX_MasterDeinit();
 
 #if !(OSCL_BYPASS_MEMMGT)
     //Check for memory leaks before cleaning up OsclMem.

diff --git a/engines/player/test/src/test_pv_player_engine_testset1.cpp b/engines/player/test/src/test_pv_player_engine_testset1.cpp
@@ -17473,6 +17473,7 @@ void pvplayer_async_test_multipauseseekresume::HandleInformationalEvent(const PV
 #include "pvmf_local_data_source.h"
 #include "oscl_scheduler.h"
 #include "OMX_Core.h"
+#include "pv_omxcore.h"
 #include "oscl_mem_audit.h"
 
 //test observer function for the 2nd instance.
@@ -17501,7 +17502,7 @@ void pvplayer_async_test_multiple_instance::InThread(pvplayer_async_test_multipl
 {
     //Init Oscl
     OsclMem::Init();
-    OMX_Init();
+    OMX_MasterInit();
     PVLogger::Init();
     OsclScheduler::Init("pvplayer_async_test_multiple_instance");
 
@@ -17532,7 +17533,7 @@ void pvplayer_async_test_multiple_instance::InThread(pvplayer_async_test_multipl
     //Cleanup Oscl.
     OsclScheduler::Cleanup();
     PVLogger::Cleanup();
-    OMX_Deinit();
+    OMX_MasterDeinit();
     //note: there's no memory leak check here since
     //this thread exits before the main thread.
     OsclMem::Cleanup();