diff options
| author | myfluxi <linflux@arcor.de> | 2015-11-10 22:02:53 +0100 |
|---|---|---|
| committer | myfluxi <linflux@arcor.de> | 2015-11-10 22:17:16 +0100 |
| commit | 156f1a914e87e47c0017728b591319991daf34fc (patch) | |
| tree | 7ba3f2f1c613c739475fcee0332280b7b6a22839 | |
| parent | 50f8d14095122998ee64d99e4c9c2fd381f9a14f (diff) | |
| download | android_hardware_qcom_media-156f1a914e87e47c0017728b591319991daf34fc.tar.gz android_hardware_qcom_media-156f1a914e87e47c0017728b591319991daf34fc.tar.bz2 android_hardware_qcom_media-156f1a914e87e47c0017728b591319991daf34fc.zip | |
mm-video-v4l2: Disable extradata on legacy devices
Fixes build on msm8974.
Change-Id: Ic997d5d58610278cb0951a5d8a508dbfb20c7ac3
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 4 |
1 files changed, 4 insertions, 0 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 9c6646a4..e44ae594 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -9291,6 +9291,7 @@ void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr) p_extra = (OMX_OTHER_EXTRADATATYPE *) (((OMX_U8 *) p_extra) + p_extra->nSize); } break; +#ifndef DISABLE_EXTRADATA case MSM_VIDC_EXTRADATA_VUI_DISPLAY_INFO: struct msm_vidc_vui_display_info_payload *display_info_payload; display_info_payload = (struct msm_vidc_vui_display_info_payload*)(void *)data->data; @@ -9318,6 +9319,7 @@ void omx_vdec::handle_extradata(OMX_BUFFERHEADERTYPE *p_buf_hdr) UPDATE_COLOR_SPACE, (void*)&color_space); } break; +#endif default: DEBUG_PRINT_LOW("Unrecognized extradata"); goto unrecognized_extradata; @@ -9461,6 +9463,7 @@ OMX_ERRORTYPE omx_vdec::enable_extradata(OMX_U32 requested_extradata, DEBUG_PRINT_HIGH("Seq display extradata is supported for MPEG2 only"); } } +#ifndef DISABLE_EXTRADATA if (requested_extradata & OMX_VUI_DISPLAY_INFO_EXTRADATA) { control.id = V4L2_CID_MPEG_VIDC_VIDEO_EXTRADATA; control.value = V4L2_MPEG_VIDC_EXTRADATA_VUI_DISPLAY; @@ -9468,6 +9471,7 @@ OMX_ERRORTYPE omx_vdec::enable_extradata(OMX_U32 requested_extradata, DEBUG_PRINT_HIGH("Failed to set display VUI extradata"); } } +#endif } ret = get_buffer_req(&drv_ctx.op_buf); return ret; |