summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm-video-v4l2/vidc/venc/src/omx_video_base.cpp2
-rw-r--r--mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp12
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;
}