diff options
Diffstat (limited to 'aom/aomcx.h')
| -rw-r--r-- | aom/aomcx.h | 53 |
1 files changed, 41 insertions, 12 deletions
diff --git a/aom/aomcx.h b/aom/aomcx.h index 8f129369b..b7d1d9d4b 100644 --- a/aom/aomcx.h +++ b/aom/aomcx.h @@ -191,12 +191,12 @@ enum aome_enc_control_id { /* NOTE: enum 10 unused */ - /*!\brief Codec control function to set encoder scaling mode, - * aom_scaling_mode_t* parameter. + /*!\brief Codec control function to set encoder scaling mode for the next + * frame to be coded, aom_scaling_mode_t* parameter. */ AOME_SET_SCALEMODE = 11, - /*!\brief Codec control function to set encoder spatial layer id, unsigned int + /*!\brief Codec control function to set encoder spatial layer id, int * parameter. */ AOME_SET_SPATIAL_LAYER_ID = 12, @@ -432,7 +432,7 @@ enum aome_enc_control_id { /*!\brief Codec control function to enable error_resilient_mode, int parameter * - * AV1 has a bitstream feature to guarantee parseability of a frame + * AV1 has a bitstream feature to guarantee parsability of a frame * by turning on the error_resilient_decoding mode, even though the * reference buffers are unreliable or not received. * @@ -616,18 +616,19 @@ enum aome_enc_control_id { * point (OP), int parameter * Possible values are in the form of "ABxy". * - AB: OP index. - * - xy: Target level index for the OP. Can be values 0~23 (corresponding to - * level 2.0 ~ 7.3, note levels 2.2, 2.3, 3.2, 3.3, 4.2, 4.3, 7.0, 7.1, 7.2 - * & 7.3 are undefined) or 24 (keep level stats only for level monitoring) - * or 31 (maximum level parameter, no level-based constraints). + * - xy: Target level index for the OP. Can be values 0~27 (corresponding to + * level 2.0 ~ 8.3, note levels 2.2, 2.3, 3.2, 3.3, 4.2 & 4.3 are + * undefined, and that levels 7.x and 8.x are in draft status), 31 + * (maximum parameters level, no level-based constraints) or 32 (keep + * level stats only for level monitoring). * * E.g.: * - "0" means target level index 0 (2.0) for the 0th OP; * - "109" means target level index 9 (4.1) for the 1st OP; * - "1019" means target level index 19 (6.3) for the 10th OP. * - * If the target level is not specified for an OP, the maximum level parameter - * of 31 is used as default. + * If the target level is not specified for an OP, the maximum parameters + * level of 31 is used as default. */ AV1E_SET_TARGET_SEQ_LEVEL_IDX = 54, @@ -1271,7 +1272,7 @@ enum aome_enc_control_id { */ AV1E_SET_SVC_LAYER_ID = 131, - /*!\brief Codec control function to set SVC paramaeters, aom_svc_params_t* + /*!\brief Codec control function to set SVC parameters, aom_svc_params_t* * parameter */ AV1E_SET_SVC_PARAMS = 132, @@ -1455,6 +1456,28 @@ enum aome_enc_control_id { */ AV1E_GET_NUM_OPERATING_POINTS = 156, + /*!\brief Codec control function to skip the application of post-processing + * filters on reconstructed frame, unsigned int parameter + * + * - 0 = disable (default) + * - 1 = enable + * + * \attention For this value to be used aom_codec_enc_cfg_t::g_usage + * must be set to AOM_USAGE_ALL_INTRA. + */ + AV1E_SET_SKIP_POSTPROC_FILTERING = 157, + + /*!\brief Codec control function to enable the superblock level + * qp sweep in AV1 to ensure that end-to-end test runs well, + * unsigned int parameter. + * + * - 0 = disable (default) + * - 1 = enable + * + * \note This is only used in sb_qp_sweep unit test. + */ + AV1E_ENABLE_SB_QP_SWEEP = 158, + // Any new encoder control IDs should be added above. // Maximum allowed encoder control ID is 229. // No encoder control ID should be added below. @@ -1637,7 +1660,7 @@ AOM_CTRL_USE_TYPE(AOME_SET_ACTIVEMAP, aom_active_map_t *) AOM_CTRL_USE_TYPE(AOME_SET_SCALEMODE, aom_scaling_mode_t *) #define AOM_CTRL_AOME_SET_SCALEMODE -AOM_CTRL_USE_TYPE(AOME_SET_SPATIAL_LAYER_ID, unsigned int) +AOM_CTRL_USE_TYPE(AOME_SET_SPATIAL_LAYER_ID, int) #define AOM_CTRL_AOME_SET_SPATIAL_LAYER_ID AOM_CTRL_USE_TYPE(AOME_SET_CPUUSED, int) @@ -2071,6 +2094,12 @@ AOM_CTRL_USE_TYPE(AV1E_GET_TARGET_SEQ_LEVEL_IDX, int *) AOM_CTRL_USE_TYPE(AV1E_GET_NUM_OPERATING_POINTS, int *) #define AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS +AOM_CTRL_USE_TYPE(AV1E_SET_SKIP_POSTPROC_FILTERING, unsigned int) +#define AOM_CTRL_AV1E_SET_SKIP_POSTPROC_FILTERING + +AOM_CTRL_USE_TYPE(AV1E_ENABLE_SB_QP_SWEEP, unsigned int) +#define AOM_CTRL_AV1E_ENABLE_SB_QP_SWEEP + /*!\endcond */ /*! @} - end defgroup aom_encoder */ #ifdef __cplusplus |