diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-12-10 11:34:25 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-12-10 11:34:24 -0800 |
| commit | c2d7f08ed9383caf6b2b864c59768ce8ff09d611 (patch) | |
| tree | 642eeaf1d67a4e4c2c38d6ff2d450159b4dd0716 | |
| parent | 544aaed3028421adc298a6da9504a9f2f1b909d7 (diff) | |
| parent | a04219fb8a06c9da54b4b517869767dab54ca50a (diff) | |
| download | android_hardware_qcom_media-c2d7f08ed9383caf6b2b864c59768ce8ff09d611.tar.gz android_hardware_qcom_media-c2d7f08ed9383caf6b2b864c59768ce8ff09d611.tar.bz2 android_hardware_qcom_media-c2d7f08ed9383caf6b2b864c59768ce8ff09d611.zip | |
Merge "mm-video-v4l2: vdec: skip enabling extn_user extradata for secure session"
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index e7861d08..ee53e10d 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -10249,6 +10249,10 @@ OMX_ERRORTYPE omx_vdec::enable_extradata(OMX_U32 requested_extradata, } } if (requested_extradata & OMX_EXTNUSER_EXTRADATA) { + if (secure_mode) { + DEBUG_PRINT_HIGH("ExtnUser Extra Data not supported for secure sessions"); + return OMX_ErrorUnsupportedSetting; + } control.id = V4L2_CID_MPEG_VIDC_VIDEO_EXTRADATA; control.value = V4L2_MPEG_VIDC_EXTRADATA_STREAM_USERDATA; if (ioctl(drv_ctx.video_driver_fd, VIDIOC_S_CTRL, &control)) { |