Merge "mm-video-v4l2: Remove resolution check"

3 files changed, 0 insertions, 46 deletions

diff --git a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
index 56cafdbb..c12740c8 100644
--- a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
+++ b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
@@ -656,7 +656,6 @@ class omx_vdec: public qc_omx_component
         OMX_ERRORTYPE allocate_extradata();
         void free_extradata();
         int update_resolution(int width, int height, int stride, int scan_lines);
-        OMX_ERRORTYPE is_video_session_supported();
         Signal signal;
         pthread_t msg_thread_id;
         pthread_t async_thread_id;
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 637a8b76..3e8e29e8 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
@@ -1908,30 +1908,6 @@ int omx_vdec::update_resolution(int width, int height, int stride, int scan_line
     return format_changed;
 }
 
-OMX_ERRORTYPE omx_vdec::is_video_session_supported()
-{
-    if ((drv_ctx.video_resolution.frame_width *
-                drv_ctx.video_resolution.frame_height >
-                m_decoder_capability.max_width *
-                m_decoder_capability.max_height) ||
-            (drv_ctx.video_resolution.frame_width*
-             drv_ctx.video_resolution.frame_height <
-             m_decoder_capability.min_width *
-             m_decoder_capability.min_height)) {
-        DEBUG_PRINT_ERROR(
-                "Unsupported WxH = (%u)x(%u) supported range is min(%u)x(%u) - max(%u)x(%u)",
-                drv_ctx.video_resolution.frame_width,
-                drv_ctx.video_resolution.frame_height,
-                m_decoder_capability.min_width,
-                m_decoder_capability.min_height,
-                m_decoder_capability.max_width,
-                m_decoder_capability.max_height);
-        return OMX_ErrorUnsupportedSetting;
-    }
-    DEBUG_PRINT_HIGH("video session supported");
-    return OMX_ErrorNone;
-}
-
 int omx_vdec::log_input_buffers(const char *buffer_addr, int buffer_len, uint64_t timeStamp)
 {
     if (m_debug.in_buffer_log && !m_debug.infile) {
@@ -4002,9 +3978,6 @@ OMX_ERRORTYPE  omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE     hComp,
                                            m_extradata_info.output_crop_rect.nWidth = rectangle.nWidth;
                                            m_extradata_info.output_crop_rect.nHeight = rectangle.nHeight;
 
-                                           eRet = is_video_session_supported();
-                                           if (eRet)
-                                               break;
                                            memset(&fmt, 0x0, sizeof(struct v4l2_format));
                                            fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
                                            fmt.fmt.pix_mp.height = (unsigned int)portDefn->format.video.nFrameHeight;
@@ -4133,9 +4106,6 @@ OMX_ERRORTYPE  omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE     hComp,
 
                                            update_resolution(frameWidth, frameHeight,
                                                    frameWidth, frameHeight);
-                                           eRet = is_video_session_supported();
-                                           if (eRet)
-                                               break;
                                            if (is_down_scalar_enabled) {
                                                memset(&fmt, 0x0, sizeof(struct v4l2_format));
                                                fmt.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
@@ -8757,10 +8727,6 @@ OMX_ERRORTYPE omx_vdec::get_buffer_req(vdec_allocatorproperty *buffer_prop)
     } else {
         int extra_idx = 0;
 
-        eRet = is_video_session_supported();
-        if (eRet)
-            return eRet;
-
         buffer_prop->buffer_size = fmt.fmt.pix_mp.plane_fmt[0].sizeimage;
         buf_size = buffer_prop->buffer_size;
         extra_idx = EXTRADATA_IDX(drv_ctx.num_planes);
@@ -11557,11 +11523,6 @@ OMX_ERRORTYPE omx_vdec::enable_adaptive_playback(unsigned long nMaxFrameWidth,
 
      update_resolution(m_smoothstreaming_width, m_smoothstreaming_height,
                        m_smoothstreaming_width, m_smoothstreaming_height);
-     eRet = is_video_session_supported();
-     if (eRet != OMX_ErrorNone) {
-         DEBUG_PRINT_ERROR("video session is not supported");
-         return eRet;
-     }
 
      //Get upper limit buffer size for max smooth streaming resolution set
      fmt.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
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 6153c6ed..d05f63b0 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_encoder.cpp
@@ -550,12 +550,6 @@ OMX_ERRORTYPE  omx_venc::set_parameter(OMX_IN OMX_HANDLETYPE     hComp,
                     portDefn->format.video.eColorFormat, portDefn->format.video.eCompressionFormat);
 
                 if (PORT_INDEX_IN == portDefn->nPortIndex) {
-                    if (!dev_is_video_session_supported(portDefn->format.video.nFrameWidth,
-                                portDefn->format.video.nFrameHeight)) {
-                        DEBUG_PRINT_ERROR("video session not supported");
-                        omx_report_unsupported_setting();
-                        return OMX_ErrorUnsupportedSetting;
-                    }
                     if (portDefn->nBufferCountActual > MAX_NUM_INPUT_BUFFERS) {
                         DEBUG_PRINT_ERROR("ERROR: (In_PORT) actual count (%u) exceeds max(%u)",
                                 (unsigned int)portDefn->nBufferCountActual, (unsigned int)MAX_NUM_INPUT_BUFFERS);