RIO-7301: Fix for the linker warnings in OMX encoder and decoder testapp on Android

diff --git a/codecs_v2/omx/omx_testapp/include/omx_threadsafe_callbacks.h b/codecs_v2/omx/omx_testapp/include/omx_threadsafe_callbacks.h
index 62e3ffe..ccd8fb7 100644 (file)
--- a/codecs_v2/omx/omx_testapp/include/omx_threadsafe_callbacks.h
+++ b/codecs_v2/omx/omx_testapp/include/omx_threadsafe_callbacks.h
@@ -80,11 +80,11 @@ const char FillBufferDoneAOName[] = "EventHandlerCallbackAO";
 
 
 /**************** CLASS FOR EVENT HANDLER *************/
-class EventHandlerThreadSafeCallbackAO : public ThreadSafeCallbackAO
+class OmxEventHandlerThreadSafeCallbackAO : public ThreadSafeCallbackAO
 {
     public:
         // Constructor
-        EventHandlerThreadSafeCallbackAO(
+        OmxEventHandlerThreadSafeCallbackAO(
             void* aObserver = NULL,
             uint32 aDepth = DEFAULT_QUEUE_DEPTH,
             const char* aAOname = EventHandlerAOName,
@@ -98,24 +98,24 @@ class EventHandlerThreadSafeCallbackAO : public ThreadSafeCallbackAO
         virtual void Run();
         virtual OsclAny* DeQueue(OsclReturnCode &stat);
 
-        virtual ~EventHandlerThreadSafeCallbackAO();
+        virtual ~OmxEventHandlerThreadSafeCallbackAO();
         ThreadSafeMemPoolFixedChunkAllocator *iMemoryPool;
 
 };
 
 
 /**************** CLASS FOR EVENT HANDLER *************/
-class EmptyBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
+class OmxEmptyBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
 {
     public:
         // Constructor
-        EmptyBufferDoneThreadSafeCallbackAO(
+        OmxEmptyBufferDoneThreadSafeCallbackAO(
             void* aObserver = NULL,
             uint32 aDepth = DEFAULT_QUEUE_DEPTH,
             const char* aAOname = EmptyBufferDoneAOName,
             int32 aPriority = OsclActiveObject::EPriorityNominal);
 
-        virtual ~EmptyBufferDoneThreadSafeCallbackAO();
+        virtual ~OmxEmptyBufferDoneThreadSafeCallbackAO();
         // OVERLOADED ProcessEvent
         OsclReturnCode ProcessEvent(OsclAny* EventData);
         ThreadSafeMemPoolFixedChunkAllocator *iMemoryPool;
@@ -130,14 +130,14 @@ class EmptyBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
 
 
 /**************** CLASS FOR EVENT HANDLER *************/
-class FillBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
+class OmxFillBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
 {
     public:
         // Constructor
-        FillBufferDoneThreadSafeCallbackAO(void* aObserver = NULL,
-                                           uint32 aDepth = DEFAULT_QUEUE_DEPTH,
-                                           const char* aAOname = FillBufferDoneAOName,
-                                           int32 aPriority = OsclActiveObject::EPriorityNominal);
+        OmxFillBufferDoneThreadSafeCallbackAO(void* aObserver = NULL,
+                                              uint32 aDepth = DEFAULT_QUEUE_DEPTH,
+                                              const char* aAOname = FillBufferDoneAOName,
+                                              int32 aPriority = OsclActiveObject::EPriorityNominal);
 
         // OVERLOADED ProcessEvent
         OsclReturnCode ProcessEvent(OsclAny* EventData);
@@ -145,7 +145,7 @@ class FillBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
         virtual void Run();
         virtual OsclAny* DeQueue(OsclReturnCode &stat);
 
-        virtual ~FillBufferDoneThreadSafeCallbackAO();
+        virtual ~OmxFillBufferDoneThreadSafeCallbackAO();
         ThreadSafeMemPoolFixedChunkAllocator *iMemoryPool;
 };
 

diff --git a/codecs_v2/omx/omx_testapp/include/omxdectestbase.h b/codecs_v2/omx/omx_testapp/include/omxdectestbase.h
index e578138..6f38fb7 100644 (file)
--- a/codecs_v2/omx/omx_testapp/include/omxdectestbase.h
+++ b/codecs_v2/omx/omx_testapp/include/omxdectestbase.h
@@ -125,9 +125,9 @@ class CallbackParentInt
 {
     public:
 #if PROXY_INTERFACE
-        EventHandlerThreadSafeCallbackAO*    ipThreadSafeHandlerEventHandler;
-        EmptyBufferDoneThreadSafeCallbackAO* ipThreadSafeHandlerEmptyBufferDone;
-        FillBufferDoneThreadSafeCallbackAO*  ipThreadSafeHandlerFillBufferDone;
+        OmxEventHandlerThreadSafeCallbackAO*    ipThreadSafeHandlerEventHandler;
+        OmxEmptyBufferDoneThreadSafeCallbackAO* ipThreadSafeHandlerEmptyBufferDone;
+        OmxFillBufferDoneThreadSafeCallbackAO*  ipThreadSafeHandlerFillBufferDone;
 #else
         virtual OMX_ERRORTYPE EventHandler(OMX_OUT OMX_HANDLETYPE aComponent,
                                            OMX_OUT OMX_PTR aAppData,

diff --git a/codecs_v2/omx/omx_testapp/src/omx_threadsafe_callbacks.cpp b/codecs_v2/omx/omx_testapp/src/omx_threadsafe_callbacks.cpp
index 9f667a4..3ac0e5b 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omx_threadsafe_callbacks.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omx_threadsafe_callbacks.cpp
@@ -21,7 +21,7 @@
 #include "omxdectestbase.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-EventHandlerThreadSafeCallbackAO::EventHandlerThreadSafeCallbackAO(void* aObserver,
+OmxEventHandlerThreadSafeCallbackAO::OmxEventHandlerThreadSafeCallbackAO(void* aObserver,
         uint32 aDepth,
         const char* aAOname,
         int32 aPriority)
@@ -43,7 +43,7 @@ EventHandlerThreadSafeCallbackAO::EventHandlerThreadSafeCallbackAO(void* aObserv
 
 }
 
-EventHandlerThreadSafeCallbackAO::~EventHandlerThreadSafeCallbackAO()
+OmxEventHandlerThreadSafeCallbackAO::~OmxEventHandlerThreadSafeCallbackAO()
 {
     if (iMemoryPool)
     {
@@ -52,7 +52,7 @@ EventHandlerThreadSafeCallbackAO::~EventHandlerThreadSafeCallbackAO()
     }
 }
 
-OsclReturnCode EventHandlerThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
+OsclReturnCode OmxEventHandlerThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
 {
     // In this case, ProcessEvent calls the method of the primary test AO to process the Event
     if (iObserver != NULL)
@@ -67,9 +67,9 @@ OsclReturnCode EventHandlerThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData
 
 // We override the Run to process multiple (i.e. all in the queue) events in one Run
 
-void EventHandlerThreadSafeCallbackAO::Run()
+void OmxEventHandlerThreadSafeCallbackAO::Run()
 {
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() In"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEventHandlerThreadSafeCallbackAO::Run() In"));
 
     OsclAny *P; // parameter to dequeue
     OsclReturnCode status = OsclSuccess;
@@ -85,12 +85,12 @@ void EventHandlerThreadSafeCallbackAO::Run()
 
         if ((status == OsclSuccess) || (status == OsclPending))
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() - Calling Process Event"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEventHandlerThreadSafeCallbackAO::Run() - Calling Process Event"));
             ProcessEvent(P);
         }
         else
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() - could not dequeue event data"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEventHandlerThreadSafeCallbackAO::Run() - could not dequeue event data"));
         }
 
 
