Merge "mm-video-v4l2: venc: WA: ignore colorspace set by client when executing"

1 files changed, 11 insertions, 0 deletions

diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
index 0aa45e8e..71c36c66 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
@@ -1897,6 +1897,17 @@ OMX_ERRORTYPE  omx_venc::set_config(OMX_IN OMX_HANDLETYPE      hComp,
                VALIDATE_OMX_PARAM_DATA(configData, DescribeColorAspectsParams);
                DescribeColorAspectsParams *params = (DescribeColorAspectsParams *)configData;
                print_debug_color_aspects(&(params->sAspects), "set_config");
+
+               // WA: Android client does not set the correct color-aspects (from dataspace).
+               // Such a dataspace change is detected and set while in executing. This leads to
+               // a race condition where client is trying to set (wrong) color and component trying
+               // to set (right) color from ETB.
+               // Hence ignore this config in Executing state till the framework starts setting right color.
+               if (m_state == OMX_StateExecuting) {
+                    DEBUG_PRINT_HIGH("Ignoring ColorSpace setting in Executing state");
+                    return OMX_ErrorUnsupportedSetting;
+               }
+
                if (!handle->venc_set_config(configData, (OMX_INDEXTYPE)OMX_QTIIndexConfigDescribeColorAspects)) {
                    DEBUG_PRINT_ERROR("Failed to set OMX_QTIIndexConfigDescribeColorAspects");
                    return OMX_ErrorUnsupportedSetting;