Add support for more color spaces

New color spaces:
IPT-C2
YCgCo-Re
YCgCo-Ro

Change-Id: I66c5de3c27451c6a3c672bd533fc07369ba85f1a

aom/aom_image.h

diff --git a/aom/aom_image.h b/aom/aom_image.h
index 6a73298..67af54a 100644
--- a/aom/aom_image.h
+++ b/aom/aom_image.h
@@ -132,10 +132,14 @@
   AOM_CICP_MC_SMPTE_2085 = 11, /**< SMPTE ST 2085 YDzDx */
   AOM_CICP_MC_CHROMAT_NCL =
       12, /**< Chromaticity-derived non-constant luminance */
-  AOM_CICP_MC_CHROMAT_CL = 13, /**< Chromaticity-derived constant luminance */
-  AOM_CICP_MC_ICTCP = 14,      /**< BT.2100 ICtCp */
-  AOM_CICP_MC_RESERVED_15 = 15 /**< For future use (values 15-255)  */
-} aom_matrix_coefficients_t;   /**< alias for enum aom_matrix_coefficients */
+  AOM_CICP_MC_CHROMAT_CL = 13,  /**< Chromaticity-derived constant luminance */
+  AOM_CICP_MC_ICTCP = 14,       /**< BT.2100 ICtCp */
+  AOM_CICP_MC_RESERVED_15 = 15, /**< For backward compatibility */
+  AOM_CICP_MC_IPT_C2 = 15,      /**< IPT-C2 */
+  AOM_CICP_MC_YCGCO_RE = 16,    /**< YCgCo-Re */
+  AOM_CICP_MC_YCGCO_RO = 17,    /**< YCgCo-Ro */
+  /**< For future use (values 18-255) */
+} aom_matrix_coefficients_t; /**< alias for enum aom_matrix_coefficients */
 
 /*!\brief List of supported color range */
 typedef enum aom_color_range {

av1/arg_defs.c

diff --git a/av1/arg_defs.c b/av1/arg_defs.c
index b5f4c7c..ff0f03a 100644
--- a/av1/arg_defs.c
+++ b/av1/arg_defs.c
@@ -89,6 +89,9 @@
   { "chromncl", AOM_CICP_MC_CHROMAT_NCL },
   { "chromcl", AOM_CICP_MC_CHROMAT_CL },
   { "ictcp", AOM_CICP_MC_ICTCP },
+  { "ipt-c2", AOM_CICP_MC_IPT_C2 },
+  { "ycgco-re", AOM_CICP_MC_YCGCO_RE },
+  { "ycgco-ro", AOM_CICP_MC_YCGCO_RO },
   { NULL, 0 }
 };
 

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 443f62c..6c7e1f6 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -858,7 +858,7 @@
   RANGE_CHECK(extra_cfg, transfer_characteristics, AOM_CICP_TC_BT_709,
               AOM_CICP_TC_HLG);
   RANGE_CHECK(extra_cfg, matrix_coefficients, AOM_CICP_MC_IDENTITY,
-              AOM_CICP_MC_ICTCP);
+              AOM_CICP_MC_YCGCO_RO);
   RANGE_CHECK(extra_cfg, color_range, 0, 1);
 
   /* Average corpus complexity is supported only in the case of single pass