Merge "mm-video-v4l2: vidc: update thread names"

6 files changed, 8 insertions, 8 deletions

diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
index 818fb83c..466b447d 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp
@@ -297,7 +297,7 @@ void* async_message_thread (void *input)
     return NULL;
 }
 
-void* message_thread(void *input)
+void* dec_message_thread(void *input)
 {
     omx_vdec* omx = reinterpret_cast<omx_vdec*>(input);
     unsigned char id;
@@ -2026,10 +2026,10 @@ OMX_ERRORTYPE omx_vdec::component_init(OMX_STRING role)
             m_pipe_in = fds[0];
             m_pipe_out = fds[1];
             msg_thread_created = true;
-            r = pthread_create(&msg_thread_id,0,message_thread,this);
+            r = pthread_create(&msg_thread_id,0, dec_message_thread,this);
 
             if (r < 0) {
-                DEBUG_PRINT_ERROR("component_init(): message_thread creation failed");
+                DEBUG_PRINT_ERROR("component_init(): dec_message_thread creation failed");
                 msg_thread_created = false;
                 eRet = OMX_ErrorInsufficientResources;
             }
diff --git a/mm-video-v4l2/vidc/venc/inc/omx_video_base.h b/mm-video-v4l2/vidc/venc/inc/omx_video_base.h
index a9593114..3dd56866 100644
--- a/mm-video-v4l2/vidc/venc/inc/omx_video_base.h
+++ b/mm-video-v4l2/vidc/venc/inc/omx_video_base.h
@@ -138,7 +138,7 @@ static const char* MEM_DEVICE = "/dev/pmem_smipool";
 #ifdef _ANDROID_ICS_
 #define MAX_NUM_INPUT_BUFFERS 64
 #endif
-void* message_thread(void *);
+void* enc_message_thread(void *);
 
 // OMX video class
 class omx_video: public qc_omx_component
diff --git a/mm-video-v4l2/vidc/venc/src/omx_swvenc_hevc.cpp b/mm-video-v4l2/vidc/venc/src/omx_swvenc_hevc.cpp
index 9bd901e1..15302ea6 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_swvenc_hevc.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_swvenc_hevc.cpp
@@ -340,7 +340,7 @@ OMX_ERRORTYPE omx_swvenc::component_init(OMX_STRING role)
             }
         }
         msg_thread_created = true;
-        r = pthread_create(&msg_thread_id,0, message_thread, this);
+        r = pthread_create(&msg_thread_id,0, enc_message_thread, this);
         if (r < 0) {
             eRet = OMX_ErrorInsufficientResources;
             msg_thread_created = false;
diff --git a/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp b/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp
index e6b58d8b..68af3b54 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp
@@ -439,7 +439,7 @@ OMX_ERRORTYPE omx_venc::component_init(OMX_STRING role)
             }
         }
 
-        if (pthread_create(&msg_thread_id,0, message_thread, this) < 0)
+        if (pthread_create(&msg_thread_id,0, enc_message_thread, this) < 0)
         {
             eRet = OMX_ErrorInsufficientResources;
             msg_thread_created = false;
diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
index 685bece5..a4818727 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
@@ -96,7 +96,7 @@ typedef struct OMXComponentCapabilityFlagsType {
 } OMXComponentCapabilityFlagsType;
 #define OMX_COMPONENT_CAPABILITY_TYPE_INDEX 0xFF7A347
 
-void* message_thread(void *input)
+void* enc_message_thread(void *input)
 {
     omx_video* omx = reinterpret_cast<omx_video*>(input);
     unsigned char id;
diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
index d64b46c0..7a98192c 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
@@ -479,7 +479,7 @@ OMX_ERRORTYPE omx_venc::component_init(OMX_STRING role)
             }
         }
         msg_thread_created = true;
-        r = pthread_create(&msg_thread_id,0, message_thread, this);
+        r = pthread_create(&msg_thread_id,0, enc_message_thread, this);
         if (r < 0) {
             eRet = OMX_ErrorInsufficientResources;
             msg_thread_created = false;