diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-19 22:45:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-19 22:45:16 -0700 |
| commit | 74569c8caf71a3260569703b37c51c79fcd2923c (patch) | |
| tree | bdd09645cd44cfdcd20edd04932c06c8bcb692fb /mm-video-v4l2/vidc/vdec/src | |
| parent | 7f86817ce20e444f3712976c8be249f9cd40861c (diff) | |
| parent | f519e81a8cacfae2f2d1d517ba1935c550f9cee4 (diff) | |
| download | media-74569c8caf71a3260569703b37c51c79fcd2923c.tar.gz | |
Merge "mm-video-v4l2: Remove resolution check"
Diffstat (limited to 'mm-video-v4l2/vidc/vdec/src')
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 39 |
1 files changed, 0 insertions, 39 deletions
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; |