@@ -106,12 +106,12 @@ void EventHandlerThreadSafeCallbackAO::Run()
 
 
 
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() Out"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEventHandlerThreadSafeCallbackAO::Run() Out"));
 }
 
 // same as base-class DeQueue method, except no RunIfNotReady/PendForExec is called (since all events are processed in a loop)
 // (i.e. PendForExec control is done in the loop in Run)
-OsclAny* EventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
+OsclAny* OmxEventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 {
     OsclAny *pData;
     OsclProcStatus::eOsclProcError sema_status;
@@ -125,7 +125,7 @@ OsclAny* EventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     {
         // nothing to de-queue
         stat = OsclFailure;
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEventHandlerThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
         Mutex.Unlock();
 
         return NULL;
@@ -143,7 +143,7 @@ OsclAny* EventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     // check if there is need to call waitforevent
     if ((Q->NumElem) == 0)
     {
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEventHandlerThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
         PendForExec();
         stat = OsclPending; // let the Run know that the last event was pulled out of the queue
         // so that it can get out of the loop
@@ -167,7 +167,7 @@ OsclAny* EventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-EmptyBufferDoneThreadSafeCallbackAO::EmptyBufferDoneThreadSafeCallbackAO(void* aObserver,
+OmxEmptyBufferDoneThreadSafeCallbackAO::OmxEmptyBufferDoneThreadSafeCallbackAO(void* aObserver,
         uint32 aDepth,
         const char* aAOname,
         int32 aPriority)
@@ -189,7 +189,7 @@ EmptyBufferDoneThreadSafeCallbackAO::EmptyBufferDoneThreadSafeCallbackAO(void* a
     iMemoryPool->deallocate(dummy);
 }
 
-EmptyBufferDoneThreadSafeCallbackAO::~EmptyBufferDoneThreadSafeCallbackAO()
+OmxEmptyBufferDoneThreadSafeCallbackAO::~OmxEmptyBufferDoneThreadSafeCallbackAO()
 {
     if (iMemoryPool)
     {
@@ -199,7 +199,7 @@ EmptyBufferDoneThreadSafeCallbackAO::~EmptyBufferDoneThreadSafeCallbackAO()
 
 }
 
-OsclReturnCode EmptyBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
+OsclReturnCode OmxEmptyBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
 {
     // In this case, ProcessEvent calls the method of the primary test AO to process the Event
     if (iObserver != NULL)
@@ -214,9 +214,9 @@ OsclReturnCode EmptyBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventD
 
 // We override the RunL to process multiple (i.e. all in the queue) events in one RunL
 
-void EmptyBufferDoneThreadSafeCallbackAO::Run()
+void OmxEmptyBufferDoneThreadSafeCallbackAO::Run()
 {
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() In"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEmptyBufferDoneThreadSafeCallbackAO::Run() In"));
 
     OsclAny *P; // parameter to dequeue
     OsclReturnCode status = OsclSuccess;
@@ -230,12 +230,12 @@ void EmptyBufferDoneThreadSafeCallbackAO::Run()
 
         if ((status == OsclSuccess) || (status == OsclPending))
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() - Calling Process Event"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEmptyBufferDoneThreadSafeCallbackAO::Run() - Calling Process Event"));
             ProcessEvent(P);
         }
         else
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() - could not dequeue event data"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEmptyBufferDoneThreadSafeCallbackAO::Run() - could not dequeue event data"));
         }
 
 
