commit 01d43e1f713c0474e8f66598e9172a5218568d1d
author Tom Finegan <tomfinegan@google.com> Thu Aug 17 09:21:42 2017 -0700
committer Tom Finegan <tomfinegan@google.com> Fri Aug 18 05:15:40 2017 +0000
tree be817e35d669a19bca202bd664a6b41a87675d8b
parent 67876e774a7c7f1eea6623e7bb5ec4986d189588

Make CONFIG_COLORSPACE_HEADERS public API changes unconditional.

Avoid changing the public API based on an experiment flag:

- Remove aom_config.h include from aom_image.h.
- Unconditionally include the existing API additions.
- Add some missing doc comments (silences Doxygen warnings).
- Return an error when using ctrl flags that require
  CONFIG_COLORSPACE_HEADERS when it's not enabled.
- Move colorspace_headers to the correct section of configure.
- Move CONFIG_COLORSPACE_HEADERS to the correct section of
  aom_config_defaults.cmake.
- clang-format style check appeasement

Change-Id: I7b5d72c6f9f1a5561409d7813ba59180d98d8805

aomenc.c

diff --git a/aomenc.c b/aomenc.c
index 57dee38..178fc08 100644
--- a/aomenc.c
+++ b/aomenc.c
@@ -474,29 +474,17 @@
     "max gf/arf frame interval (default 0, indicating in-built behavior)");
 
 static const struct arg_enum_list color_space_enum[] = {
-  { "unknown", AOM_CS_UNKNOWN },
-  { "bt601", AOM_CS_BT_601 },
-  { "bt709", AOM_CS_BT_709 },
-  { "smpte170", AOM_CS_SMPTE_170 },
-  { "smpte240", AOM_CS_SMPTE_240 },
-#if CONFIG_COLORSPACE_HEADERS
-  { "bt2020ncl", AOM_CS_BT_2020_NCL },
-  { "bt2020cl", AOM_CS_BT_2020_CL },
-  { "sRGB", AOM_CS_SRGB },
-  { "ICtCp", AOM_CS_ICTCP },
-#else
-  { "bt2020", AOM_CS_BT_2020 },
-  { "reserved", AOM_CS_RESERVED },
-  { "sRGB", AOM_CS_SRGB },
-#endif
-  { NULL, 0 }
+  { "unknown", AOM_CS_UNKNOWN },     { "bt601", AOM_CS_BT_601 },
+  { "bt709", AOM_CS_BT_709 },        { "smpte170", AOM_CS_SMPTE_170 },
+  { "smpte240", AOM_CS_SMPTE_240 },  { "bt2020ncl", AOM_CS_BT_2020_NCL },
+  { "bt2020cl", AOM_CS_BT_2020_CL }, { "sRGB", AOM_CS_SRGB },
+  { "ICtCp", AOM_CS_ICTCP },         { NULL, 0 }
 };
 
 static const arg_def_t input_color_space =
     ARG_DEF_ENUM(NULL, "color-space", 1, "The color space of input content:",
                  color_space_enum);
 
-#if CONFIG_COLORSPACE_HEADERS
 static const struct arg_enum_list transfer_function_enum[] = {
   { "unknown", AOM_TF_UNKNOWN },
   { "bt709", AOM_TF_BT_709 },
@@ -520,7 +508,6 @@
     ARG_DEF_ENUM(NULL, "chroma-sample-position", 1,
                  "The chroma sample position when chroma 4:2:0 is signaled:",
                  chroma_sample_position_enum);
-#endif
 
 static const struct arg_enum_list tune_content_enum[] = {
   { "default", AOM_CONTENT_DEFAULT },
@@ -584,10 +571,8 @@
                                        &noise_sens,
                                        &tune_content,
                                        &input_color_space,
-#if CONFIG_COLORSPACE_HEADERS
                                        &input_transfer_function,
                                        &input_chroma_sample_position,
-#endif
                                        &min_gf_interval,
                                        &max_gf_interval,
 #if CONFIG_EXT_PARTITION
@@ -643,10 +628,8 @@
                                         AV1E_SET_NOISE_SENSITIVITY,
                                         AV1E_SET_TUNE_CONTENT,
                                         AV1E_SET_COLOR_SPACE,
-#if CONFIG_COLORSPACE_HEADERS
                                         AV1E_SET_TRANSFER_FUNCTION,
                                         AV1E_SET_CHROMA_SAMPLE_POSITION,
-#endif
                                         AV1E_SET_MIN_GF_INTERVAL,
                                         AV1E_SET_MAX_GF_INTERVAL,
 #if CONFIG_EXT_PARTITION