diff options
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 13 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/inc/omx_video_base.h | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_swvenc_hevc.cpp | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp | 2 |
6 files changed, 13 insertions, 10 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 2e4a043e..fce7097c 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -303,7 +303,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; @@ -2251,10 +2251,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; } @@ -9092,11 +9092,14 @@ OMX_ERRORTYPE omx_vdec::update_portdef(OMX_PARAM_PORTDEFINITIONTYPE *portDefn) portDefn->format.video.nSliceHeight = drv_ctx.video_resolution.scan_lines; } - if ((portDefn->format.video.eColorFormat == OMX_COLOR_FormatYUV420Planar) || - (portDefn->format.video.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar)) { + if (portDefn->format.video.eColorFormat == OMX_COLOR_FormatYUV420Planar) { + portDefn->format.video.nStride = drv_ctx.video_resolution.frame_width; + portDefn->format.video.nSliceHeight = drv_ctx.video_resolution.frame_height; + } else if (portDefn->format.video.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) { portDefn->format.video.nStride = ALIGN(drv_ctx.video_resolution.frame_width, 16); portDefn->format.video.nSliceHeight = drv_ctx.video_resolution.frame_height; } + DEBUG_PRINT_HIGH("update_portdef(%u): Width = %u Height = %u Stride = %d " "SliceHeight = %u eColorFormat = %d nBufSize %u nBufCnt %u", (unsigned int)portDefn->nPortIndex, 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 f4d74e92..b22b7bcc 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 d35db5ef..442a92cb 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 48c1d017..87523d1e 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 6506b49f..15f8b50b 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 af20444f..445db8d3 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp @@ -572,7 +572,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; |