Remove pre-CICP controls

Some encoder controls were used only when CONFIG_CICP was off:
https://aomedia-review.googlesource.com/c/aom/+/39451/11/aom/aomcx.h#426

But these were mistakenly left-over when CONFIG_CICP got enabled by default
and removed: https://aomedia-review.googlesource.com/c/aom/+/48441

BUG=aomedia:1673

Change-Id: Ife265949f600d9db3abf629947f0579e48e465d6

aom/aomcx.h

diff --git a/aom/aomcx.h b/aom/aomcx.h
index a88822d..8bbd4a6 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -386,7 +386,6 @@
    *                     22 = EBU Tech. 3213-E
    *                     23 = For future use
    *
-   * Experiment: CICP
    */
   AV1E_SET_COLOR_PRIMARIES,
 
@@ -413,7 +412,6 @@
    *                     18 = BT.2100 HLG, ARIB STD-B67
    *                     19 = For future use
    *
-   * Experiment: CICP
    */
   AV1E_SET_TRANSFER_CHARACTERISTICS,
 
@@ -436,35 +434,9 @@
    *                     14 = BT.2100 ICtCp
    *                     15 = For future use
    *
-   * Experiment: CICP
    */
   AV1E_SET_MATRIX_COEFFICIENTS,
 
-  /*!\brief Codec control function to set color space info.
-   * \note Valid ranges: 0..9, default is "UNKNOWN".
-   *                     0 = UNKNOWN,
-   *                     1 = BT_601
-   *                     2 = BT_709
-   *                     3 = SMPTE_170
-   *                     4 = SMPTE_240
-   *                     5 = BT_2020_NCL
-   *                     6 = BT_2020_CL
-   *                     7 = SRGB
-   *                     8 = ICtCp
-   *                     9 = RESERVED
-   */
-  AV1E_SET_COLOR_SPACE,
-
-  /*!\brief Codec control function to set transfer function info.
-   * \note Valid ranges: 0..4, default is "UNKNOWN".
-   *                     0 = UNKNOWN,
-   *                     1 = BT_709
-   *                     2 = PQ
-   *                     3 = HLG
-   *                     4 = RESERVED
-   */
-  AV1E_SET_TRANSFER_FUNCTION,
-
   /*!\brief Codec control function to set chroma 4:2:0 sample position info.
    * \note Valid ranges: 0..3, default is "UNKNOWN".
    *                     0 = UNKNOWN,
@@ -1088,12 +1060,6 @@
 AOM_CTRL_USE_TYPE(AV1E_SET_MATRIX_COEFFICIENTS, int)
 #define AOM_CTRL_AV1E_SET_MATRIX_COEFFICIENTS
 
-AOM_CTRL_USE_TYPE(AV1E_SET_COLOR_SPACE, int)
-#define AOM_CTRL_AV1E_SET_COLOR_SPACE
-
-AOM_CTRL_USE_TYPE(AV1E_SET_TRANSFER_FUNCTION, int)
-#define AOM_CTRL_AV1E_SET_TRANSFER_FUNCTION
-
 AOM_CTRL_USE_TYPE(AV1E_SET_CHROMA_SAMPLE_POSITION, int)
 #define AOM_CTRL_AV1E_SET_CHROMA_SAMPLE_POSITION