@@ -251,12 +251,12 @@ void EmptyBufferDoneThreadSafeCallbackAO::Run()
 
 
 
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() Out"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEmptyBufferDoneThreadSafeCallbackAO::Run() Out"));
 }
 
 // same as base-class DeQueue method, except no RunIfNotReady/PendForExec is called (since all events are processed in a loop)
 // (i.e. PendForExec control is done in the loop in Run)
-OsclAny* EmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
+OsclAny* OmxEmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 {
     OsclAny *pData;
     OsclProcStatus::eOsclProcError sema_status;
@@ -270,7 +270,7 @@ OsclAny* EmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     {
         // nothing to de-queue
         stat = OsclFailure;
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEmptyBufferDoneThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
         Mutex.Unlock();
 
         return NULL;
@@ -288,7 +288,7 @@ OsclAny* EmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     // check if there is need to call waitforevent
     if ((Q->NumElem) == 0)
     {
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() - No more events, call WaitForEvent()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEventHandlerThreadSafeCallbackAO::Run() - No more events, call WaitForEvent()"));
         PendForExec();
         stat = OsclPending; // let the Run know that the last event was pulled out of the queue
         // so that it can get out of the loop
@@ -312,7 +312,7 @@ OsclAny* EmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-FillBufferDoneThreadSafeCallbackAO::FillBufferDoneThreadSafeCallbackAO(void* aObserver,
+OmxFillBufferDoneThreadSafeCallbackAO::OmxFillBufferDoneThreadSafeCallbackAO(void* aObserver,
         uint32 aDepth,
         const char* aAOname,
         int32 aPriority)
@@ -332,7 +332,7 @@ FillBufferDoneThreadSafeCallbackAO::FillBufferDoneThreadSafeCallbackAO(void* aOb
     iMemoryPool->deallocate(dummy);
 }
 
-FillBufferDoneThreadSafeCallbackAO::~FillBufferDoneThreadSafeCallbackAO()
+OmxFillBufferDoneThreadSafeCallbackAO::~OmxFillBufferDoneThreadSafeCallbackAO()
 {
     if (iMemoryPool)
     {
@@ -342,7 +342,7 @@ FillBufferDoneThreadSafeCallbackAO::~FillBufferDoneThreadSafeCallbackAO()
 }
 
 
-OsclReturnCode FillBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
+OsclReturnCode OmxFillBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
 {
     // In this case, ProcessEvent calls the method of the primary test AO to process the Event
     if (iObserver != NULL)
@@ -357,9 +357,9 @@ OsclReturnCode FillBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventDa
 
 // We override the Run to process multiple (i.e. all in the queue) events in one Run
 
-void FillBufferDoneThreadSafeCallbackAO::Run()
+void OmxFillBufferDoneThreadSafeCallbackAO::Run()
 {
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() In"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxFillBufferDoneThreadSafeCallbackAO::Run() In"));
 
     OsclAny *P; // parameter to dequeue
     OsclReturnCode status = OsclSuccess;
@@ -373,12 +373,12 @@ void FillBufferDoneThreadSafeCallbackAO::Run()
 
         if ((status == OsclSuccess) || (status == OsclPending))
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() - Calling Process Event"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxFillBufferDoneThreadSafeCallbackAO::Run() - Calling Process Event"));
             ProcessEvent(P);
         }
         else
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() - could not dequeue event data"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxFillBufferDoneThreadSafeCallbackAO::Run() - could not dequeue event data"));
         }
 
 
@@ -396,12 +396,12 @@ void FillBufferDoneThreadSafeCallbackAO::Run()
 
 
 
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() Out"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxFillBufferDoneThreadSafeCallbackAO::Run() Out"));
 }
 
 // same as base-class DeQueue method, except no RunIfNotReady/PendForExec is called (since all events are processed in a loop)
 // (i.e. PendForExec control is done in the loop in Run)
-OsclAny* FillBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
+OsclAny* OmxFillBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 {
     OsclAny *pData;
     OsclProcStatus::eOsclProcError sema_status;
@@ -415,7 +415,7 @@ OsclAny* FillBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     {
         // nothing to de-queue
         stat = OsclFailure;
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxFillBufferDoneThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
         Mutex.Unlock();
 
         return NULL;
@@ -432,7 +432,7 @@ OsclAny* FillBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     // check if there is need to call waitforevent
     if ((Q->NumElem) == 0)
     {
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxFillBufferDoneThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
         PendForExec();
         stat = OsclPending; // let the Run know that the last event was pulled out of the queue
         // so that it can get out of the loop

diff --git a/codecs_v2/omx/omx_testapp/src/omxdectest.cpp b/codecs_v2/omx/omx_testapp/src/omxdectest.cpp
index 8bb16ef..46bdc8d 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxdectest.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxdectest.cpp
@@ -3368,9 +3368,9 @@ void OmxComponentDecTest::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_buffer_busy.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_buffer_busy.cpp
index 6377055..d50a1f8 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_buffer_busy.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_buffer_busy.cpp
@@ -91,9 +91,9 @@ void OmxDecTestBufferBusy::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_corrupt_nal.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_corrupt_nal.cpp
index b22ab6f..4f7b743 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_corrupt_nal.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_corrupt_nal.cpp
@@ -295,9 +295,9 @@ void OmxDecTestCorruptNALTest::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_dynamic_reconfig.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_dynamic_reconfig.cpp
index 2c1961b..c339b84 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_dynamic_reconfig.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_dynamic_reconfig.cpp
@@ -148,9 +148,9 @@ void OmxDecTestPortReconfig::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_eos_missing.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_eos_missing.cpp
index b22705f..fb529f0 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_eos_missing.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_eos_missing.cpp
@@ -91,9 +91,9 @@ void OmxDecTestEosMissing::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_extra_partialframes.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_extra_partialframes.cpp
index 0e69e72..f3f9675 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_extra_partialframes.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_extra_partialframes.cpp
@@ -98,9 +98,9 @@ void OmxDecTestExtraPartialFrames::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_flush_eos.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_flush_eos.cpp
index 4caff3c..fd45bc2 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_flush_eos.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_flush_eos.cpp
@@ -93,9 +93,9 @@ void OmxDecTestEosAfterFlushPort::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_flush_port.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_flush_port.cpp
index e05b5a5..2586d3c 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_flush_port.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_flush_port.cpp
@@ -93,9 +93,9 @@ void OmxDecTestFlushPort::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_get_role.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_get_role.cpp
index 6d9523d..f79df80 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_get_role.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_get_role.cpp
@@ -59,9 +59,9 @@ void OmxDecTestCompRole::Run()
             PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxDecTestCompRole::Run() - StateUnLoaded IN"));
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, EMPTY_BUFFER_DONE_QUEUE_DEPTH, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, FILL_BUFFER_DONE_QUEUE_DEPTH, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, EMPTY_BUFFER_DONE_QUEUE_DEPTH, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, FILL_BUFFER_DONE_QUEUE_DEPTH, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_incomplete_nal.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_incomplete_nal.cpp
index 8ed668d..705cda7 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_incomplete_nal.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_incomplete_nal.cpp
@@ -343,9 +343,9 @@ void OmxDecTestIncompleteNALTest::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_missing_nal.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_missing_nal.cpp
index 4a83652..2c033d5 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_missing_nal.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_missing_nal.cpp
@@ -311,9 +311,9 @@ void OmxDecTestMissingNALTest::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_param_negotiation.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_param_negotiation.cpp
index a2fba5d..2b8b617 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_param_negotiation.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_param_negotiation.cpp
@@ -1064,9 +1064,9 @@ void OmxDecTestBufferNegotiation::Run()
                 break;
             }
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_partialframes.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_partialframes.cpp
index 36dec27..0fb7393 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_partialframes.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_partialframes.cpp
@@ -98,9 +98,9 @@ void OmxDecTestPartialFrames::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_pause_resume.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_pause_resume.cpp
index c25248d..97db45a 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_pause_resume.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_pause_resume.cpp
@@ -93,9 +93,9 @@ void OmxDecTestPauseResume::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_1.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_1.cpp
index 5215775..7e0a25f 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_1.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_1.cpp
@@ -288,9 +288,9 @@ void OmxDecTestPortReconfigTransitionTest::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_2.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_2.cpp
index af378a2..219010e 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_2.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_2.cpp
@@ -277,9 +277,9 @@ void OmxDecTestPortReconfigTransitionTest_2::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_3.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_3.cpp
index c5e4e2f..c08a2d5 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_3.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_portreconfig_transit_3.cpp
@@ -295,9 +295,9 @@ void OmxDecTestPortReconfigTransitionTest_3::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_reposition.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_reposition.cpp
index 8aacc43..e211a20 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_reposition.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_reposition.cpp
@@ -397,9 +397,9 @@ void OmxDecTestReposition::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_usebuffer.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_usebuffer.cpp
index 8acdb83..bd91449 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_usebuffer.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_usebuffer.cpp
@@ -91,9 +91,9 @@ void OmxDecTestUseBuffer::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp/src/omxtest_without_marker.cpp b/codecs_v2/omx/omx_testapp/src/omxtest_without_marker.cpp
index 73cc6b3..2a09c6c 100644 (file)
--- a/codecs_v2/omx/omx_testapp/src/omxtest_without_marker.cpp
+++ b/codecs_v2/omx/omx_testapp/src/omxtest_without_marker.cpp
@@ -88,9 +88,9 @@ void OmxDecTestWithoutMarker::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/include/omx_threadsafe_callbacks.h b/codecs_v2/omx/omx_testapp_enc/include/omx_threadsafe_callbacks.h
index 62e3ffe..5f9d955 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/include/omx_threadsafe_callbacks.h
+++ b/codecs_v2/omx/omx_testapp_enc/include/omx_threadsafe_callbacks.h
@@ -80,11 +80,11 @@ const char FillBufferDoneAOName[] = "EventHandlerCallbackAO";
 
 
 /**************** CLASS FOR EVENT HANDLER *************/
-class EventHandlerThreadSafeCallbackAO : public ThreadSafeCallbackAO
+class OmxEncEventHandlerThreadSafeCallbackAO : public ThreadSafeCallbackAO
 {
     public:
         // Constructor
-        EventHandlerThreadSafeCallbackAO(
+        OmxEncEventHandlerThreadSafeCallbackAO(
             void* aObserver = NULL,
             uint32 aDepth = DEFAULT_QUEUE_DEPTH,
             const char* aAOname = EventHandlerAOName,
@@ -98,24 +98,24 @@ class EventHandlerThreadSafeCallbackAO : public ThreadSafeCallbackAO
         virtual void Run();
         virtual OsclAny* DeQueue(OsclReturnCode &stat);
 
-        virtual ~EventHandlerThreadSafeCallbackAO();
+        virtual ~OmxEncEventHandlerThreadSafeCallbackAO();
         ThreadSafeMemPoolFixedChunkAllocator *iMemoryPool;
 
 };
 
 
 /**************** CLASS FOR EVENT HANDLER *************/
-class EmptyBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
+class OmxEncEmptyBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
 {
     public:
         // Constructor
-        EmptyBufferDoneThreadSafeCallbackAO(
+        OmxEncEmptyBufferDoneThreadSafeCallbackAO(
             void* aObserver = NULL,
             uint32 aDepth = DEFAULT_QUEUE_DEPTH,
             const char* aAOname = EmptyBufferDoneAOName,
             int32 aPriority = OsclActiveObject::EPriorityNominal);
 
-        virtual ~EmptyBufferDoneThreadSafeCallbackAO();
+        virtual ~OmxEncEmptyBufferDoneThreadSafeCallbackAO();
         // OVERLOADED ProcessEvent
         OsclReturnCode ProcessEvent(OsclAny* EventData);
         ThreadSafeMemPoolFixedChunkAllocator *iMemoryPool;
@@ -130,14 +130,14 @@ class EmptyBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
 
 
 /**************** CLASS FOR EVENT HANDLER *************/
-class FillBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
+class OmxEncFillBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
 {
     public:
         // Constructor
-        FillBufferDoneThreadSafeCallbackAO(void* aObserver = NULL,
-                                           uint32 aDepth = DEFAULT_QUEUE_DEPTH,
-                                           const char* aAOname = FillBufferDoneAOName,
-                                           int32 aPriority = OsclActiveObject::EPriorityNominal);
+        OmxEncFillBufferDoneThreadSafeCallbackAO(void* aObserver = NULL,
+                uint32 aDepth = DEFAULT_QUEUE_DEPTH,
+                const char* aAOname = FillBufferDoneAOName,
+                int32 aPriority = OsclActiveObject::EPriorityNominal);
 
         // OVERLOADED ProcessEvent
         OsclReturnCode ProcessEvent(OsclAny* EventData);
@@ -145,7 +145,7 @@ class FillBufferDoneThreadSafeCallbackAO : public ThreadSafeCallbackAO
         virtual void Run();
         virtual OsclAny* DeQueue(OsclReturnCode &stat);
 
-        virtual ~FillBufferDoneThreadSafeCallbackAO();
+        virtual ~OmxEncFillBufferDoneThreadSafeCallbackAO();
         ThreadSafeMemPoolFixedChunkAllocator *iMemoryPool;
 };
 

diff --git a/codecs_v2/omx/omx_testapp_enc/include/omxenctestbase.h b/codecs_v2/omx/omx_testapp_enc/include/omxenctestbase.h
index b711e1f..049aa21 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/include/omxenctestbase.h
+++ b/codecs_v2/omx/omx_testapp_enc/include/omxenctestbase.h
@@ -99,9 +99,9 @@ class CallbackParentInt
 {
     public:
 #if PROXY_INTERFACE
-        EventHandlerThreadSafeCallbackAO*    ipThreadSafeHandlerEventHandler;
-        EmptyBufferDoneThreadSafeCallbackAO* ipThreadSafeHandlerEmptyBufferDone;
-        FillBufferDoneThreadSafeCallbackAO*  ipThreadSafeHandlerFillBufferDone;
+        OmxEncEventHandlerThreadSafeCallbackAO*    ipThreadSafeHandlerEventHandler;
+        OmxEncEmptyBufferDoneThreadSafeCallbackAO* ipThreadSafeHandlerEmptyBufferDone;
+        OmxEncFillBufferDoneThreadSafeCallbackAO*  ipThreadSafeHandlerFillBufferDone;
 #else
         virtual OMX_ERRORTYPE EventHandler(OMX_OUT OMX_HANDLETYPE aComponent,
                                            OMX_OUT OMX_PTR aAppData,

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omx_threadsafe_callbacks.cpp b/codecs_v2/omx/omx_testapp_enc/src/omx_threadsafe_callbacks.cpp
index c021045..0f02d8c 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omx_threadsafe_callbacks.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omx_threadsafe_callbacks.cpp
@@ -19,7 +19,7 @@
 #include "omxenctestbase.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-EventHandlerThreadSafeCallbackAO::EventHandlerThreadSafeCallbackAO(void* aObserver,
+OmxEncEventHandlerThreadSafeCallbackAO::OmxEncEventHandlerThreadSafeCallbackAO(void* aObserver,
         uint32 aDepth,
         const char* aAOname,
         int32 aPriority)
@@ -41,7 +41,7 @@ EventHandlerThreadSafeCallbackAO::EventHandlerThreadSafeCallbackAO(void* aObserv
 
 }
 
-EventHandlerThreadSafeCallbackAO::~EventHandlerThreadSafeCallbackAO()
+OmxEncEventHandlerThreadSafeCallbackAO::~OmxEncEventHandlerThreadSafeCallbackAO()
 {
     if (iMemoryPool)
     {
@@ -50,7 +50,7 @@ EventHandlerThreadSafeCallbackAO::~EventHandlerThreadSafeCallbackAO()
     }
 }
 
-OsclReturnCode EventHandlerThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
+OsclReturnCode OmxEncEventHandlerThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
 {
     // In this case, ProcessEvent calls the method of the primary test AO to process the Event
     if (iObserver != NULL)
@@ -65,9 +65,9 @@ OsclReturnCode EventHandlerThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData
 
 // We override the Run to process multiple (i.e. all in the queue) events in one Run
 
-void EventHandlerThreadSafeCallbackAO::Run()
+void OmxEncEventHandlerThreadSafeCallbackAO::Run()
 {
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() In"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEventHandlerThreadSafeCallbackAO::Run() In"));
 
     OsclAny *P; // parameter to dequeue
     OsclReturnCode status = OsclSuccess;
@@ -83,12 +83,12 @@ void EventHandlerThreadSafeCallbackAO::Run()
 
         if ((status == OsclSuccess) || (status == OsclPending))
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() - Calling Process Event"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEventHandlerThreadSafeCallbackAO::Run() - Calling Process Event"));
             ProcessEvent(P);
         }
         else
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() - could not dequeue event data"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEventHandlerThreadSafeCallbackAO::Run() - could not dequeue event data"));
         }
 
 
@@ -104,12 +104,12 @@ void EventHandlerThreadSafeCallbackAO::Run()
 
 
 
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() Out"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEventHandlerThreadSafeCallbackAO::Run() Out"));
 }
 
 // same as base-class DeQueue method, except no RunIfNotReady/PendForExec is called (since all events are processed in a loop)
 // (i.e. PendForExec control is done in the loop in Run)
