Commit 24e47836 authored by Edward Hervey's avatar Edward Hervey Committed by Edward Hervey
Browse files

aom_image: Don't leak experimental flag in public API

* Remove aom_config.h include from aom_image.h
* Unconditionally include API additions in the header

Change-Id: I57e4014bb255789cc1052ed1adc38d76ca6ad9a0
parent 837262bf
...@@ -35,8 +35,6 @@ extern "C" { ...@@ -35,8 +35,6 @@ extern "C" {
#define AOM_IMG_FMT_HAS_ALPHA 0x400 /**< Image has an alpha channel. */ #define AOM_IMG_FMT_HAS_ALPHA 0x400 /**< Image has an alpha channel. */
#define AOM_IMG_FMT_HIGHBITDEPTH 0x800 /**< Image uses 16bit framebuffer. */ #define AOM_IMG_FMT_HIGHBITDEPTH 0x800 /**< Image uses 16bit framebuffer. */
#include "./aom_config.h"
/*!\brief List of supported image formats */ /*!\brief List of supported image formats */
typedef enum aom_img_fmt { typedef enum aom_img_fmt {
AOM_IMG_FMT_NONE, AOM_IMG_FMT_NONE,
...@@ -69,7 +67,6 @@ typedef enum aom_img_fmt { ...@@ -69,7 +67,6 @@ typedef enum aom_img_fmt {
AOM_IMG_FMT_I44016 = AOM_IMG_FMT_I440 | AOM_IMG_FMT_HIGHBITDEPTH AOM_IMG_FMT_I44016 = AOM_IMG_FMT_I440 | AOM_IMG_FMT_HIGHBITDEPTH
} aom_img_fmt_t; /**< alias for enum aom_img_fmt */ } aom_img_fmt_t; /**< alias for enum aom_img_fmt */
#if CONFIG_CICP
/*!\brief List of supported color primaries */ /*!\brief List of supported color primaries */
typedef enum aom_color_primaries { typedef enum aom_color_primaries {
AOM_CICP_CP_RESERVED_0 = 0, /**< For future use */ AOM_CICP_CP_RESERVED_0 = 0, /**< For future use */
...@@ -137,7 +134,7 @@ typedef enum aom_matrix_coefficients { ...@@ -137,7 +134,7 @@ typedef enum aom_matrix_coefficients {
AOM_CICP_MC_ICTCP = 14, /**< BT.2100 ICtCp */ AOM_CICP_MC_ICTCP = 14, /**< BT.2100 ICtCp */
AOM_CICP_MC_RESERVED_15 = 15 /**< For future use (values 15-255) */ AOM_CICP_MC_RESERVED_15 = 15 /**< For future use (values 15-255) */
} aom_matrix_coefficients_t; } aom_matrix_coefficients_t;
#else
/*!\brief List of supported color spaces */ /*!\brief List of supported color spaces */
typedef enum aom_color_space { typedef enum aom_color_space {
AOM_CS_UNKNOWN = 0, /**< Unknown */ AOM_CS_UNKNOWN = 0, /**< Unknown */
...@@ -154,13 +151,12 @@ typedef enum aom_color_space { ...@@ -154,13 +151,12 @@ typedef enum aom_color_space {
/*!\brief List of supported transfer functions */ /*!\brief List of supported transfer functions */
typedef enum aom_transfer_function { typedef enum aom_transfer_function {
AOM_TF_UNKNOWN = 0, /**< Unknown */ AOM_TF_UNKNOWN = 0, /**< Unknown */
AOM_TF_BT_709 = 1, /**< BT.709 */ AOM_TF_BT_709 = 1, /**< BT.709 */
AOM_TF_PQ = 2, /**< PQ TF BT.2100 / ST.2084 */ AOM_TF_PQ = 2, /**< PQ TF BT.2100 / ST.2084 */
AOM_TF_HLG = 3, /**< Hybrid Log-Gamma */ AOM_TF_HLG = 3, /**< Hybrid Log-Gamma */
AOM_TF_RESERVED = 4 /**< Values 4..31 are reserved */ AOM_TF_RESERVED = 4 /**< Values 4..31 are reserved */
} aom_transfer_function_t; /**< alias for enum aom_transfer_function */ } aom_transfer_function_t; /**< alias for enum aom_transfer_function */
#endif
/*!\brief List of supported color range */ /*!\brief List of supported color range */
typedef enum aom_color_range { typedef enum aom_color_range {
...@@ -179,18 +175,15 @@ typedef enum aom_chroma_sample_position { ...@@ -179,18 +175,15 @@ typedef enum aom_chroma_sample_position {
/**\brief Image Descriptor */ /**\brief Image Descriptor */
typedef struct aom_image { typedef struct aom_image {
aom_img_fmt_t fmt; /**< Image Format */ aom_img_fmt_t fmt; /**< Image Format */
#if CONFIG_CICP
aom_color_primaries_t cp; /**< CICP Color Primaries */ aom_color_primaries_t cp; /**< CICP Color Primaries */
aom_transfer_characteristics_t tc; /**< CICP Transfer Characteristics */ aom_transfer_characteristics_t tc; /**< CICP Transfer Characteristics */
aom_matrix_coefficients_t mc; /**< CICP Matrix Coefficients */ aom_matrix_coefficients_t mc; /**< CICP Matrix Coefficients */
#else aom_color_space_t cs; /**< Color Space */
aom_color_space_t cs; /**< Color Space */ aom_transfer_function_t tf; /**< transfer function */
aom_transfer_function_t tf; /**< transfer function */ int monochrome; /**< Whether image is monochrome */
#endif aom_chroma_sample_position_t csp; /**< chroma sample position */
int monochrome; /**< Whether image is monochrome */ aom_color_range_t range; /**< Color Range */
aom_chroma_sample_position_t csp; /**< chroma sample position */
aom_color_range_t range; /**< Color Range */
/* Image storage dimensions */ /* Image storage dimensions */
unsigned int w; /**< Stored image width */ unsigned int w; /**< Stored image width */
......
...@@ -342,7 +342,6 @@ enum aome_enc_control_id { ...@@ -342,7 +342,6 @@ enum aome_enc_control_id {
*/ */
AV1E_SET_TUNE_CONTENT, AV1E_SET_TUNE_CONTENT,
#if CONFIG_CICP
/*!\brief Codec control function to set color space info. /*!\brief Codec control function to set color space info.
* \note Valid ranges: 0..23, default is "Unspecified". * \note Valid ranges: 0..23, default is "Unspecified".
* 0 = For future use * 0 = For future use
...@@ -361,6 +360,8 @@ enum aome_enc_control_id { ...@@ -361,6 +360,8 @@ enum aome_enc_control_id {
* 13 = For future use (values 13 - 21) * 13 = For future use (values 13 - 21)
* 22 = EBU Tech. 3213-E * 22 = EBU Tech. 3213-E
* 23 = For future use * 23 = For future use
*
* Experiment: CICP
*/ */
AV1E_SET_COLOR_PRIMARIES, AV1E_SET_COLOR_PRIMARIES,
...@@ -386,6 +387,8 @@ enum aome_enc_control_id { ...@@ -386,6 +387,8 @@ enum aome_enc_control_id {
* 17 = SMPTE ST 428 * 17 = SMPTE ST 428
* 18 = BT.2100 HLG, ARIB STD-B67 * 18 = BT.2100 HLG, ARIB STD-B67
* 19 = For future use * 19 = For future use
*
* Experiment: CICP
*/ */
AV1E_SET_TRANSFER_CHARACTERISTICS, AV1E_SET_TRANSFER_CHARACTERISTICS,
...@@ -407,9 +410,11 @@ enum aome_enc_control_id { ...@@ -407,9 +410,11 @@ enum aome_enc_control_id {
* 13 = Chromaticity-derived constant luminance * 13 = Chromaticity-derived constant luminance
* 14 = BT.2100 ICtCp * 14 = BT.2100 ICtCp
* 15 = For future use * 15 = For future use
*
* Experiment: CICP
*/ */
AV1E_SET_MATRIX_COEFFICIENTS, AV1E_SET_MATRIX_COEFFICIENTS,
#else
/*!\brief Codec control function to set color space info. /*!\brief Codec control function to set color space info.
* \note Valid ranges: 0..9, default is "UNKNOWN". * \note Valid ranges: 0..9, default is "UNKNOWN".
* 0 = UNKNOWN, * 0 = UNKNOWN,
...@@ -435,7 +440,6 @@ enum aome_enc_control_id { ...@@ -435,7 +440,6 @@ enum aome_enc_control_id {
*/ */
AV1E_SET_TRANSFER_FUNCTION, AV1E_SET_TRANSFER_FUNCTION,
#endif
/*!\brief Codec control function to set chroma 4:2:0 sample position info. /*!\brief Codec control function to set chroma 4:2:0 sample position info.
* \note Valid ranges: 0..3, default is "UNKNOWN". * \note Valid ranges: 0..3, default is "UNKNOWN".
* 0 = UNKNOWN, * 0 = UNKNOWN,
...@@ -874,7 +878,6 @@ AOM_CTRL_USE_TYPE(AV1E_SET_NOISE_SENSITIVITY, unsigned int) ...@@ -874,7 +878,6 @@ AOM_CTRL_USE_TYPE(AV1E_SET_NOISE_SENSITIVITY, unsigned int)
AOM_CTRL_USE_TYPE(AV1E_SET_TUNE_CONTENT, int) /* aom_tune_content */ AOM_CTRL_USE_TYPE(AV1E_SET_TUNE_CONTENT, int) /* aom_tune_content */
#define AOM_CTRL_AV1E_SET_TUNE_CONTENT #define AOM_CTRL_AV1E_SET_TUNE_CONTENT
#if CONFIG_CICP
AOM_CTRL_USE_TYPE(AV1E_SET_COLOR_PRIMARIES, int) AOM_CTRL_USE_TYPE(AV1E_SET_COLOR_PRIMARIES, int)
#define AOM_CTRL_AV1E_SET_COLOR_PRIMARIES #define AOM_CTRL_AV1E_SET_COLOR_PRIMARIES
...@@ -884,14 +887,12 @@ AOM_CTRL_USE_TYPE(AV1E_SET_TRANSFER_CHARACTERISTICS, int) ...@@ -884,14 +887,12 @@ AOM_CTRL_USE_TYPE(AV1E_SET_TRANSFER_CHARACTERISTICS, int)
AOM_CTRL_USE_TYPE(AV1E_SET_MATRIX_COEFFICIENTS, int) AOM_CTRL_USE_TYPE(AV1E_SET_MATRIX_COEFFICIENTS, int)
#define AOM_CTRL_AV1E_SET_MATRIX_COEFFICIENTS #define AOM_CTRL_AV1E_SET_MATRIX_COEFFICIENTS
#else
AOM_CTRL_USE_TYPE(AV1E_SET_COLOR_SPACE, int) AOM_CTRL_USE_TYPE(AV1E_SET_COLOR_SPACE, int)
#define AOM_CTRL_AV1E_SET_COLOR_SPACE #define AOM_CTRL_AV1E_SET_COLOR_SPACE
AOM_CTRL_USE_TYPE(AV1E_SET_TRANSFER_FUNCTION, int) AOM_CTRL_USE_TYPE(AV1E_SET_TRANSFER_FUNCTION, int)
#define AOM_CTRL_AV1E_SET_TRANSFER_FUNCTION #define AOM_CTRL_AV1E_SET_TRANSFER_FUNCTION
#endif
AOM_CTRL_USE_TYPE(AV1E_SET_CHROMA_SAMPLE_POSITION, int) AOM_CTRL_USE_TYPE(AV1E_SET_CHROMA_SAMPLE_POSITION, int)
#define AOM_CTRL_AV1E_SET_CHROMA_SAMPLE_POSITION #define AOM_CTRL_AV1E_SET_CHROMA_SAMPLE_POSITION
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment