diff mbox

[v4,12/16] media: coda: add byte size slice limit control

Message ID 1347291000-340-13-git-send-email-p.zabel@pengutronix.de (mailing list archive)
State New, archived
Headers show

Commit Message

Philipp Zabel Sept. 10, 2012, 3:29 p.m. UTC 
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/media/platform/coda.c |   29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

Comments

Javier Martin Sept. 11, 2012, 10:50 a.m. UTC | #1 
On 10 September 2012 17:29, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  drivers/media/platform/coda.c |   29 +++++++++++++++++++++++------
>  1 file changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
> index 81e3401..863b96a 100644
> --- a/drivers/media/platform/coda.c
> +++ b/drivers/media/platform/coda.c
> @@ -151,6 +151,7 @@ struct coda_params {
>         enum v4l2_mpeg_video_multi_slice_mode slice_mode;
>         u32                     framerate;
>         u16                     bitrate;
> +       u32                     slice_max_bits;
>         u32                     slice_max_mb;
>  };
>
> @@ -1056,12 +1057,23 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
>                 return -EINVAL;
>         }
>
> -       value  = (ctx->params.slice_max_mb & CODA_SLICING_SIZE_MASK) << CODA_SLICING_SIZE_OFFSET;
> -       value |= (1 & CODA_SLICING_UNIT_MASK) << CODA_SLICING_UNIT_OFFSET;
> -       if (ctx->params.slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB)
> +       switch (ctx->params.slice_mode) {
> +       case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE:
> +               value = 0;
> +               break;
> +       case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB:
> +               value  = (ctx->params.slice_max_mb & CODA_SLICING_SIZE_MASK) << CODA_SLICING_SIZE_OFFSET;
> +               value |= (1 & CODA_SLICING_UNIT_MASK) << CODA_SLICING_UNIT_OFFSET;
> +               value |=  1 & CODA_SLICING_MODE_MASK;
> +               break;
> +       case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES:
> +               value  = (ctx->params.slice_max_bits & CODA_SLICING_SIZE_MASK) << CODA_SLICING_SIZE_OFFSET;
> +               value |= (0 & CODA_SLICING_UNIT_MASK) << CODA_SLICING_UNIT_OFFSET;
>                 value |=  1 & CODA_SLICING_MODE_MASK;
> +               break;
> +       }
>         coda_write(dev, value, CODA_CMD_ENC_SEQ_SLICE_MODE);
> -       value  =  ctx->params.gop_size & CODA_GOP_SIZE_MASK;
> +       value = ctx->params.gop_size & CODA_GOP_SIZE_MASK;
>         coda_write(dev, value, CODA_CMD_ENC_SEQ_GOP_SIZE);
>
>         if (ctx->params.bitrate) {
> @@ -1308,6 +1320,9 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
>         case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:
>                 ctx->params.slice_max_mb = ctrl->val;
>                 break;
> +       case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:
> +               ctx->params.slice_max_bits = ctrl->val * 8;
> +               break;
>         case V4L2_CID_MPEG_VIDEO_HEADER_MODE:
>                 break;
>         default:
> @@ -1346,10 +1361,12 @@ static int coda_ctrls_setup(struct coda_ctx *ctx)
>                 V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP, 1, 31, 1, 2);
>         v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
>                 V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,
> -               V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB, 0,
> -               V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB);
> +               V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES, 0x7,
> +               V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);

The mask must be 0x0 instead of 0x7. Otherwise you are forbidding all
the possible values for this ctrl and that won't work.

>         v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
>                 V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB, 1, 0x3fffffff, 1, 1);
> +       v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
> +               V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES, 1, 0x3fffffff, 1, 500);
>         v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
>                 V4L2_CID_MPEG_VIDEO_HEADER_MODE,
>                 V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
> --
> 1.7.10.4
>

Regards.
Philipp Zabel Sept. 11, 2012, 11:19 a.m. UTC | #2 
Hi Javier,

Am Dienstag, den 11.09.2012, 12:50 +0200 schrieb javier Martin:
> On 10 September 2012 17:29, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  drivers/media/platform/coda.c |   29 +++++++++++++++++++++++------
> >  1 file changed, 23 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
> > index 81e3401..863b96a 100644
> > --- a/drivers/media/platform/coda.c
> > +++ b/drivers/media/platform/coda.c
[...]
> > @@ -1346,10 +1361,12 @@ static int coda_ctrls_setup(struct coda_ctx *ctx)
> >                 V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP, 1, 31, 1, 2);
> >         v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
> >                 V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,
> > -               V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB, 0,
> > -               V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB);
> > +               V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES, 0x7,
> > +               V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);
> 
> The mask must be 0x0 instead of 0x7. Otherwise you are forbidding all
> the possible values for this ctrl and that won't work.

Thank you, will fix that.

regards
Philipp

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 81e3401..863b96a 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -151,6 +151,7 @@  struct coda_params {
 	enum v4l2_mpeg_video_multi_slice_mode slice_mode;
 	u32			framerate;
 	u16			bitrate;
+	u32			slice_max_bits;
 	u32			slice_max_mb;
 };
 
@@ -1056,12 +1057,23 @@  static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
 		return -EINVAL;
 	}
 
-	value  = (ctx->params.slice_max_mb & CODA_SLICING_SIZE_MASK) << CODA_SLICING_SIZE_OFFSET;
-	value |= (1 & CODA_SLICING_UNIT_MASK) << CODA_SLICING_UNIT_OFFSET;
-	if (ctx->params.slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB)
+	switch (ctx->params.slice_mode) {
+	case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE:
+		value = 0;
+		break;
+	case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB:
+		value  = (ctx->params.slice_max_mb & CODA_SLICING_SIZE_MASK) << CODA_SLICING_SIZE_OFFSET;
+		value |= (1 & CODA_SLICING_UNIT_MASK) << CODA_SLICING_UNIT_OFFSET;
+		value |=  1 & CODA_SLICING_MODE_MASK;
+		break;
+	case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES:
+		value  = (ctx->params.slice_max_bits & CODA_SLICING_SIZE_MASK) << CODA_SLICING_SIZE_OFFSET;
+		value |= (0 & CODA_SLICING_UNIT_MASK) << CODA_SLICING_UNIT_OFFSET;
 		value |=  1 & CODA_SLICING_MODE_MASK;
+		break;
+	}
 	coda_write(dev, value, CODA_CMD_ENC_SEQ_SLICE_MODE);
-	value  =  ctx->params.gop_size & CODA_GOP_SIZE_MASK;
+	value = ctx->params.gop_size & CODA_GOP_SIZE_MASK;
 	coda_write(dev, value, CODA_CMD_ENC_SEQ_GOP_SIZE);
 
 	if (ctx->params.bitrate) {
@@ -1308,6 +1320,9 @@  static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
 	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:
 		ctx->params.slice_max_mb = ctrl->val;
 		break;
+	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:
+		ctx->params.slice_max_bits = ctrl->val * 8;
+		break;
 	case V4L2_CID_MPEG_VIDEO_HEADER_MODE:
 		break;
 	default:
@@ -1346,10 +1361,12 @@  static int coda_ctrls_setup(struct coda_ctx *ctx)
 		V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP, 1, 31, 1, 2);
 	v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
 		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,
-		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB, 0,
-		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB);
+		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES, 0x7,
+		V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);
 	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
 		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB, 1, 0x3fffffff, 1, 1);
+	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
+		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES, 1, 0x3fffffff, 1, 500);
 	v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
 		V4L2_CID_MPEG_VIDEO_HEADER_MODE,
 		V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,