media: replace ADOBERGB by OPRGB
The CTA-861 standards have been updated to refer to opRGB instead of AdobeRGB. The official standard is in fact named opRGB, so switch to that. The two old defines referring to ADOBERGB in the public API are put under #ifndef __KERNEL__ and a comment mentions that they are deprecated. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: stable@vger.kernel.org Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
		
				
					committed by
					
						
						Mauro Carvalho Chehab
					
				
			
			
				
	
			
			
			
						parent
						
							b4fbf423ce
						
					
				
				
					commit
					db03401824
				
			@@ -111,7 +111,7 @@ enum vivid_colorspace {
 | 
			
		||||
	VIVID_CS_170M,
 | 
			
		||||
	VIVID_CS_709,
 | 
			
		||||
	VIVID_CS_SRGB,
 | 
			
		||||
	VIVID_CS_ADOBERGB,
 | 
			
		||||
	VIVID_CS_OPRGB,
 | 
			
		||||
	VIVID_CS_2020,
 | 
			
		||||
	VIVID_CS_DCI_P3,
 | 
			
		||||
	VIVID_CS_240M,
 | 
			
		||||
 
 | 
			
		||||
@@ -348,7 +348,7 @@ static int vivid_vid_cap_s_ctrl(struct v4l2_ctrl *ctrl)
 | 
			
		||||
		V4L2_COLORSPACE_SMPTE170M,
 | 
			
		||||
		V4L2_COLORSPACE_REC709,
 | 
			
		||||
		V4L2_COLORSPACE_SRGB,
 | 
			
		||||
		V4L2_COLORSPACE_ADOBERGB,
 | 
			
		||||
		V4L2_COLORSPACE_OPRGB,
 | 
			
		||||
		V4L2_COLORSPACE_BT2020,
 | 
			
		||||
		V4L2_COLORSPACE_DCI_P3,
 | 
			
		||||
		V4L2_COLORSPACE_SMPTE240M,
 | 
			
		||||
@@ -729,7 +729,7 @@ static const char * const vivid_ctrl_colorspace_strings[] = {
 | 
			
		||||
	"SMPTE 170M",
 | 
			
		||||
	"Rec. 709",
 | 
			
		||||
	"sRGB",
 | 
			
		||||
	"AdobeRGB",
 | 
			
		||||
	"opRGB",
 | 
			
		||||
	"BT.2020",
 | 
			
		||||
	"DCI-P3",
 | 
			
		||||
	"SMPTE 240M",
 | 
			
		||||
@@ -752,7 +752,7 @@ static const char * const vivid_ctrl_xfer_func_strings[] = {
 | 
			
		||||
	"Default",
 | 
			
		||||
	"Rec. 709",
 | 
			
		||||
	"sRGB",
 | 
			
		||||
	"AdobeRGB",
 | 
			
		||||
	"opRGB",
 | 
			
		||||
	"SMPTE 240M",
 | 
			
		||||
	"None",
 | 
			
		||||
	"DCI-P3",
 | 
			
		||||
 
 | 
			
		||||
@@ -413,7 +413,7 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv,
 | 
			
		||||
		mp->colorspace = V4L2_COLORSPACE_SMPTE170M;
 | 
			
		||||
	} else if (mp->colorspace != V4L2_COLORSPACE_SMPTE170M &&
 | 
			
		||||
		   mp->colorspace != V4L2_COLORSPACE_REC709 &&
 | 
			
		||||
		   mp->colorspace != V4L2_COLORSPACE_ADOBERGB &&
 | 
			
		||||
		   mp->colorspace != V4L2_COLORSPACE_OPRGB &&
 | 
			
		||||
		   mp->colorspace != V4L2_COLORSPACE_BT2020 &&
 | 
			
		||||
		   mp->colorspace != V4L2_COLORSPACE_SRGB) {
 | 
			
		||||
		mp->colorspace = V4L2_COLORSPACE_REC709;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user