diff options
| author | Steve Kondik <steve@cyngn.com> | 2014-12-13 03:05:02 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2014-12-13 03:05:02 -0800 |
| commit | d44191331909dd7a0f90c3ccb38264ae8b0c6381 (patch) | |
| tree | 72d3a5c75508d09aa6d053482d861113ecf00d0c | |
| parent | 2abb33ec180a25b162eb06b7c32baa615ff49dbc (diff) | |
| parent | dddc6fde73ee09355abcc3530e7ce035e6541532 (diff) | |
| download | android_hardware_qcom_media-d44191331909dd7a0f90c3ccb38264ae8b0c6381.tar.gz android_hardware_qcom_media-d44191331909dd7a0f90c3ccb38264ae8b0c6381.tar.bz2 android_hardware_qcom_media-d44191331909dd7a0f90c3ccb38264ae8b0c6381.zip | |
Merge branch 'LA.BF.1.1_rb1.16' of git://codeaurora.org/platform/hardware/qcom/media into cm-12.0
| -rw-r--r-- | mm-video-v4l2/vidc/common/inc/vidc_debug.h | 15 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 9 |
2 files changed, 18 insertions, 6 deletions
diff --git a/mm-video-v4l2/vidc/common/inc/vidc_debug.h b/mm-video-v4l2/vidc/common/inc/vidc_debug.h index 96311355..00b3a3ea 100644 --- a/mm-video-v4l2/vidc/common/inc/vidc_debug.h +++ b/mm-video-v4l2/vidc/common/inc/vidc_debug.h @@ -41,17 +41,20 @@ enum { extern int debug_level; #undef DEBUG_PRINT_ERROR -#define DEBUG_PRINT_ERROR(fmt, args...) \ +#define DEBUG_PRINT_ERROR(fmt, args...) ({ \ if (debug_level & PRIO_ERROR) \ - ALOGE(fmt,##args) + ALOGE(fmt,##args); \ + }) #undef DEBUG_PRINT_LOW -#define DEBUG_PRINT_LOW(fmt, args...) \ +#define DEBUG_PRINT_LOW(fmt, args...) ({ \ if (debug_level & PRIO_LOW) \ - ALOGD(fmt,##args) + ALOGD(fmt,##args); \ + }) #undef DEBUG_PRINT_HIGH -#define DEBUG_PRINT_HIGH(fmt, args...) \ +#define DEBUG_PRINT_HIGH(fmt, args...) ({ \ if (debug_level & PRIO_HIGH) \ - ALOGD(fmt,##args) + ALOGD(fmt,##args); \ + }) #else #define DEBUG_PRINT_ERROR printf #define DEBUG_PRINT_LOW printf 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 b0a0d9b5..1aeb9179 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -4782,6 +4782,15 @@ OMX_ERRORTYPE omx_vdec::free_output_buffer(OMX_BUFFERHEADERTYPE *bufferHdr) sizeof (vdec_bufferpayload)); if (!dynamic_buf_mode) { + + if (streaming[CAPTURE_PORT]) { + if (stream_off(OMX_CORE_OUTPUT_PORT_INDEX)) { + DEBUG_PRINT_ERROR("STREAMOFF Failed"); + } else { + DEBUG_PRINT_HIGH("STREAMOFF Successful"); + } + } + #ifdef _ANDROID_ if (m_enable_android_native_buffers) { if (!secure_mode) { |