s5p-mfc: limit the size of the CPB
authorpanpan liu <panpan1.liu@samsung.com>
Mon, 14 Jul 2014 06:42:27 +0000 (14:42 +0800)
committerChanho Park <chanho61.park@samsung.com>
Tue, 18 Nov 2014 03:00:24 +0000 (12:00 +0900)
The CPB size is limited by the hardware. Add this limit to the s_fmt.

Change-Id: I4ffe90ac8b4de7aed8f396b3072d5db6ead9741c
Signed-off-by: panpan liu <panpan1.liu@samsung.com>
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c

index 223064a..2dd5385 100755 (executable)
@@ -413,6 +413,7 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
        int ret = 0;
        struct s5p_mfc_fmt *fmt;
        struct v4l2_pix_format_mplane *pix_mp;
+       struct s5p_mfc_buf_size *buf_size = dev->variant->buf_size;
 
        mfc_debug_enter();
        ret = vidioc_try_fmt(file, priv, f);
@@ -466,11 +467,13 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
        mfc_debug(2, "The codec number is: %d\n", ctx->codec_mode);
        pix_mp->height = 0;
        pix_mp->width = 0;
-       if (pix_mp->plane_fmt[0].sizeimage)
-               ctx->dec_src_buf_size = pix_mp->plane_fmt[0].sizeimage;
-       else
+       if (pix_mp->plane_fmt[0].sizeimage == 0)
                pix_mp->plane_fmt[0].sizeimage = ctx->dec_src_buf_size =
                                                                DEF_CPB_SIZE;
+       else if (pix_mp->plane_fmt[0].sizeimage > buf_size->cpb)
+               ctx->dec_src_buf_size = buf_size->cpb;
+       else
+               ctx->dec_src_buf_size = pix_mp->plane_fmt[0].sizeimage;
        pix_mp->plane_fmt[0].bytesperline = 0;
        ctx->state = MFCINST_INIT;
 out: