diff mbox

v4l/s5p-mfc: corrected encoder v4l control definitions

Message ID 1339657446-21916-1-git-send-email-a.hajda@samsung.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Andrzej Hajda June 14, 2012, 7:04 a.m. UTC 
  Patch corrects definition of H264 level control and
changes bare numbers to enums in two other cases.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/media/video/s5p-mfc/s5p_mfc_enc.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

Comments

Kamil Debski June 14, 2012, 9:03 a.m. UTC | #1 
Hi Andrzej, 

Thank you for the patch.

Best wishes,
--
Kamil Debski
Linux Platform Group
Samsung Poland R&D Center

> -----Original Message-----
> From: Andrzej Hajda [mailto:a.hajda@samsung.com]
> Sent: 14 June 2012 09:04
> To: linux-media@vger.kernel.org
> Cc: Hans Verkuil; Marek Szyprowski; Kamil Debski; Andrzej Hajda; Kyungmin
> Park
> Subject: [PATCH] v4l/s5p-mfc: corrected encoder v4l control definitions
> 
> Patch corrects definition of H264 level control and
> changes bare numbers to enums in two other cases.
> 
> Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

Acked-by: Kamil Debski <k.debski@samsung.com>

> ---
>  drivers/media/video/s5p-mfc/s5p_mfc_enc.c |   10 ++--------
>  1 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
> b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
> index acedb20..9c19aa8 100644
> --- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
> +++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
> @@ -243,12 +243,6 @@ static struct mfc_control controls[] = {
>  		.minimum = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
>  		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
>  		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
> -		.menu_skip_mask = ~(
> -				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
> -				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_2) |
> -				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_0) |
> -				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_1)
> -				),
>  	},
>  	{
>  		.id = V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
> @@ -494,7 +488,7 @@ static struct mfc_control controls[] = {
>  		.type = V4L2_CTRL_TYPE_MENU,
>  		.minimum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
>  		.maximum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED,
> -		.default_value = 0,
> +		.default_value = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
>  		.menu_skip_mask = 0,
>  	},
>  	{
> @@ -534,7 +528,7 @@ static struct mfc_control controls[] = {
>  		.type = V4L2_CTRL_TYPE_MENU,
>  		.minimum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
>  		.maximum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,
> -		.default_value = 0,
> +		.default_value = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
>  		.menu_skip_mask = 0,
>  	},
>  	{
> --
> 1.7.0.4

--
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/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
index acedb20..9c19aa8 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
@@ -243,12 +243,6 @@  static struct mfc_control controls[] = {
 		.minimum = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
 		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
 		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
-		.menu_skip_mask = ~(
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_2) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_0) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_1)
-				),
 	},
 	{
 		.id = V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
@@ -494,7 +488,7 @@  static struct mfc_control controls[] = {
 		.type = V4L2_CTRL_TYPE_MENU,
 		.minimum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
 		.maximum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED,
-		.default_value = 0,
+		.default_value = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
 		.menu_skip_mask = 0,
 	},
 	{
@@ -534,7 +528,7 @@  static struct mfc_control controls[] = {
 		.type = V4L2_CTRL_TYPE_MENU,
 		.minimum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
 		.maximum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,
-		.default_value = 0,
+		.default_value = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
 		.menu_skip_mask = 0,
 	},
 	{