Hi, Please also rebase the patches onto the master branch of the media tree.
http://git.linuxtv.org/cgit.cgi/media_tree.git/ Best wishes, -- Kamil Debski Samsung R&D Institute Poland > -----Original Message----- > From: panpan liu [mailto:panpan1....@samsung.com] > Sent: Tuesday, July 15, 2014 5:08 AM > To: kyungmin.p...@samsung.com; k.deb...@samsung.com; > jtp.p...@samsung.com; mche...@redhat.com > Cc: linux-arm-ker...@lists.infradead.org; linux-media@vger.kernel.org > Subject: [PATCH] s5p-mfc: limit the size of the CPB > > The CPB size is limited by the hardware. Add this limit to the s_fmt. > > Signed-off-by: panpan liu <panpan1....@samsung.com> > --- > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) mode change 100644 => > 100755 drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > old mode 100644 > new mode 100755 > index 0bae907..70b9458 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > @@ -413,7 +413,8 @@ 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); > pix_mp = &f->fmt.pix_mp; > @@ -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: > -- > 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
