summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libtiutils/MessageQueue.h9
-rw-r--r--test/VTC/IOMXDecoder.cpp14
-rw-r--r--test/VTC/IOMXDecoder.h10
-rw-r--r--test/VTC/IOMXEncoder.cpp8
-rw-r--r--test/VTC/IOMXEncoder.h6
5 files changed, 19 insertions, 28 deletions
diff --git a/libtiutils/MessageQueue.h b/libtiutils/MessageQueue.h
index a0a3468..68943b7 100644
--- a/libtiutils/MessageQueue.h
+++ b/libtiutils/MessageQueue.h
@@ -95,13 +95,4 @@ private:
-// FIXME: Temporary workaround to avoid namespace fixes in VTC test code right now.
-namespace TIUTILS {
- typedef Ti::Utils::Message Message;
- typedef Ti::Utils::MessageQueue MessageQueue;
-}
-
-
-
-
#endif
diff --git a/test/VTC/IOMXDecoder.cpp b/test/VTC/IOMXDecoder.cpp
index d8f34ab..6edbc01 100644
--- a/test/VTC/IOMXDecoder.cpp
+++ b/test/VTC/IOMXDecoder.cpp
@@ -75,11 +75,11 @@ static void PrintVTCLatency(nsecs_t ts) {
bool OMXDecoder::SourceHandler::Handler() {
MY_LOGV("\n SourceHandler::Handler \n");
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
volatile int forever = 1;
while(forever) {
- TIUTILS::MessageQueue::waitForMsg(&mCommandMsgQ, NULL, NULL, -1);
+ Ti::Utils::MessageQueue::waitForMsg(&mCommandMsgQ, NULL, NULL, -1);
{
Mutex::Autolock lock(mLock);
mCommandMsgQ.get(&msg);
@@ -104,11 +104,11 @@ bool OMXDecoder::SourceHandler::Handler() {
bool OMXDecoder::OMXCallbackHandler::Handler() {
MY_LOGV("\n OMXCallbackHandler::Handler \n");
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
volatile int forever = 1;
while(forever) {
- TIUTILS::MessageQueue::waitForMsg(&mCommandMsgQ, NULL, NULL, -1);
+ Ti::Utils::MessageQueue::waitForMsg(&mCommandMsgQ, NULL, NULL, -1);
{
Mutex::Autolock lock(mLock);
mCommandMsgQ.get(&msg);
@@ -528,7 +528,7 @@ status_t OMXDecoder::stop() {
//Exit and free ref to callback handling thread
if ( NULL != mOMXCallbackHandler.get() ) {
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
msg.command = OMXCallbackHandler::COMMAND_EXIT;
//Clear all messages pending first
mOMXCallbackHandler->clearCommandQ();
@@ -539,7 +539,7 @@ status_t OMXDecoder::stop() {
//Exit and free ref to source handling thread
if ( NULL != mSourceHandler.get() ) {
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
msg.command = SourceHandler::COMMAND_EXIT;
//Clear all messages pending first
mSourceHandler->clearCommandQ();
@@ -587,7 +587,7 @@ void OMXDecoder::AcceptEncodedBuffer(void *pBuffer, OMX_U32 nFilledLen, OMX_TICK
info->nTimeStamp = nTimeStamp;
memcpy((void*)info->mem->pointer(), pBuffer, nFilledLen);
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
msg.command = SourceHandler::COMMAND_PROCESS_MSG;
msg.arg1 = (void*)info;
mSourceHandler->put(&msg);
diff --git a/test/VTC/IOMXDecoder.h b/test/VTC/IOMXDecoder.h
index e73e336..79d7c75 100644
--- a/test/VTC/IOMXDecoder.h
+++ b/test/VTC/IOMXDecoder.h
@@ -118,7 +118,7 @@ private:
return ret;
}
- status_t put(TIUTILS::Message* msg) {
+ status_t put(Ti::Utils::Message* msg) {
Mutex::Autolock lock(mLock);
return mCommandMsgQ.put(msg);
}
@@ -135,7 +135,7 @@ private:
private:
bool Handler();
- TIUTILS::MessageQueue mCommandMsgQ;
+ Ti::Utils::MessageQueue mCommandMsgQ;
OMXDecoder* mOMXDecoder;
Mutex mLock;
};
@@ -153,7 +153,7 @@ private:
return ret;
}
- status_t put(TIUTILS::Message* msg) {
+ status_t put(Ti::Utils::Message* msg) {
Mutex::Autolock lock(mLock);
return mCommandMsgQ.put(msg);
}
@@ -170,7 +170,7 @@ private:
private:
bool Handler();
- TIUTILS::MessageQueue mCommandMsgQ;
+ Ti::Utils::MessageQueue mCommandMsgQ;
OMXDecoder* mOMXDecoder;
Mutex mLock;
};
@@ -224,7 +224,7 @@ struct OMXDecoderObserver : public BnOMXObserver {
// from IOMXObserver
virtual void onMessage(const omx_message &omx_msg) {
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
omx_message *ptemp_omx_msg;
// HACK HACK HACK LEAK LEAK LEAK FIXIT
ptemp_omx_msg = (omx_message *)malloc(sizeof(omx_message));
diff --git a/test/VTC/IOMXEncoder.cpp b/test/VTC/IOMXEncoder.cpp
index 88ce9af..9437393 100644
--- a/test/VTC/IOMXEncoder.cpp
+++ b/test/VTC/IOMXEncoder.cpp
@@ -88,11 +88,11 @@ static void PrintEffectiveBitrate(OMX_U32 filledLen) {
bool OMXEncoder::OMXCallbackHandler::Handler() {
MY_LOGV("\n OMXCallbackHandler::Handler \n");
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
volatile int forever = 1;
while(forever) {
- TIUTILS::MessageQueue::waitForMsg(&mCommandMsgQ, NULL, NULL, -1);
+ Ti::Utils::MessageQueue::waitForMsg(&mCommandMsgQ, NULL, NULL, -1);
{
Mutex::Autolock lock(mLock);
mCommandMsgQ.get(&msg);
@@ -565,7 +565,7 @@ status_t OMXEncoder::start(MetaData *params) {
return -1;
}
- // If we are going to reuse the node, then port enable is a MUST
+ // If we are going to reuse the node, then port enable is a MUST
// since we are disabling the port during stop
// now transition to exec
@@ -733,7 +733,7 @@ status_t OMXEncoder::deinit() {
//Exit and free ref to callback handling thread
if ( NULL != mOMXCallbackHandler.get() ) {
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
msg.command = OMXCallbackHandler::COMMAND_EXIT;
//Clear all messages pending first
mOMXCallbackHandler->clearCommandQ();
diff --git a/test/VTC/IOMXEncoder.h b/test/VTC/IOMXEncoder.h
index 367e56b..d908289 100644
--- a/test/VTC/IOMXEncoder.h
+++ b/test/VTC/IOMXEncoder.h
@@ -104,7 +104,7 @@ private:
return ret;
}
- status_t put(TIUTILS::Message* msg) {
+ status_t put(Ti::Utils::Message* msg) {
Mutex::Autolock lock(mLock);
return mCommandMsgQ.put(msg);
}
@@ -121,7 +121,7 @@ private:
private:
bool Handler();
- TIUTILS::MessageQueue mCommandMsgQ;
+ Ti::Utils::MessageQueue mCommandMsgQ;
OMXEncoder* mOMXEncoder;
Mutex mLock;
};
@@ -166,7 +166,7 @@ struct OMXEncoderObserver : public BnOMXObserver {
// from IOMXObserver
virtual void onMessage(const omx_message &omx_msg) {
- TIUTILS::Message msg;
+ Ti::Utils::Message msg;
omx_message *ptemp_omx_msg;
// TODO: Check on the memory scope of below allocation
ptemp_omx_msg = (omx_message *)malloc(sizeof(omx_message));
generated by cgit v1.1 at 2024-06-09 01:36:33 +0000