-OsclAny* EventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
+OsclAny* OmxEncEventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 {
     OsclAny *pData;
     OsclProcStatus::eOsclProcError sema_status;
@@ -123,7 +123,7 @@ OsclAny* EventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     {
         // nothing to de-queue
         stat = OsclFailure;
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEventHandlerThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
         Mutex.Unlock();
 
         return NULL;
@@ -141,7 +141,7 @@ OsclAny* EventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     // check if there is need to call waitforevent
     if ((Q->NumElem) == 0)
     {
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EventHandlerThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEventHandlerThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
         PendForExec();
         stat = OsclPending; // let the Run know that the last event was pulled out of the queue
         // so that it can get out of the loop
@@ -166,7 +166,7 @@ OsclAny* EventHandlerThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////
-EmptyBufferDoneThreadSafeCallbackAO::EmptyBufferDoneThreadSafeCallbackAO(void* aObserver,
+OmxEncEmptyBufferDoneThreadSafeCallbackAO::OmxEncEmptyBufferDoneThreadSafeCallbackAO(void* aObserver,
         uint32 aDepth,
         const char* aAOname,
         int32 aPriority)
@@ -187,7 +187,7 @@ EmptyBufferDoneThreadSafeCallbackAO::EmptyBufferDoneThreadSafeCallbackAO(void* a
     iMemoryPool->deallocate(dummy);
 }
 
-EmptyBufferDoneThreadSafeCallbackAO::~EmptyBufferDoneThreadSafeCallbackAO()
+OmxEncEmptyBufferDoneThreadSafeCallbackAO::~OmxEncEmptyBufferDoneThreadSafeCallbackAO()
 {
     if (iMemoryPool)
     {
@@ -197,7 +197,7 @@ EmptyBufferDoneThreadSafeCallbackAO::~EmptyBufferDoneThreadSafeCallbackAO()
 
 }
 
-OsclReturnCode EmptyBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
+OsclReturnCode OmxEncEmptyBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
 {
     // In this case, ProcessEvent calls the method of the primary test AO to process the Event
     if (iObserver != NULL)
@@ -212,9 +212,9 @@ OsclReturnCode EmptyBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventD
 
 // We override the RunL to process multiple (i.e. all in the queue) events in one RunL
 
-void EmptyBufferDoneThreadSafeCallbackAO::Run()
+void OmxEncEmptyBufferDoneThreadSafeCallbackAO::Run()
 {
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() In"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEmptyBufferDoneThreadSafeCallbackAO::Run() In"));
 
     OsclAny *P; // parameter to dequeue
     OsclReturnCode status = OsclSuccess;
@@ -228,12 +228,12 @@ void EmptyBufferDoneThreadSafeCallbackAO::Run()
 
         if ((status == OsclSuccess) || (status == OsclPending))
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() - Calling Process Event"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEmptyBufferDoneThreadSafeCallbackAO::Run() - Calling Process Event"));
             ProcessEvent(P);
         }
         else
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() - could not dequeue event data"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEmptyBufferDoneThreadSafeCallbackAO::Run() - could not dequeue event data"));
         }
 
 
