Merge "mm-video-v4l2: vidc: Correct error handling"

2 files changed, 13 insertions, 13 deletions

diff --git a/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp b/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp
index 55125fab..2bb86ddb 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_swvenc_mpeg4.cpp
@@ -1799,7 +1799,7 @@ bool omx_venc::dev_empty_buf
                 if (ipbuffer.p_buffer == MAP_FAILED)
                 {
                     DEBUG_PRINT_ERROR("mmap() failed for fd %d of size %d",fd,size);
-                    RETURN(OMX_ErrorBadParameter);
+                    RETURN(false);
                 }
                 ipbuffer.size = size;
                 ipbuffer.filled_length = size;
@@ -1823,7 +1823,7 @@ bool omx_venc::dev_empty_buf
                         {
                             DEBUG_PRINT_ERROR("%s: OMX_IndexParamVideoPortFormat 0x%x invalid",
                                               __FUNCTION__,handle->format);
-                            RETURN(OMX_ErrorBadParameter);
+                            RETURN(false);
                         }
                     }
                 }
@@ -1831,7 +1831,7 @@ bool omx_venc::dev_empty_buf
                 if (ipbuffer.p_buffer == MAP_FAILED)
                 {
                     DEBUG_PRINT_ERROR("mmap() failed for fd %d of size %d",fd,size);
-                    RETURN(OMX_ErrorBadParameter);
+                    RETURN(false);
                 }
                 ipbuffer.size = size;
                 ipbuffer.filled_length = size;
@@ -1852,7 +1852,7 @@ bool omx_venc::dev_empty_buf
                 {
                     DEBUG_PRINT_ERROR("%s, swvenc_setproperty failed (%d)",
                         __FUNCTION__, Ret);
-                    RETURN(OMX_ErrorUnsupportedSetting);
+                    RETURN(false);
                 }
             }
         }
@@ -1981,12 +1981,12 @@ bool omx_venc::dev_get_seq_hdr
    {
       DEBUG_PRINT_ERROR("%s, swvenc_flush failed (%d)",
         __FUNCTION__, Ret);
-      RETURN(-1);
+      RETURN(false);
    }
 
    *hdrlen = Buffer.filled_length;
 
-   RETURN(0);
+   RETURN(true);
 }
 
 bool omx_venc::dev_get_capability_ltrcount
@@ -2225,7 +2225,7 @@ bool omx_venc::dev_color_align(OMX_BUFFERHEADERTYPE *buffer,
 
     if(secure_session) {
         DEBUG_PRINT_ERROR("Cannot align colors in secure session.");
-        RETURN(OMX_FALSE);
+        RETURN(false);
     }
     return swvenc_color_align(buffer, width,height);
 }
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 684e9596..30d2750a 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
@@ -1652,7 +1652,7 @@ bool venc_dev::venc_get_buf_req(OMX_U32 *min_buff_count,
             extra_data_size =  fmt.fmt.pix_mp.plane_fmt[extra_idx].sizeimage;
         } else if (extra_idx >= VIDEO_MAX_PLANES) {
             DEBUG_PRINT_ERROR("Extradata index is more than allowed: %d\n", extra_idx);
-            return OMX_ErrorBadParameter;
+            return false;
         }
         input_extradata_info.buffer_size =  ALIGN(extra_data_size, SZ_4K);
         input_extradata_info.count = MAX_V4L2_BUFS;
@@ -1721,7 +1721,7 @@ bool venc_dev::venc_get_buf_req(OMX_U32 *min_buff_count,
             extra_data_size =  fmt.fmt.pix_mp.plane_fmt[extra_idx].sizeimage;
         } else if (extra_idx >= VIDEO_MAX_PLANES) {
             DEBUG_PRINT_ERROR("Extradata index is more than allowed: %d", extra_idx);
-            return OMX_ErrorBadParameter;
+            return false;
         }
 
         output_extradata_info.buffer_size = extra_data_size;
@@ -2709,7 +2709,7 @@ bool venc_dev::venc_set_config(void *configData, OMX_INDEXTYPE index)
                     (OMX_SKYPE_VIDEO_CONFIG_BASELAYERPID*) configData;
                 if (venc_set_baselayerid(pParam->nPID) == false) {
                     DEBUG_PRINT_ERROR("Failed to set OMX_QcomIndexConfigBaseLayerId failed");
-                    return OMX_ErrorUnsupportedSetting;
+                    return false;
                 }
                 break;
             }
@@ -2728,7 +2728,7 @@ bool venc_dev::venc_set_config(void *configData, OMX_INDEXTYPE index)
                                 pParam->nQP,
                                 ENABLE_I_QP | ENABLE_P_QP | ENABLE_B_QP ) == false) {
                     DEBUG_PRINT_ERROR("Failed to set OMX_QcomIndexConfigQp failed");
-                    return OMX_ErrorUnsupportedSetting;
+                    return false;
                 }
                 break;
             }
@@ -3994,7 +3994,7 @@ bool venc_dev::venc_empty_batch(OMX_BUFFERHEADERTYPE *bufhdr, unsigned index)
                 int extradata_index = venc_get_index_from_fd(input_extradata_info.m_ion_dev, fd);
                 if (extradata_index < 0) {
                     DEBUG_PRINT_ERROR("Extradata index calculation went wrong for fd = %d", fd);
-                    return OMX_ErrorBadParameter;
+                    return false;
                 }
 
                 plane[extra_idx].bytesused = 0;
@@ -5630,7 +5630,7 @@ bool venc_dev::venc_set_ltrmode(OMX_U32 enable, OMX_U32 count)
         pTemporalParams.ePattern = OMX_VIDEO_AndroidTemporalLayeringPatternNone;
         if(venc_set_temporal_layers(&pTemporalParams)) {
             DEBUG_PRINT_ERROR("Failed to disable layer encoding for VP8 when LTR is enabled\n");
-            return OMX_ErrorUndefined;
+            return false;
         }
     }