All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philipp Zabel <p.zabel@pengutronix.de>
To: linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>,
	Kamil Debski <k.debski@samsung.com>,
	Fabio Estevam <fabio.estevam@freescale.com>,
	kernel@pengutronix.de, Philipp Zabel <p.zabel@pengutronix.de>
Subject: [PATCH v2 16/29] [media] coda: add h.264 deblocking filter controls
Date: Tue, 24 Jun 2014 16:55:58 +0200	[thread overview]
Message-ID: <1403621771-11636-17-git-send-email-p.zabel@pengutronix.de> (raw)
In-Reply-To: <1403621771-11636-1-git-send-email-p.zabel@pengutronix.de>

This adds controls for the h.264 deblocking loop filter.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/media/platform/coda.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 3697a17..9ac8c9a 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -161,6 +161,9 @@ struct coda_params {
 	u8			h264_inter_qp;
 	u8			h264_min_qp;
 	u8			h264_max_qp;
+	u8			h264_deblk_enabled;
+	u8			h264_deblk_alpha;
+	u8			h264_deblk_beta;
 	u8			mpeg4_intra_qp;
 	u8			mpeg4_inter_qp;
 	u8			gop_size;
@@ -2326,7 +2329,17 @@ static int coda_start_encoding(struct coda_ctx *ctx)
 			coda_write(dev, CODA9_STD_H264, CODA_CMD_ENC_SEQ_COD_STD);
 		else
 			coda_write(dev, CODA_STD_H264, CODA_CMD_ENC_SEQ_COD_STD);
-		coda_write(dev, 0, CODA_CMD_ENC_SEQ_264_PARA);
+		if (ctx->params.h264_deblk_enabled) {
+			value = ((ctx->params.h264_deblk_alpha &
+				  CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK) <<
+				 CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET) |
+				((ctx->params.h264_deblk_beta &
+				  CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK) <<
+				 CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET);
+		} else {
+			value = 1 << CODA_264PARAM_DISABLEDEBLK_OFFSET;
+		}
+		coda_write(dev, value, CODA_CMD_ENC_SEQ_264_PARA);
 		break;
 	default:
 		v4l2_err(v4l2_dev,
@@ -2637,6 +2650,16 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
 	case V4L2_CID_MPEG_VIDEO_H264_MAX_QP:
 		ctx->params.h264_max_qp = ctrl->val;
 		break;
+	case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA:
+		ctx->params.h264_deblk_alpha = ctrl->val;
+		break;
+	case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA:
+		ctx->params.h264_deblk_beta = ctrl->val;
+		break;
+	case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE:
+		ctx->params.h264_deblk_enabled = (ctrl->val ==
+				V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
+		break;
 	case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP:
 		ctx->params.mpeg4_intra_qp = ctrl->val;
 		break;
@@ -2691,6 +2714,14 @@ static int coda_ctrls_setup(struct coda_ctx *ctx)
 	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
 		V4L2_CID_MPEG_VIDEO_H264_MAX_QP, 0, 51, 1, 51);
 	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
+		V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA, 0, 15, 1, 0);
+	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
+		V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA, 0, 15, 1, 0);
+	v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
+		V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE,
+		V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED, 0x0,
+		V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED);
+	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
 		V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP, 1, 31, 1, 2);
 	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
 		V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP, 1, 31, 1, 2);
-- 
2.0.0


  parent reply	other threads:[~2014-06-24 14:56 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-24 14:55 [PATCH v2 00/29] Initial CODA960 (i.MX6 VPU) support Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 01/29] [media] coda: fix decoder I/P/B frame detection Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 02/29] [media] coda: fix readback of CODA_RET_DEC_SEQ_FRAME_NEED Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 03/29] [media] coda: fix h.264 quantization parameter range Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 04/29] [media] coda: fix internal framebuffer allocation size Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 05/29] [media] coda: simplify IRAM setup Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 06/29] [media] coda: Add encoder/decoder support for CODA960 Philipp Zabel
2014-06-24 16:16   ` Nicolas Dufresne
2014-07-01 17:53     ` Philipp Zabel
2014-07-02 13:37       ` Kamil Debski
2014-07-02 19:16         ` Robert Schwebel
2014-07-11 12:33           ` Robert Schwebel
2014-07-11 12:53             ` Fabio Estevam
2014-07-21  7:07             ` Robert Schwebel
2014-07-25 12:27               ` Fabio Estevam
2014-08-14  7:15               ` Robert Schwebel
2014-06-24 14:55 ` [PATCH v2 07/29] [media] coda: remove BUG() in get_q_data Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 08/29] [media] coda: add selection API support for h.264 decoder Philipp Zabel
2014-06-27  8:58   ` Hans Verkuil
2014-06-24 14:55 ` [PATCH v2 09/29] [media] coda: add workqueue to serialize hardware commands Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 10/29] [media] coda: Use mem-to-mem ioctl helpers Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 11/29] [media] coda: use ctx->fh.m2m_ctx instead of ctx->m2m_ctx Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 12/29] [media] coda: Add runtime pm support Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 13/29] [media] coda: split firmware version check out of coda_hw_init Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 14/29] [media] coda: select GENERIC_ALLOCATOR Philipp Zabel
2014-06-24 14:55 ` [PATCH v2 15/29] [media] coda: add h.264 min/max qp controls Philipp Zabel
2014-06-24 14:55 ` Philipp Zabel [this message]
2014-06-24 14:55 ` [PATCH v2 17/29] [media] coda: add cyclic intra refresh control Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 18/29] [media] v4l2-mem2mem: export v4l2_m2m_try_schedule Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 19/29] [media] coda: try to schedule a decode run after a stop command Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 20/29] [media] coda: add decoder timestamp queue Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 21/29] [media] coda: alert userspace about macroblock errors Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 22/29] [media] coda: add sequence counter offset Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 23/29] [media] coda: use prescan_failed variable to stop stream after a timeout Philipp Zabel
2014-07-02 12:58   ` Kamil Debski
2014-07-02 13:43     ` Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 24/29] [media] coda: add reset control support Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 25/29] [media] coda: add bytesperline to queue data Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 26/29] [media] coda: allow odd width, but still round up bytesperline Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 27/29] [media] coda: round up internal frames to multiples of macroblock size for h.264 Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 28/29] [media] coda: increase frame stride to 16 " Philipp Zabel
2014-06-24 14:56 ` [PATCH v2 29/29] [media] coda: export auxiliary buffers via debugfs Philipp Zabel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403621771-11636-17-git-send-email-p.zabel@pengutronix.de \
    --to=p.zabel@pengutronix.de \
    --cc=fabio.estevam@freescale.com \
    --cc=k.debski@samsung.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-media@vger.kernel.org \
    --cc=m.chehab@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.