@@ -249,12 +249,12 @@ void EmptyBufferDoneThreadSafeCallbackAO::Run()
 
 
 
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() Out"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEmptyBufferDoneThreadSafeCallbackAO::Run() Out"));
 }
 
 // same as base-class DeQueue method, except no RunIfNotReady/PendForExec is called (since all events are processed in a loop)
 // (i.e. PendForExec control is done in the loop in Run)
-OsclAny* EmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
+OsclAny* OmxEncEmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 {
     OsclAny *pData;
     OsclProcStatus::eOsclProcError sema_status;
@@ -268,7 +268,7 @@ OsclAny* EmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     {
         // nothing to de-queue
         stat = OsclFailure;
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEmptyBufferDoneThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
         Mutex.Unlock();
 
         return NULL;
@@ -286,7 +286,7 @@ OsclAny* EmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     // check if there is need to call waitforevent
     if ((Q->NumElem) == 0)
     {
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "EmptyBufferDoneThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncEmptyBufferDoneThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
         PendForExec();
         stat = OsclPending; // let the Run know that the last event was pulled out of the queue
         // so that it can get out of the loop
@@ -308,7 +308,7 @@ OsclAny* EmptyBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-FillBufferDoneThreadSafeCallbackAO::FillBufferDoneThreadSafeCallbackAO(void* aObserver,
+OmxEncFillBufferDoneThreadSafeCallbackAO::OmxEncFillBufferDoneThreadSafeCallbackAO(void* aObserver,
         uint32 aDepth,
         const char* aAOname,
         int32 aPriority)
@@ -328,7 +328,7 @@ FillBufferDoneThreadSafeCallbackAO::FillBufferDoneThreadSafeCallbackAO(void* aOb
     iMemoryPool->deallocate(dummy);
 }
 
-FillBufferDoneThreadSafeCallbackAO::~FillBufferDoneThreadSafeCallbackAO()
+OmxEncFillBufferDoneThreadSafeCallbackAO::~OmxEncFillBufferDoneThreadSafeCallbackAO()
 {
     if (iMemoryPool)
     {
@@ -338,7 +338,7 @@ FillBufferDoneThreadSafeCallbackAO::~FillBufferDoneThreadSafeCallbackAO()
 }
 
 
-OsclReturnCode FillBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
+OsclReturnCode OmxEncFillBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventData)
 {
     // In this case, ProcessEvent calls the method of the primary test AO to process the Event
     if (iObserver != NULL)
@@ -353,9 +353,9 @@ OsclReturnCode FillBufferDoneThreadSafeCallbackAO::ProcessEvent(OsclAny* EventDa
 
 // We override the Run to process multiple (i.e. all in the queue) events in one Run
 
-void FillBufferDoneThreadSafeCallbackAO::Run()
+void OmxEncFillBufferDoneThreadSafeCallbackAO::Run()
 {
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() In"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncFillBufferDoneThreadSafeCallbackAO::Run() In"));
 
     OsclAny *P; // parameter to dequeue
     OsclReturnCode status = OsclSuccess;
@@ -369,12 +369,12 @@ void FillBufferDoneThreadSafeCallbackAO::Run()
 
         if ((status == OsclSuccess) || (status == OsclPending))
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() - Calling Process Event"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncFillBufferDoneThreadSafeCallbackAO::Run() - Calling Process Event"));
             ProcessEvent(P);
         }
         else
         {
-            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() - could not dequeue event data"));
+            PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncFillBufferDoneThreadSafeCallbackAO::Run() - could not dequeue event data"));
         }
 
 
@@ -392,12 +392,12 @@ void FillBufferDoneThreadSafeCallbackAO::Run()
 
 
 
-    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() Out"));
+    PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncFillBufferDoneThreadSafeCallbackAO::Run() Out"));
 }
 
 // same as base-class DeQueue method, except no RunIfNotReady/PendForExec is called (since all events are processed in a loop)
 // (i.e. PendForExec control is done in the loop in Run)
-OsclAny* FillBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
+OsclAny* OmxEncFillBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
 {
     OsclAny *pData;
     OsclProcStatus::eOsclProcError sema_status;
@@ -411,7 +411,7 @@ OsclAny* FillBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     {
         // nothing to de-queue
         stat = OsclFailure;
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncFillBufferDoneThreadSafeCallbackAO::DeQueue() - No events in the queue - return ()"));
         Mutex.Unlock();
 
         return NULL;
@@ -428,7 +428,7 @@ OsclAny* FillBufferDoneThreadSafeCallbackAO::DeQueue(OsclReturnCode &stat)
     // check if there is need to call waitforevent
     if ((Q->NumElem) == 0)
     {
-        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "FillBufferDoneThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
+        PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncFillBufferDoneThreadSafeCallbackAO::Run() - No more events, call PendForExec()"));
         PendForExec();
         stat = OsclPending; // let the Run know that the last event was pulled out of the queue
         // so that it can get out of the loop

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxenctest.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxenctest.cpp
index e27821d..de5ef67 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxenctest.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxenctest.cpp
@@ -732,9 +732,9 @@ void OmxComponentEncTest::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_buffer_busy_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_buffer_busy_enc.cpp
index fe6dc22..df823aa 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_buffer_busy_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_buffer_busy_enc.cpp
@@ -275,9 +275,9 @@ void OmxEncTestBufferBusy::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_eosmissing_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_eosmissing_enc.cpp
index ee07a8c..08e6d1c 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_eosmissing_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_eosmissing_enc.cpp
@@ -280,9 +280,9 @@ void OmxEncTestEosMissing::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_extra_partialframes_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_extra_partialframes_enc.cpp
index 6478cd7..e181355 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_extra_partialframes_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_extra_partialframes_enc.cpp
@@ -283,9 +283,9 @@ void OmxEncTestExtraPartialFrames::Run()
 
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_get_role_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_get_role_enc.cpp
index 723389a..e0885ef 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_get_role_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_get_role_enc.cpp
@@ -57,9 +57,9 @@ void OmxEncTestCompRole::Run()
             PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_TRACE, (0, "OmxEncTestCompRole::Run() - StateUnLoaded IN"));
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, EMPTY_BUFFER_DONE_QUEUE_DEPTH, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, FILL_BUFFER_DONE_QUEUE_DEPTH, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, EMPTY_BUFFER_DONE_QUEUE_DEPTH, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, FILL_BUFFER_DONE_QUEUE_DEPTH, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_param_negotiation_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_param_negotiation_enc.cpp
index c4a3e2f..f145097 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_param_negotiation_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_param_negotiation_enc.cpp
@@ -997,9 +997,9 @@ void OmxEncTestBufferNegotiation::Run()
                 break;
             }
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_partialframe_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_partialframe_enc.cpp
index 8cb2e5d..d1bdc46 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_partialframe_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_partialframe_enc.cpp
@@ -282,9 +282,9 @@ void OmxEncTestPartialFrames::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_pause_resume_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_pause_resume_enc.cpp
index 696f13b..409d6b1 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_pause_resume_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_pause_resume_enc.cpp
@@ -275,9 +275,9 @@ void OmxEncTestPauseResume::Run()
                 break;
             }
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_usebuffer_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_usebuffer_enc.cpp
index f863643..7efece5 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_usebuffer_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_usebuffer_enc.cpp
@@ -279,9 +279,9 @@ void OmxEncTestUseBuffer::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/codecs_v2/omx/omx_testapp_enc/src/omxtest_without_marker_enc.cpp b/codecs_v2/omx/omx_testapp_enc/src/omxtest_without_marker_enc.cpp
index 563b024..3060ffe 100644 (file)
--- a/codecs_v2/omx/omx_testapp_enc/src/omxtest_without_marker_enc.cpp
+++ b/codecs_v2/omx/omx_testapp_enc/src/omxtest_without_marker_enc.cpp
@@ -275,9 +275,9 @@ void OmxEncTestWithoutMarker::Run()
             }
 
 #if PROXY_INTERFACE
-            ipThreadSafeHandlerEventHandler = OSCL_NEW(EventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
-            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(EmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
-            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(FillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
+            ipThreadSafeHandlerEventHandler = OSCL_NEW(OmxEncEventHandlerThreadSafeCallbackAO, (this, EVENT_HANDLER_QUEUE_DEPTH, "EventHandlerAO"));
+            ipThreadSafeHandlerEmptyBufferDone = OSCL_NEW(OmxEncEmptyBufferDoneThreadSafeCallbackAO, (this, iInBufferCount, "EmptyBufferDoneAO"));
+            ipThreadSafeHandlerFillBufferDone = OSCL_NEW(OmxEncFillBufferDoneThreadSafeCallbackAO, (this, iOutBufferCount, "FillBufferDoneAO"));
 
             if ((NULL == ipThreadSafeHandlerEventHandler) ||
                     (NULL == ipThreadSafeHandlerEmptyBufferDone) ||

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index e0a0f12..65ff01c 100644 (file)
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1015019"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1015056"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20091012
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index 464e0f4..67a8568 100644 (file)
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1015019"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1015056"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20091012
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index 65ff583..cab6aa6 100644 (file)
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1015019"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1015056"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20091012
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED