[PATCH 1/3] hdmi: add new HDMI 2.0 defines

[Hans Verkuil]

On 12/01/2014 12:03 PM, Thierry Reding wrote:
> On Fri, Nov 28, 2014 at 03:50:49PM +0100, Hans Verkuil wrote:
>> From: Hans Verkuil 
>>
>> Add new Video InfoFrame colorspace information introduced in HDMI 2.0
>> and new Audio Coding Extension Types, also from HDMI 2.0.
>>
>> Signed-off-by: Hans Verkuil 
>> ---
>>  include/linux/hdmi.h | 20 
>>  1 file changed, 20 insertions(+)
>>
>> diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
>> index 11c0182..38fd2a0 100644
>> --- a/include/linux/hdmi.h
>> +++ b/include/linux/hdmi.h
>> @@ -37,6 +37,8 @@ enum hdmi_colorspace {
>>  HDMI_COLORSPACE_RGB,
>>  HDMI_COLORSPACE_YUV422,
>>  HDMI_COLORSPACE_YUV444,
>> +HDMI_COLORSPACE_YUV420,
>> +HDMI_COLORSPACE_IDO_DEFINED = 7,
>>  };
>>  
>>  enum hdmi_scan_mode {
>> @@ -77,6 +79,10 @@ enum hdmi_extended_colorimetry {
>>  HDMI_EXTENDED_COLORIMETRY_S_YCC_601,
>>  HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601,
>>  HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB,
>> +
>> +/* The following EC values are only defined in CEA-861-F. */
>> +HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,
>> +HDMI_EXTENDED_COLORIMETRY_BT2020,
>>  };
>>  
>>  enum hdmi_quantization_range {
>> @@ -201,9 +207,23 @@ enum hdmi_audio_sample_frequency {
>>  
>>  enum hdmi_audio_coding_type_ext {
>>  HDMI_AUDIO_CODING_TYPE_EXT_STREAM,
>> +
>> +/*
>> + * The next three CXT values are defined in CEA-861-E only.
>> + * They do not exist in older versions, and in CEA-861-F they are
>> + * defined as 'Not in use'.
>> + */
>>  HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC,
>>  HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2,
>>  HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND,
>> +
>> +/* The following CXT values are only defined in CEA-861-F. */
>> +HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC,
>> +HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_V2,
>> +HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC,
>> +HDMI_AUDIO_CODING_TYPE_EXT_DRA,
>> +HDMI_AUDIO_CODING_TYPE_EXT_MPEG_HE_AAC_SURROUND,
>> +HDMI_AUDIO_CODING_TYPE_EXT_MPEG_AAC_LC_SURROUND = 10,
> 
> I think the last two should be MPEG4_{HE_AAC,AAC}_SURROUND, and with
> that fixed:
> 
> Reviewed-by: Thierry Reding 
> 

You are correct, I will correct that.

Thanks,

Hans

[PATCH 1/3] hdmi: add new HDMI 2.0 defines

[Thierry Reding]

On Fri, Nov 28, 2014 at 03:50:49PM +0100, Hans Verkuil wrote:
> From: Hans Verkuil 
> 
> Add new Video InfoFrame colorspace information introduced in HDMI 2.0
> and new Audio Coding Extension Types, also from HDMI 2.0.
> 
> Signed-off-by: Hans Verkuil 
> ---
>  include/linux/hdmi.h | 20 
>  1 file changed, 20 insertions(+)
> 
> diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
> index 11c0182..38fd2a0 100644
> --- a/include/linux/hdmi.h
> +++ b/include/linux/hdmi.h
> @@ -37,6 +37,8 @@ enum hdmi_colorspace {
>   HDMI_COLORSPACE_RGB,
>   HDMI_COLORSPACE_YUV422,
>   HDMI_COLORSPACE_YUV444,
> + HDMI_COLORSPACE_YUV420,
> + HDMI_COLORSPACE_IDO_DEFINED = 7,
>  };
>  
>  enum hdmi_scan_mode {
> @@ -77,6 +79,10 @@ enum hdmi_extended_colorimetry {
>   HDMI_EXTENDED_COLORIMETRY_S_YCC_601,
>   HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601,
>   HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB,
> +
> + /* The following EC values are only defined in CEA-861-F. */
> + HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,
> + HDMI_EXTENDED_COLORIMETRY_BT2020,
>  };
>  
>  enum hdmi_quantization_range {
> @@ -201,9 +207,23 @@ enum hdmi_audio_sample_frequency {
>  
>  enum hdmi_audio_coding_type_ext {
>   HDMI_AUDIO_CODING_TYPE_EXT_STREAM,
> +
> + /*
> +  * The next three CXT values are defined in CEA-861-E only.
> +  * They do not exist in older versions, and in CEA-861-F they are
> +  * defined as 'Not in use'.
> +  */
>   HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC,
>   HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2,
>   HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND,
> +
> + /* The following CXT values are only defined in CEA-861-F. */
> + HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC,
> + HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_V2,
> + HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC,
> + HDMI_AUDIO_CODING_TYPE_EXT_DRA,
> + HDMI_AUDIO_CODING_TYPE_EXT_MPEG_HE_AAC_SURROUND,
> + HDMI_AUDIO_CODING_TYPE_EXT_MPEG_AAC_LC_SURROUND = 10,

I think the last two should be MPEG4_{HE_AAC,AAC}_SURROUND, and with
that fixed:

Reviewed-by: Thierry Reding 
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: 

[PATCH 1/3] hdmi: add new HDMI 2.0 defines

[Hans Verkuil]

From: Hans Verkuil 

Add new Video InfoFrame colorspace information introduced in HDMI 2.0
and new Audio Coding Extension Types, also from HDMI 2.0.

Signed-off-by: Hans Verkuil 
---
 include/linux/hdmi.h | 20 
 1 file changed, 20 insertions(+)

diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index 11c0182..38fd2a0 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -37,6 +37,8 @@ enum hdmi_colorspace {
HDMI_COLORSPACE_RGB,
HDMI_COLORSPACE_YUV422,
HDMI_COLORSPACE_YUV444,
+   HDMI_COLORSPACE_YUV420,
+   HDMI_COLORSPACE_IDO_DEFINED = 7,
 };

 enum hdmi_scan_mode {
@@ -77,6 +79,10 @@ enum hdmi_extended_colorimetry {
HDMI_EXTENDED_COLORIMETRY_S_YCC_601,
HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601,
HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB,
+
+   /* The following EC values are only defined in CEA-861-F. */
+   HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,
+   HDMI_EXTENDED_COLORIMETRY_BT2020,
 };

 enum hdmi_quantization_range {
@@ -201,9 +207,23 @@ enum hdmi_audio_sample_frequency {

 enum hdmi_audio_coding_type_ext {
HDMI_AUDIO_CODING_TYPE_EXT_STREAM,
+
+   /*
+* The next three CXT values are defined in CEA-861-E only.
+* They do not exist in older versions, and in CEA-861-F they are
+* defined as 'Not in use'.
+*/
HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC,
HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2,
HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND,
+
+   /* The following CXT values are only defined in CEA-861-F. */
+   HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC,
+   HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_V2,
+   HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC,
+   HDMI_AUDIO_CODING_TYPE_EXT_DRA,
+   HDMI_AUDIO_CODING_TYPE_EXT_MPEG_HE_AAC_SURROUND,
+   HDMI_AUDIO_CODING_TYPE_EXT_MPEG_AAC_LC_SURROUND = 10,
 };

 struct hdmi_audio_infoframe {
-- 
2.1.3