[FFmpeg-devel] pixfmt: Support chroma-derived and icpct color matrices

Submitted by Vittorio Giovara on Aug. 8, 2017, 2:14 p.m.

Details

Message ID 20170808141430.5154-1-vittorio.giovara@gmail.com
State New
Headers show

Commit Message

Vittorio Giovara Aug. 8, 2017, 2:14 p.m.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
---
Missing version bump.
Vittorio

 libavutil/pixdesc.c | 4 ++++
 libavutil/pixfmt.h  | 3 +++
 2 files changed, 7 insertions(+)

Comments

Hendrik Leppkes Aug. 8, 2017, 2:35 p.m.
On Tue, Aug 8, 2017 at 4:14 PM, Vittorio Giovara
<vittorio.giovara@gmail.com> wrote:
> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
> ---
> Missing version bump.
> Vittorio
>
>  libavutil/pixdesc.c | 4 ++++
>  libavutil/pixfmt.h  | 3 +++
>  2 files changed, 7 insertions(+)
>
> diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
> index 7fa6dd7c0b..a72ef3faf0 100644
> --- a/libavutil/pixdesc.c
> +++ b/libavutil/pixdesc.c
> @@ -1806,6 +1806,10 @@ static const char * const color_space_names[] = {
>      [AVCOL_SPC_BT2020_NCL] = "bt2020nc",
>      [AVCOL_SPC_BT2020_CL] = "bt2020c",
>      [AVCOL_SPC_SMPTE2085] = "smpte2085",
> +    [AVCOL_SPC_CHROMA_DERIVED_NCL] = "chroma-derived-nc",
> +    [AVCOL_SPC_CHROMA_DERIVED_CL] = "chroma-derived-c",
> +    [AVCOL_SPC_ICPCT] = "icpct",
> +
>  };
>
>  static const char * const chroma_location_names[] = {
> diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
> index 2ba7ad1c88..93fd95da58 100644
> --- a/libavutil/pixfmt.h
> +++ b/libavutil/pixfmt.h
> @@ -384,6 +384,9 @@ enum AVColorSpace {
>      AVCOL_SPC_BT2020_NCL  = 9,  ///< ITU-R BT2020 non-constant luminance system
>      AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
>      AVCOL_SPC_SMPTE2085   = 11, ///< SMPTE 2085, Y'D'zD'x
> +    AVCOL_SPC_CHROMA_DERIVED_NCL = 12, ///< Chromaticity-derived non-constant luminance system
> +    AVCOL_SPC_CHROMA_DERIVED_CL = 13, ///< Chromaticity-derived constant luminance system
> +    AVCOL_SPC_ICPCT       = 14, ///< ITU-R BT.2100-0 ICTCP
>      AVCOL_SPC_NB,               ///< Not part of ABI
>  };
>

The spelling of ICtCp is not consistent (differs between comment and
symbol). From what I can see, ICtCp should be the correct order
according to the standards, and not ICpCt, so please use that
consistently. :)

- Hendrik
Michael Niedermayer Aug. 9, 2017, 12:46 a.m.
On Tue, Aug 08, 2017 at 04:14:30PM +0200, Vittorio Giovara wrote:
> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
> ---
> Missing version bump.
> Vittorio
> 
>  libavutil/pixdesc.c | 4 ++++
>  libavutil/pixfmt.h  | 3 +++
>  2 files changed, 7 insertions(+)

doesnt apply cleanly:

Applying: pixfmt: Support chroma-derived and icpct color matrices
error: patch failed: libavutil/pixdesc.c:1806
error: libavutil/pixdesc.c: patch does not apply
error: patch failed: libavutil/pixfmt.h:384
error: libavutil/pixfmt.h: patch does not apply
Patch failed at 0001 pixfmt: Support chroma-derived and icpct color matrices
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


[...]

Patch hide | download patch | download mbox

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 7fa6dd7c0b..a72ef3faf0 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -1806,6 +1806,10 @@  static const char * const color_space_names[] = {
     [AVCOL_SPC_BT2020_NCL] = "bt2020nc",
     [AVCOL_SPC_BT2020_CL] = "bt2020c",
     [AVCOL_SPC_SMPTE2085] = "smpte2085",
+    [AVCOL_SPC_CHROMA_DERIVED_NCL] = "chroma-derived-nc",
+    [AVCOL_SPC_CHROMA_DERIVED_CL] = "chroma-derived-c",
+    [AVCOL_SPC_ICPCT] = "icpct",
+
 };
 
 static const char * const chroma_location_names[] = {
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 2ba7ad1c88..93fd95da58 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -384,6 +384,9 @@  enum AVColorSpace {
     AVCOL_SPC_BT2020_NCL  = 9,  ///< ITU-R BT2020 non-constant luminance system
     AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
     AVCOL_SPC_SMPTE2085   = 11, ///< SMPTE 2085, Y'D'zD'x
+    AVCOL_SPC_CHROMA_DERIVED_NCL = 12, ///< Chromaticity-derived non-constant luminance system
+    AVCOL_SPC_CHROMA_DERIVED_CL = 13, ///< Chromaticity-derived constant luminance system
+    AVCOL_SPC_ICPCT       = 14, ///< ITU-R BT.2100-0 ICTCP
     AVCOL_SPC_NB,               ///< Not part of ABI
 };