diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-12-23 16:27:29 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-12-23 16:27:29 -0800 |
| commit | 675af75e516e59e5e8a6e7924bfcde9ae340e5c0 (patch) | |
| tree | 1f7ea4f9d60a8fcfc5e4933703dad0d2001b2708 | |
| parent | dd79df2ee0dab235f7790ca200d770851938fcf5 (diff) | |
| parent | 7e3007cdb606d5a087ca24c7eb32ea2868513b29 (diff) | |
| download | android_hardware_qcom_media-675af75e516e59e5e8a6e7924bfcde9ae340e5c0.tar.gz android_hardware_qcom_media-675af75e516e59e5e8a6e7924bfcde9ae340e5c0.tar.bz2 android_hardware_qcom_media-675af75e516e59e5e8a6e7924bfcde9ae340e5c0.zip | |
Merge "mm-video: vidc: Communicate the right colorformat to the driver"
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 2 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 12 |
2 files changed, 11 insertions, 3 deletions
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 6c1d6a5a..fc189127 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -4875,7 +4875,7 @@ OMX_ERRORTYPE omx_video::empty_this_buffer_opaque(OMX_IN OMX_HANDLETYPE hComp, } c2d_opened = true; #ifdef _MSM8974_ - if (!dev_set_format(handle->format)) + if (!dev_set_format(NV12_128m)) DEBUG_PRINT_ERROR("cannot set color format"); #endif } diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp index ff6c5f8b..b30422b1 100644 --- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp +++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp @@ -811,9 +811,17 @@ int venc_dev::venc_set_format(int format) { int rc = true; - if (format) + if (format) { color_format = format; - else { + + switch (color_format) { + case NV12_128m: + return venc_set_color_format((OMX_COLOR_FORMATTYPE)QOMX_COLOR_FORMATYUV420PackedSemiPlanar32m); + default: + return false; + } + + } else { color_format = 0; rc = false; } |