Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666AbaA3Hkk (ORCPT ); Thu, 30 Jan 2014 02:40:40 -0500 Received: from smtp-vbr7.xs4all.nl ([194.109.24.27]:2753 "EHLO smtp-vbr7.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751025AbaA3Hkj (ORCPT ); Thu, 30 Jan 2014 02:40:39 -0500 Message-ID: <52EA01AC.3000706@xs4all.nl> Date: Thu, 30 Jan 2014 08:39:24 +0100 From: Hans Verkuil User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131103 Icedove/17.0.10 MIME-Version: 1.0 To: Amit Grover CC: linux-media@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kyungmin.park@samsung.com, k.debski@samsung.com, prabhakar.csengg@gmail.com, s.nawrocki@samsung.com, hans.verkuil@cisco.com, swaminath.p@samsung.com, jtp.park@samsung.com, Rrob@landley.net, andrew.smirnov@gmail.com, anatol.pomozov@gmail.com, jmccrohan@gmail.com, joe@perches.com, awalls@md.metrocast.net, arun.kk@samsung.com, austin.lobo@samsung.com Subject: Re: [PATCH v2 2/2] drivers/media: s5p-mfc: Add Horizontal and Vertical MV Search Range References: <52E0ED10.2020901@samsung.com> <1391060563-27015-1-git-send-email-amit.grover@samsung.com> <1391060563-27015-3-git-send-email-amit.grover@samsung.com> In-Reply-To: <1391060563-27015-3-git-send-email-amit.grover@samsung.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/30/2014 06:42 AM, Amit Grover wrote: > This patch adds Controls to set Horizontal and Vertical search range > for Motion Estimation block for Samsung MFC video Encoders. > > Signed-off-by: Swami Nathan > Signed-off-by: Amit Grover > --- > drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 1 + > drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 ++ > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 24 +++++++++++++++++++++++ > drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 8 ++------ > 4 files changed, 29 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/platform/s5p-mfc/regs-mfc-v6.h > index 2398cdf..8d0b686 100644 > --- a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h > +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v6.h > @@ -229,6 +229,7 @@ > #define S5P_FIMV_E_PADDING_CTRL_V6 0xf7a4 > #define S5P_FIMV_E_MV_HOR_RANGE_V6 0xf7ac > #define S5P_FIMV_E_MV_VER_RANGE_V6 0xf7b0 > +#define S5P_FIMV_E_MV_RANGE_V6_MASK 0x3fff > > #define S5P_FIMV_E_VBV_BUFFER_SIZE_V6 0xf84c > #define S5P_FIMV_E_VBV_INIT_DELAY_V6 0xf850 > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > index 6920b54..b90ee34 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h > @@ -430,6 +430,8 @@ struct s5p_mfc_vp8_enc_params { > struct s5p_mfc_enc_params { > u16 width; > u16 height; > + u32 mv_h_range; > + u32 mv_v_range; > > u16 gop_size; > enum v4l2_mpeg_video_multi_slice_mode slice_mode; > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c > index 4ff3b6c..704f30c1 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c > @@ -208,6 +208,24 @@ static struct mfc_control controls[] = { > .default_value = 0, > }, > { > + .id = V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE, > + .type = V4L2_CTRL_TYPE_INTEGER, > + .name = "Horizontal MV Search Range", Don't set the name here if the control is also defined in v4l2-ctrls. That way the string from v4l2-ctrls is the leading definition. Regards, Hans > + .minimum = 16, > + .maximum = 128, > + .step = 16, > + .default_value = 32, > + }, > + { > + .id = V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE, > + .type = V4L2_CTRL_TYPE_INTEGER, > + .name = "Vertical MV Search Range", > + .minimum = 16, > + .maximum = 128, > + .step = 16, > + .default_value = 32, > + }, > + { > .id = V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE, > .type = V4L2_CTRL_TYPE_INTEGER, > .minimum = 0, > @@ -1377,6 +1395,12 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl) > case V4L2_CID_MPEG_VIDEO_VBV_SIZE: > p->vbv_size = ctrl->val; > break; > + case V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE: > + p->mv_h_range = ctrl->val; > + break; > + case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE: > + p->mv_v_range = ctrl->val; > + break; > case V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE: > p->codec.h264.cpb_size = ctrl->val; > break; > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > index 461358c..3c10188 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c > @@ -727,14 +727,10 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx) > WRITEL(reg, S5P_FIMV_E_RC_CONFIG_V6); > > /* setting for MV range [16, 256] */ > - reg = 0; > - reg &= ~(0x3FFF); > - reg = 256; > + reg = (p->mv_h_range & S5P_FIMV_E_MV_RANGE_V6_MASK); > WRITEL(reg, S5P_FIMV_E_MV_HOR_RANGE_V6); > > - reg = 0; > - reg &= ~(0x3FFF); > - reg = 256; > + reg = (p->mv_v_range & S5P_FIMV_E_MV_RANGE_V6_MASK); > WRITEL(reg, S5P_FIMV_E_MV_VER_RANGE_V6); > > WRITEL(0x0, S5P_FIMV_E_FRAME_INSERTION_V6); > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/