Commit 61b31d78 authored by Jammy Huang's avatar Jammy Huang Committed by Hans Verkuil
Browse files

media: aspeed: Use full swing as JFIF to fix incorrect color 



Current settings for video capture rgb-2-yuv is BT.601(studio swing),
but JFIF uses BT.601(full swing) to deocde. This mismatch will lead
to incorrect color. For example, input RGB value, (0, 0, 255), will
become (16, 16, 235) after jpg decoded.

Add an enum, aspeed_video_capture_format, to define VR008[7:6]
capture format and correct default settings for video capture to fix
the problem.

VR008[7:6] decides the data format for video capture as below:
* 00: CCIR601 studio swing compliant YUV format
* 01: CCIR601 full swing compliant YUV format
* 10: RGB format
* 11: Gray color mode

Signed-off-by: default avatarJammy Huang <jammy_huang@aspeedtech.com>
Reviewed-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 22443acc

drivers/media/platform/aspeed-video.c

+11 −3
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ 
#define  VE_CTRL_SOURCE			BIT(2)

#define  VE_CTRL_INT_DE			BIT(4)

#define  VE_CTRL_DIRECT_FETCH		BIT(5)

#define  VE_CTRL_YUV			BIT(6)

#define  VE_CTRL_RGB			BIT(7)

#define  VE_CTRL_CAPTURE_FMT		GENMASK(7, 6)

#define  VE_CTRL_AUTO_OR_CURSOR		BIT(8)

#define  VE_CTRL_CLK_INVERSE		BIT(11)
@@ -213,6 +211,15 @@ enum { 
	VIDEO_CLOCKS_ON,

};



// for VE_CTRL_CAPTURE_FMT

enum aspeed_video_capture_format {

	VIDEO_CAP_FMT_YUV_STUDIO_SWING = 0,

	VIDEO_CAP_FMT_YUV_FULL_SWING,

	VIDEO_CAP_FMT_RGB,

	VIDEO_CAP_FMT_GRAY,

	VIDEO_CAP_FMT_MAX

};



struct aspeed_video_addr {

	unsigned int size;

	dma_addr_t dma;
@@ -1119,7 +1126,8 @@ static void aspeed_video_init_regs(struct aspeed_video *video) 
	u32 comp_ctrl = VE_COMP_CTRL_RSVD |

		FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) |

		FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10);

	u32 ctrl = VE_CTRL_AUTO_OR_CURSOR;

	u32 ctrl = VE_CTRL_AUTO_OR_CURSOR |

		FIELD_PREP(VE_CTRL_CAPTURE_FMT, VIDEO_CAP_FMT_YUV_FULL_SWING);

	u32 seq_ctrl = video->jpeg_mode;



	if (video->frame_rate)