diff options
| -rw-r--r-- | camera/AppCallbackNotifier.cpp | 4 | ||||
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 16 | ||||
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 16 | ||||
| -rwxr-xr-x | libtiutils/MessageQueue.cpp | 18 | ||||
| -rwxr-xr-x | libtiutils/MessageQueue.h | 2 |
5 files changed, 50 insertions, 6 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp index 4513c48..b431f54 100644 --- a/camera/AppCallbackNotifier.cpp +++ b/camera/AppCallbackNotifier.cpp @@ -1168,9 +1168,7 @@ void AppCallbackNotifier::flushEventQueue() { Mutex::Autolock lock(mLock); - TIUTILS::Message msg; - while(!mEventQ.isEmpty()) - mEventQ.get(&msg); + mEventQ.clear(); } } diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index 2268e44..6b09e17 100755 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -261,11 +261,11 @@ status_t OMXCameraAdapter::initialize(CameraProperties::Properties* caps) for (unsigned int i = 0 ;i < mEventSignalQ.size(); i++ ) { TIUTILS::Message *msg = mEventSignalQ.itemAt(i); //remove from queue and free msg - mEventSignalQ.removeAt(i); if ( NULL != msg ) { free(msg); } } + mEventSignalQ.clear(); } OMX_INIT_STRUCT_PTR (&mRegionPriority, OMX_TI_CONFIG_3A_REGION_PRIORITY); @@ -2646,7 +2646,6 @@ OMX_ERRORTYPE OMXCameraAdapter::OMXCameraAdapterEventHandler(OMX_IN OMX_HANDLETY if ( NULL != msg ) { Semaphore *sem = (Semaphore*) msg->arg3; - mEventSignalQ.removeAt(i); if ( sem ) { sem->Signal(); @@ -2654,6 +2653,7 @@ OMX_ERRORTYPE OMXCameraAdapter::OMXCameraAdapterEventHandler(OMX_IN OMX_HANDLETY free(msg); } } + mEventSignalQ.clear(); } ///Report Error to App mErrorNotifier->errorNotify(CAMERA_ERROR_FATAL); @@ -3305,7 +3305,10 @@ bool OMXCameraAdapter::CommandHandler::Handler() stat = NO_ERROR; CAMHAL_LOGDA("Handler: waiting for messsage..."); TIUTILS::MessageQueue::waitForMsg(&mCommandMsgQ, NULL, NULL, -1); + { + Mutex::Autolock lock(mLock); mCommandMsgQ.get(&msg); + } CAMHAL_LOGDB("msg.command = %d", msg.command); switch ( msg.command ) { case CommandHandler::CAMERA_START_IMAGE_CAPTURE: @@ -3348,7 +3351,11 @@ bool OMXCameraAdapter::OMXCallbackHandler::Handler() while(forever){ TIUTILS::MessageQueue::waitForMsg(&mCommandMsgQ, NULL, NULL, -1); + { + Mutex::Autolock lock(mLock); mCommandMsgQ.get(&msg); + } + switch ( msg.command ) { case OMXCallbackHandler::CAMERA_FILL_BUFFER_DONE: { @@ -3456,12 +3463,12 @@ OMXCameraAdapter::~OMXCameraAdapter() if ( NULL != msg ) { Semaphore *sem = (Semaphore*) msg->arg3; - mEventSignalQ.removeAt(i); sem->Signal(); free(msg); } } + mEventSignalQ.clear(); } //Exit and free ref to command handling thread @@ -3470,6 +3477,7 @@ OMXCameraAdapter::~OMXCameraAdapter() TIUTILS::Message msg; msg.command = CommandHandler::COMMAND_EXIT; msg.arg1 = mErrorNotifier; + mCommandHandler->clearCommandQ(); mCommandHandler->put(&msg); mCommandHandler->requestExitAndWait(); mCommandHandler.clear(); @@ -3480,6 +3488,8 @@ OMXCameraAdapter::~OMXCameraAdapter() { TIUTILS::Message msg; msg.command = OMXCallbackHandler::COMMAND_EXIT; + //Clear all messages pending first + mOMXCallbackHandler->clearCommandQ(); mOMXCallbackHandler->put(&msg); mOMXCallbackHandler->requestExitAndWait(); mOMXCallbackHandler.clear(); diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 7358f22..463032a 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -654,9 +654,16 @@ private: } status_t put(TIUTILS::Message* msg){ + Mutex::Autolock lock(mLock); return mCommandMsgQ.put(msg); } + void clearCommandQ() + { + Mutex::Autolock lock(mLock); + mCommandMsgQ.clear(); + } + enum { COMMAND_EXIT = -1, CAMERA_START_IMAGE_CAPTURE = 0, @@ -668,6 +675,7 @@ private: bool Handler(); TIUTILS::MessageQueue mCommandMsgQ; OMXCameraAdapter* mCameraAdapter; + Mutex mLock; }; sp<CommandHandler> mCommandHandler; @@ -685,9 +693,16 @@ public: } status_t put(TIUTILS::Message* msg){ + Mutex::Autolock lock(mLock); return mCommandMsgQ.put(msg); } + void clearCommandQ() + { + Mutex::Autolock lock(mLock); + mCommandMsgQ.clear(); + } + enum { COMMAND_EXIT = -1, CAMERA_FILL_BUFFER_DONE, @@ -697,6 +712,7 @@ public: bool Handler(); TIUTILS::MessageQueue mCommandMsgQ; OMXCameraAdapter* mCameraAdapter; + Mutex mLock; }; sp<OMXCallbackHandler> mOMXCallbackHandler; diff --git a/libtiutils/MessageQueue.cpp b/libtiutils/MessageQueue.cpp index 28bb0e3..11f5407 100755 --- a/libtiutils/MessageQueue.cpp +++ b/libtiutils/MessageQueue.cpp @@ -276,6 +276,24 @@ bool MessageQueue::isEmpty() return !mHasMsg; } +void MessageQueue::clear() +{ + if(!this->fd_read) + { + MSGQ_LOGEA("read descriptor not initialized for message queue"); + LOG_FUNCTION_NAME_EXIT; + return; + } + + Message msg; + while(!isEmpty()) + { + get(&msg); + } + +} + + /** @brief Force whether the message queue has message or not diff --git a/libtiutils/MessageQueue.h b/libtiutils/MessageQueue.h index 97e11a7..6d05201 100755 --- a/libtiutils/MessageQueue.h +++ b/libtiutils/MessageQueue.h @@ -83,6 +83,8 @@ public: ///Returns if the message queue is empty or not bool isEmpty(); + void clear(); + ///Force whether the message queue has message or not void setMsg(bool hasMsg=false); |