diff options
Diffstat (limited to 'third_party/aom/av1/av1_cx_iface.c')
| -rw-r--r-- | third_party/aom/av1/av1_cx_iface.c | 1069 |
1 files changed, 587 insertions, 482 deletions
diff --git a/third_party/aom/av1/av1_cx_iface.c b/third_party/aom/av1/av1_cx_iface.c index 0f6c1c4d7..9d5414c1e 100644 --- a/third_party/aom/av1/av1_cx_iface.c +++ b/third_party/aom/av1/av1_cx_iface.c @@ -11,37 +11,33 @@ #include <stdlib.h> #include <string.h> -#include "./aom_config.h" +#include "config/aom_config.h" +#include "config/aom_version.h" + #include "aom/aom_encoder.h" #include "aom_ports/aom_once.h" #include "aom_ports/system_state.h" #include "aom/internal/aom_codec_internal.h" -#include "./aom_version.h" #include "av1/encoder/encoder.h" #include "aom/aomcx.h" #include "av1/encoder/firstpass.h" #include "av1/av1_iface_common.h" +#include "av1/encoder/bitstream.h" +#include "aom_ports/mem_ops.h" #define MAG_SIZE (4) -#define MAX_INDEX_SIZE (256) +#define MAX_NUM_ENHANCEMENT_LAYERS 3 struct av1_extracfg { int cpu_used; // available cpu percentage in 1/16 + int dev_sf; unsigned int enable_auto_alt_ref; -#if CONFIG_EXT_REFS unsigned int enable_auto_bwd_ref; -#endif // CONFIG_EXT_REFS unsigned int noise_sensitivity; unsigned int sharpness; unsigned int static_thresh; unsigned int tile_columns; // log2 number of tile columns unsigned int tile_rows; // log2 number of tile rows -#if CONFIG_DEPENDENT_HORZTILES - unsigned int dependent_horz_tiles; -#endif -#if CONFIG_LOOPFILTERING_ACROSS_TILES - unsigned int loop_filter_across_tiles_enabled; -#endif // CONFIG_LOOPFILTERING_ACROSS_TILES unsigned int arnr_max_frames; unsigned int arnr_strength; unsigned int min_gf_interval; @@ -52,107 +48,118 @@ struct av1_extracfg { unsigned int rc_max_inter_bitrate_pct; unsigned int gf_cbr_boost_pct; unsigned int lossless; -#if CONFIG_AOM_QM + unsigned int enable_cdef; + unsigned int enable_restoration; + unsigned int disable_trellis_quant; unsigned int enable_qm; + unsigned int qm_y; + unsigned int qm_u; + unsigned int qm_v; unsigned int qm_min; unsigned int qm_max; -#endif #if CONFIG_DIST_8X8 unsigned int enable_dist_8x8; #endif unsigned int num_tg; unsigned int mtu_size; -#if CONFIG_TEMPMV_SIGNALING - unsigned int disable_tempmv; -#endif + + aom_timing_info_type_t timing_info_type; unsigned int frame_parallel_decoding_mode; + int use_dual_filter; AQ_MODE aq_mode; -#if CONFIG_EXT_DELTA_Q DELTAQ_MODE deltaq_mode; -#endif unsigned int frame_periodic_boost; aom_bit_depth_t bit_depth; aom_tune_content content; - aom_color_space_t color_space; - aom_transfer_function_t transfer_function; + aom_color_primaries_t color_primaries; + aom_transfer_characteristics_t transfer_characteristics; + aom_matrix_coefficients_t matrix_coefficients; aom_chroma_sample_position_t chroma_sample_position; int color_range; int render_width; int render_height; aom_superblock_size_t superblock_size; -#if CONFIG_ANS && ANS_MAX_SYMBOLS - int ans_window_size_log2; -#endif -#if CONFIG_EXT_TILE unsigned int single_tile_decoding; -#endif // CONFIG_EXT_TILE + int error_resilient_mode; + int s_frame_mode; + int film_grain_test_vector; + const char *film_grain_table_filename; unsigned int motion_vector_unit_test; + unsigned int cdf_update_mode; + int enable_order_hint; + int enable_jnt_comp; + int enable_ref_frame_mvs; // sequence level + int allow_ref_frame_mvs; // frame level + int enable_warped_motion; // sequence level + int allow_warped_motion; // frame level + int enable_superres; }; static struct av1_extracfg default_extra_cfg = { - 0, // cpu_used - 1, // enable_auto_alt_ref -#if CONFIG_EXT_REFS - 0, // enable_auto_bwd_ref -#endif // CONFIG_EXT_REFS - 0, // noise_sensitivity - 0, // sharpness - 0, // static_thresh - 0, // tile_columns - 0, // tile_rows -#if CONFIG_DEPENDENT_HORZTILES - 0, // Dependent Horizontal tiles -#endif -#if CONFIG_LOOPFILTERING_ACROSS_TILES - 1, // loop_filter_across_tiles_enabled -#endif // CONFIG_LOOPFILTERING_ACROSS_TILES - 7, // arnr_max_frames - 5, // arnr_strength - 0, // min_gf_interval; 0 -> default decision - 0, // max_gf_interval; 0 -> default decision - AOM_TUNE_PSNR, // tuning - 10, // cq_level - 0, // rc_max_intra_bitrate_pct - 0, // rc_max_inter_bitrate_pct - 0, // gf_cbr_boost_pct - 0, // lossless -#if CONFIG_AOM_QM + 0, // cpu_used + 0, // dev_sf + 1, // enable_auto_alt_ref + 0, // enable_auto_bwd_ref + 0, // noise_sensitivity + 0, // sharpness + 0, // static_thresh + 0, // tile_columns + 0, // tile_rows + 7, // arnr_max_frames + 5, // arnr_strength + 0, // min_gf_interval; 0 -> default decision + 0, // max_gf_interval; 0 -> default decision + AOM_TUNE_PSNR, // tuning + 10, // cq_level + 0, // rc_max_intra_bitrate_pct + 0, // rc_max_inter_bitrate_pct + 0, // gf_cbr_boost_pct + 0, // lossless + 1, // enable_cdef + 1, // enable_restoration + 0, // disable_trellis_quant 0, // enable_qm + DEFAULT_QM_Y, // qm_y + DEFAULT_QM_U, // qm_u + DEFAULT_QM_V, // qm_v DEFAULT_QM_FIRST, // qm_min DEFAULT_QM_LAST, // qm_max -#endif #if CONFIG_DIST_8X8 0, #endif - 1, // max number of tile groups - 0, // mtu_size -#if CONFIG_TEMPMV_SIGNALING - 0, // disable temporal mv prediction -#endif - 1, // frame_parallel_decoding_mode - NO_AQ, // aq_mode -#if CONFIG_EXT_DELTA_Q - NO_DELTA_Q, // deltaq_mode -#endif - CONFIG_XIPHRC, // frame_periodic_delta_q + 1, // max number of tile groups + 0, // mtu_size + AOM_TIMING_UNSPECIFIED, // No picture timing signaling in bitstream + 1, // frame_parallel_decoding_mode + 1, // enable dual filter + NO_AQ, // aq_mode + NO_DELTA_Q, // deltaq_mode + 0, // frame_periodic_delta_q AOM_BITS_8, // Bit depth AOM_CONTENT_DEFAULT, // content - AOM_CS_UNKNOWN, // color space - AOM_TF_UNKNOWN, // transfer function + AOM_CICP_CP_UNSPECIFIED, // CICP color space + AOM_CICP_TC_UNSPECIFIED, // CICP transfer characteristics + AOM_CICP_MC_UNSPECIFIED, // CICP matrix coefficients AOM_CSP_UNKNOWN, // chroma sample position 0, // color range 0, // render width 0, // render height AOM_SUPERBLOCK_SIZE_DYNAMIC, // superblock_size -#if CONFIG_ANS && ANS_MAX_SYMBOLS - 23, // ans_window_size_log2 -#endif -#if CONFIG_EXT_TILE - 0, // Single tile decoding is off by default. -#endif // CONFIG_EXT_TILE - - 0, // motion_vector_unit_test + 0, // Single tile decoding is off by default. + 0, // error_resilient_mode off by default. + 0, // s_frame_mode off by default. + 0, // film_grain_test_vector + 0, // film_grain_table_filename + 0, // motion_vector_unit_test + 1, // CDF update mode + 1, // frame order hint + 1, // jnt_comp + 1, // enable_ref_frame_mvs sequence level + 1, // allow ref_frame_mvs frame level + 1, // enable_warped_motion at sequence level + 1, // allow_warped_motion at frame level + 1, // superres }; struct aom_codec_alg_priv { @@ -204,11 +211,6 @@ static aom_codec_err_t update_error_state( if (!((p)->memb <= (hi))) ERROR(#memb " out of range [.." #hi "]"); \ } while (0) -#define RANGE_CHECK_LO(p, memb, lo) \ - do { \ - if (!((p)->memb >= (lo))) ERROR(#memb " out of range [" #lo "..]"); \ - } while (0) - #define RANGE_CHECK_BOOL(p, memb) \ do { \ if (!!((p)->memb) != (p)->memb) ERROR(#memb " expected boolean"); \ @@ -221,15 +223,13 @@ static aom_codec_err_t validate_config(aom_codec_alg_priv_t *ctx, RANGE_CHECK(cfg, g_h, 1, 65535); // 16 bits available RANGE_CHECK(cfg, g_timebase.den, 1, 1000000000); RANGE_CHECK(cfg, g_timebase.num, 1, cfg->g_timebase.den); - RANGE_CHECK_HI(cfg, g_profile, 3); + RANGE_CHECK_HI(cfg, g_profile, MAX_PROFILES - 1); RANGE_CHECK_HI(cfg, rc_max_quantizer, 63); RANGE_CHECK_HI(cfg, rc_min_quantizer, cfg->rc_max_quantizer); RANGE_CHECK_BOOL(extra_cfg, lossless); RANGE_CHECK_HI(extra_cfg, aq_mode, AQ_MODE_COUNT - 1); -#if CONFIG_EXT_DELTA_Q RANGE_CHECK_HI(extra_cfg, deltaq_mode, DELTAQ_MODE_COUNT - 1); -#endif RANGE_CHECK_HI(extra_cfg, frame_periodic_boost, 1); RANGE_CHECK_HI(cfg, g_threads, 64); RANGE_CHECK_HI(cfg, g_lag_in_frames, MAX_LAG_BUFFERS); @@ -255,7 +255,6 @@ static aom_codec_err_t validate_config(aom_codec_alg_priv_t *ctx, SCALE_NUMERATOR << 1); RANGE_CHECK(cfg, rc_resize_kf_denominator, SCALE_NUMERATOR, SCALE_NUMERATOR << 1); -#if CONFIG_FRAME_SUPERRES RANGE_CHECK_HI(cfg, rc_superres_mode, SUPERRES_MODES - 1); RANGE_CHECK(cfg, rc_superres_denominator, SCALE_NUMERATOR, SCALE_NUMERATOR << 1); @@ -263,7 +262,7 @@ static aom_codec_err_t validate_config(aom_codec_alg_priv_t *ctx, SCALE_NUMERATOR << 1); RANGE_CHECK(cfg, rc_superres_qthresh, 1, 63); RANGE_CHECK(cfg, rc_superres_kf_qthresh, 1, 63); -#endif // CONFIG_FRAME_SUPERRES + RANGE_CHECK_HI(extra_cfg, cdf_update_mode, 2); // AV1 does not support a lower bound on the keyframe interval in // automatic keyframe placement mode. @@ -275,53 +274,25 @@ static aom_codec_err_t validate_config(aom_codec_alg_priv_t *ctx, RANGE_CHECK_HI(extra_cfg, motion_vector_unit_test, 2); RANGE_CHECK_HI(extra_cfg, enable_auto_alt_ref, 2); -#if CONFIG_EXT_REFS RANGE_CHECK_HI(extra_cfg, enable_auto_bwd_ref, 2); -#endif // CONFIG_EXT_REFS RANGE_CHECK(extra_cfg, cpu_used, 0, 8); + RANGE_CHECK(extra_cfg, dev_sf, 0, UINT8_MAX); RANGE_CHECK_HI(extra_cfg, noise_sensitivity, 6); RANGE_CHECK(extra_cfg, superblock_size, AOM_SUPERBLOCK_SIZE_64X64, AOM_SUPERBLOCK_SIZE_DYNAMIC); -#if CONFIG_EXT_TILE RANGE_CHECK_HI(cfg, large_scale_tile, 1); RANGE_CHECK_HI(extra_cfg, single_tile_decoding, 1); - if (cfg->large_scale_tile) { -// TODO(any): Waring. If CONFIG_EXT_TILE is true, tile_columns really -// means tile_width, and tile_rows really means tile_hight. The interface -// should be sanitized. -#if CONFIG_EXT_PARTITION - if (extra_cfg->superblock_size != AOM_SUPERBLOCK_SIZE_64X64) { - if (extra_cfg->tile_columns != 0) - RANGE_CHECK(extra_cfg, tile_columns, 1, 32); - if (extra_cfg->tile_rows != 0) RANGE_CHECK(extra_cfg, tile_rows, 1, 32); - } else { -#endif // CONFIG_EXT_PARTITION - if (extra_cfg->tile_columns != 0) - RANGE_CHECK(extra_cfg, tile_columns, 1, 64); - if (extra_cfg->tile_rows != 0) RANGE_CHECK(extra_cfg, tile_rows, 1, 64); -#if CONFIG_EXT_PARTITION - } -#endif // CONFIG_EXT_PARTITION - } else { -#endif // CONFIG_EXT_TILE -#if CONFIG_MAX_TILE - RANGE_CHECK_HI(extra_cfg, tile_columns, 6); - RANGE_CHECK_HI(extra_cfg, tile_rows, 6); -#else // CONFIG_MAX_TILE RANGE_CHECK_HI(extra_cfg, tile_columns, 6); - RANGE_CHECK_HI(extra_cfg, tile_rows, 2); -#endif // CONFIG_MAX_TILE -#if CONFIG_EXT_TILE - } -#endif // CONFIG_EXT_TILE + RANGE_CHECK_HI(extra_cfg, tile_rows, 6); + + RANGE_CHECK_HI(cfg, monochrome, 1); + + if (cfg->large_scale_tile && extra_cfg->aq_mode) + ERROR( + "Adaptive quantization are not supported in large scale tile " + "coding."); -#if CONFIG_DEPENDENT_HORZTILES - RANGE_CHECK_HI(extra_cfg, dependent_horz_tiles, 1); -#endif -#if CONFIG_LOOPFILTERING_ACROSS_TILES - RANGE_CHECK_HI(extra_cfg, loop_filter_across_tiles_enabled, 1); -#endif // CONFIG_LOOPFILTERING_ACROSS_TILES RANGE_CHECK_HI(extra_cfg, sharpness, 7); RANGE_CHECK_HI(extra_cfg, arnr_max_frames, 15); RANGE_CHECK_HI(extra_cfg, arnr_strength, 6); @@ -334,25 +305,14 @@ static aom_codec_err_t validate_config(aom_codec_alg_priv_t *ctx, if (extra_cfg->tuning == AOM_TUNE_SSIM) ERROR("Option --tune=ssim is not currently supported in AV1."); -// TODO(anybody) : remove this flag when PVQ supports pallete coding tool -#if CONFIG_PVQ - if (extra_cfg->content == AOM_CONTENT_SCREEN) - ERROR( - "Option --tune-content=screen is not currently supported when PVQ is " - "enabled."); -#endif // CONFIG_PVQ - if (cfg->g_pass == AOM_RC_LAST_PASS) { -#if !CONFIG_XIPHRC const size_t packet_sz = sizeof(FIRSTPASS_STATS); const int n_packets = (int)(cfg->rc_twopass_stats_in.sz / packet_sz); const FIRSTPASS_STATS *stats; -#endif if (cfg->rc_twopass_stats_in.buf == NULL) ERROR("rc_twopass_stats_in.buf not set."); -#if !CONFIG_XIPHRC if (cfg->rc_twopass_stats_in.sz % packet_sz) ERROR("rc_twopass_stats_in.sz indicates truncated packet."); @@ -364,37 +324,46 @@ static aom_codec_err_t validate_config(aom_codec_alg_priv_t *ctx, if ((int)(stats->count + 0.5) != n_packets - 1) ERROR("rc_twopass_stats_in missing EOS stats packet"); -#endif } -#if !CONFIG_HIGHBITDEPTH - if (cfg->g_profile > (unsigned int)PROFILE_1) { - ERROR("Profile > 1 not supported in this build configuration"); - } -#endif if (cfg->g_profile <= (unsigned int)PROFILE_1 && - cfg->g_bit_depth > AOM_BITS_8) { - ERROR("Codec high bit-depth not supported in profile < 2"); - } - if (cfg->g_profile <= (unsigned int)PROFILE_1 && cfg->g_input_bit_depth > 8) { - ERROR("Source high bit-depth not supported in profile < 2"); + cfg->g_bit_depth > AOM_BITS_10) { + ERROR("Codec bit-depth 12 not supported in profile < 2"); } - if (cfg->g_profile > (unsigned int)PROFILE_1 && - cfg->g_bit_depth == AOM_BITS_8) { - ERROR("Codec bit-depth 8 not supported in profile > 1"); + if (cfg->g_profile <= (unsigned int)PROFILE_1 && + cfg->g_input_bit_depth > 10) { + ERROR("Source bit-depth 12 not supported in profile < 2"); } -#if CONFIG_COLORSPACE_HEADERS - RANGE_CHECK(extra_cfg, color_space, AOM_CS_UNKNOWN, AOM_CS_ICTCP); - RANGE_CHECK(extra_cfg, transfer_function, AOM_TF_UNKNOWN, AOM_TF_HLG); - RANGE_CHECK(extra_cfg, chroma_sample_position, AOM_CSP_UNKNOWN, - AOM_CSP_COLOCATED); + + RANGE_CHECK(extra_cfg, color_primaries, AOM_CICP_CP_BT_709, + AOM_CICP_CP_EBU_3213); // Need to check range more precisely to + // check for reserved values? + 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); + RANGE_CHECK(extra_cfg, color_range, 0, 1); + +#if CONFIG_DIST_8X8 + RANGE_CHECK(extra_cfg, tuning, AOM_TUNE_PSNR, AOM_TUNE_DAALA_DIST); #else - RANGE_CHECK(extra_cfg, color_space, AOM_CS_UNKNOWN, AOM_CS_SRGB); + RANGE_CHECK(extra_cfg, tuning, AOM_TUNE_PSNR, AOM_TUNE_SSIM); #endif - RANGE_CHECK(extra_cfg, color_range, 0, 1); -#if CONFIG_ANS && ANS_MAX_SYMBOLS - RANGE_CHECK(extra_cfg, ans_window_size_log2, 8, 23); + + RANGE_CHECK(extra_cfg, timing_info_type, AOM_TIMING_UNSPECIFIED, + AOM_TIMING_DEC_MODEL); + + RANGE_CHECK(extra_cfg, film_grain_test_vector, 0, 16); + + if (extra_cfg->lossless) { + if (extra_cfg->aq_mode != 0) + ERROR("Only --aq_mode=0 can be used with --lossless=1."); +#if CONFIG_DIST_8X8 + if (extra_cfg->enable_dist_8x8) + ERROR("dist-8x8 cannot be used with lossless compression."); #endif + } + return AOM_CODEC_OK; } @@ -404,23 +373,17 @@ static aom_codec_err_t validate_img(aom_codec_alg_priv_t *ctx, case AOM_IMG_FMT_YV12: case AOM_IMG_FMT_I420: case AOM_IMG_FMT_I42016: break; - case AOM_IMG_FMT_I422: case AOM_IMG_FMT_I444: - case AOM_IMG_FMT_I440: - if (ctx->cfg.g_profile != (unsigned int)PROFILE_1) { - ERROR( - "Invalid image format. I422, I444, I440 images are " - "not supported in profile."); + case AOM_IMG_FMT_I44416: + if (ctx->cfg.g_profile == (unsigned int)PROFILE_0 && + !ctx->cfg.monochrome) { + ERROR("Invalid image format. I444 images not supported in profile."); } break; + case AOM_IMG_FMT_I422: case AOM_IMG_FMT_I42216: - case AOM_IMG_FMT_I44416: - case AOM_IMG_FMT_I44016: - if (ctx->cfg.g_profile != (unsigned int)PROFILE_1 && - ctx->cfg.g_profile != (unsigned int)PROFILE_3) { - ERROR( - "Invalid image format. 16-bit I422, I444, I440 images are " - "not supported in profile."); + if (ctx->cfg.g_profile != (unsigned int)PROFILE_2) { + ERROR("Invalid image format. I422 images not supported in profile."); } break; default: @@ -442,31 +405,74 @@ static int get_image_bps(const aom_image_t *img) { case AOM_IMG_FMT_I420: return 12; case AOM_IMG_FMT_I422: return 16; case AOM_IMG_FMT_I444: return 24; - case AOM_IMG_FMT_I440: return 16; case AOM_IMG_FMT_I42016: return 24; case AOM_IMG_FMT_I42216: return 32; case AOM_IMG_FMT_I44416: return 48; - case AOM_IMG_FMT_I44016: return 32; default: assert(0 && "Invalid image format"); break; } return 0; } +// Set appropriate options to disable frame super-resolution. +static void disable_superres(AV1EncoderConfig *const oxcf) { + oxcf->superres_mode = SUPERRES_NONE; + oxcf->superres_scale_denominator = SCALE_NUMERATOR; + oxcf->superres_kf_scale_denominator = SCALE_NUMERATOR; + oxcf->superres_qthresh = 255; + oxcf->superres_kf_qthresh = 255; +} + static aom_codec_err_t set_encoder_config( AV1EncoderConfig *oxcf, const aom_codec_enc_cfg_t *cfg, const struct av1_extracfg *extra_cfg) { const int is_vbr = cfg->rc_end_usage == AOM_VBR; oxcf->profile = cfg->g_profile; + oxcf->fwd_kf_enabled = cfg->fwd_kf_enabled; oxcf->max_threads = (int)cfg->g_threads; oxcf->width = cfg->g_w; oxcf->height = cfg->g_h; + oxcf->forced_max_frame_width = cfg->g_forced_max_frame_width; + oxcf->forced_max_frame_height = cfg->g_forced_max_frame_height; oxcf->bit_depth = cfg->g_bit_depth; oxcf->input_bit_depth = cfg->g_input_bit_depth; // guess a frame rate if out of whack, use 30 oxcf->init_framerate = (double)cfg->g_timebase.den / cfg->g_timebase.num; - if (oxcf->init_framerate > 180) oxcf->init_framerate = 30; - + if (extra_cfg->timing_info_type == AOM_TIMING_EQUAL || + extra_cfg->timing_info_type == AOM_TIMING_DEC_MODEL) { + oxcf->timing_info_present = 1; + oxcf->timing_info.num_units_in_display_tick = cfg->g_timebase.num; + oxcf->timing_info.time_scale = cfg->g_timebase.den; + oxcf->timing_info.num_ticks_per_picture = 1; + } else { + oxcf->timing_info_present = 0; + } + if (extra_cfg->timing_info_type == AOM_TIMING_EQUAL) { + oxcf->timing_info.equal_picture_interval = 1; + oxcf->decoder_model_info_present_flag = 0; + oxcf->display_model_info_present_flag = 1; + } else if (extra_cfg->timing_info_type == AOM_TIMING_DEC_MODEL) { + // if( extra_cfg->arnr_strength > 0 ) + // { + // printf("Only --arnr-strength=0 can currently be used with + // --timing-info=model."); return AOM_CODEC_INVALID_PARAM; + // } + // if( extra_cfg->enable_superres) + // { + // printf("Only --superres-mode=0 can currently be used with + // --timing-info=model."); return AOM_CODEC_INVALID_PARAM; + // } + oxcf->buffer_model.num_units_in_decoding_tick = cfg->g_timebase.num; + oxcf->timing_info.equal_picture_interval = 0; + oxcf->decoder_model_info_present_flag = 1; + oxcf->buffer_removal_delay_present = 1; + oxcf->display_model_info_present_flag = 1; + } + if (oxcf->init_framerate > 180) { + oxcf->init_framerate = 30; + oxcf->timing_info_present = 0; + } oxcf->mode = GOOD; + oxcf->cfg = &cfg->cfg; switch (cfg->g_pass) { case AOM_RC_ONE_PASS: oxcf->pass = 0; break; @@ -491,11 +497,15 @@ static aom_codec_err_t set_encoder_config( oxcf->cq_level = av1_quantizer_to_qindex(extra_cfg->cq_level); oxcf->fixed_q = -1; -#if CONFIG_AOM_QM + oxcf->enable_cdef = extra_cfg->enable_cdef; + oxcf->enable_restoration = extra_cfg->enable_restoration; + oxcf->disable_trellis_quant = extra_cfg->disable_trellis_quant; oxcf->using_qm = extra_cfg->enable_qm; + oxcf->qm_y = extra_cfg->qm_y; + oxcf->qm_u = extra_cfg->qm_u; + oxcf->qm_v = extra_cfg->qm_v; oxcf->qm_minlevel = extra_cfg->qm_min; oxcf->qm_maxlevel = extra_cfg->qm_max; -#endif #if CONFIG_DIST_8X8 oxcf->using_dist_8x8 = extra_cfg->enable_dist_8x8; if (extra_cfg->tuning == AOM_TUNE_CDEF_DIST || @@ -503,15 +513,16 @@ static aom_codec_err_t set_encoder_config( oxcf->using_dist_8x8 = 1; #endif oxcf->num_tile_groups = extra_cfg->num_tg; -#if CONFIG_EXT_TILE // In large-scale tile encoding mode, num_tile_groups is always 1. if (cfg->large_scale_tile) oxcf->num_tile_groups = 1; -#endif // CONFIG_EXT_TILE oxcf->mtu = extra_cfg->mtu_size; -#if CONFIG_TEMPMV_SIGNALING - oxcf->disable_tempmv = extra_cfg->disable_tempmv; -#endif + // FIXME(debargha): Should this be: + // oxcf->allow_ref_frame_mvs = extra_cfg->allow_ref_frame_mvs & + // extra_cfg->enable_order_hint ? + // Disallow using temporal MVs while large_scale_tile = 1. + oxcf->allow_ref_frame_mvs = + extra_cfg->allow_ref_frame_mvs && !cfg->large_scale_tile; oxcf->under_shoot_pct = cfg->rc_undershoot_pct; oxcf->over_shoot_pct = cfg->rc_overshoot_pct; @@ -523,26 +534,26 @@ static aom_codec_err_t set_encoder_config( oxcf->resize_kf_scale_denominator == SCALE_NUMERATOR) oxcf->resize_mode = RESIZE_NONE; -#if CONFIG_FRAME_SUPERRES - oxcf->superres_mode = (SUPERRES_MODE)cfg->rc_superres_mode; - oxcf->superres_scale_denominator = (uint8_t)cfg->rc_superres_denominator; - oxcf->superres_kf_scale_denominator = - (uint8_t)cfg->rc_superres_kf_denominator; - oxcf->superres_qthresh = - extra_cfg->lossless ? 255 - : av1_quantizer_to_qindex(cfg->rc_superres_qthresh); - oxcf->superres_kf_qthresh = - extra_cfg->lossless - ? 255 - : av1_quantizer_to_qindex(cfg->rc_superres_kf_qthresh); - if (oxcf->superres_mode == SUPERRES_FIXED && - oxcf->superres_scale_denominator == SCALE_NUMERATOR && - oxcf->superres_kf_scale_denominator == SCALE_NUMERATOR) - oxcf->superres_mode = SUPERRES_NONE; - if (oxcf->superres_mode == SUPERRES_QTHRESH && - oxcf->superres_qthresh == 255 && oxcf->superres_kf_qthresh == 255) - oxcf->superres_mode = SUPERRES_NONE; -#endif // CONFIG_FRAME_SUPERRES + if (extra_cfg->lossless || cfg->large_scale_tile) { + disable_superres(oxcf); + } else { + oxcf->superres_mode = (SUPERRES_MODE)cfg->rc_superres_mode; + oxcf->superres_scale_denominator = (uint8_t)cfg->rc_superres_denominator; + oxcf->superres_kf_scale_denominator = + (uint8_t)cfg->rc_superres_kf_denominator; + oxcf->superres_qthresh = av1_quantizer_to_qindex(cfg->rc_superres_qthresh); + oxcf->superres_kf_qthresh = + av1_quantizer_to_qindex(cfg->rc_superres_kf_qthresh); + if (oxcf->superres_mode == SUPERRES_FIXED && + oxcf->superres_scale_denominator == SCALE_NUMERATOR && + oxcf->superres_kf_scale_denominator == SCALE_NUMERATOR) { + disable_superres(oxcf); + } + if (oxcf->superres_mode == SUPERRES_QTHRESH && + oxcf->superres_qthresh == 255 && oxcf->superres_kf_qthresh == 255) { + disable_superres(oxcf); + } + } oxcf->maximum_buffer_size_ms = is_vbr ? 240000 : cfg->rc_buf_sz; oxcf->starting_buffer_level_ms = is_vbr ? 60000 : cfg->rc_buf_initial_sz; @@ -558,12 +569,13 @@ static aom_codec_err_t set_encoder_config( cfg->kf_mode == AOM_KF_AUTO && cfg->kf_min_dist != cfg->kf_max_dist; oxcf->key_freq = cfg->kf_max_dist; - + oxcf->sframe_dist = cfg->sframe_dist; + oxcf->sframe_mode = cfg->sframe_mode; + oxcf->sframe_enabled = cfg->sframe_dist != 0; oxcf->speed = extra_cfg->cpu_used; + oxcf->dev_sf = extra_cfg->dev_sf; oxcf->enable_auto_arf = extra_cfg->enable_auto_alt_ref; -#if CONFIG_EXT_REFS oxcf->enable_auto_brf = extra_cfg->enable_auto_bwd_ref; -#endif // CONFIG_EXT_REFS oxcf->noise_sensitivity = extra_cfg->noise_sensitivity; oxcf->sharpness = extra_cfg->sharpness; @@ -573,64 +585,68 @@ static aom_codec_err_t set_encoder_config( oxcf->firstpass_mb_stats_in = cfg->rc_firstpass_mb_stats_in; #endif - oxcf->color_space = extra_cfg->color_space; - -#if CONFIG_COLORSPACE_HEADERS - oxcf->transfer_function = extra_cfg->transfer_function; + oxcf->color_primaries = extra_cfg->color_primaries; + oxcf->transfer_characteristics = extra_cfg->transfer_characteristics; + oxcf->matrix_coefficients = extra_cfg->matrix_coefficients; oxcf->chroma_sample_position = extra_cfg->chroma_sample_position; -#else - if (extra_cfg->transfer_function != AOM_TF_UNKNOWN) - return AOM_CODEC_UNSUP_FEATURE; - if (extra_cfg->chroma_sample_position != AOM_CSP_UNKNOWN) - return AOM_CODEC_UNSUP_FEATURE; -#endif oxcf->color_range = extra_cfg->color_range; oxcf->render_width = extra_cfg->render_width; oxcf->render_height = extra_cfg->render_height; oxcf->arnr_max_frames = extra_cfg->arnr_max_frames; + // Adjust g_lag_in_frames down if not needed + oxcf->lag_in_frames = + AOMMIN(MAX_GF_INTERVAL + oxcf->arnr_max_frames / 2, oxcf->lag_in_frames); oxcf->arnr_strength = extra_cfg->arnr_strength; oxcf->min_gf_interval = extra_cfg->min_gf_interval; oxcf->max_gf_interval = extra_cfg->max_gf_interval; oxcf->tuning = extra_cfg->tuning; oxcf->content = extra_cfg->content; - -#if CONFIG_EXT_PARTITION + oxcf->cdf_update_mode = (uint8_t)extra_cfg->cdf_update_mode; oxcf->superblock_size = extra_cfg->superblock_size; -#endif // CONFIG_EXT_PARTITION -#if CONFIG_ANS && ANS_MAX_SYMBOLS - oxcf->ans_window_size_log2 = extra_cfg->ans_window_size_log2; -#endif // CONFIG_ANS && ANS_MAX_SYMBOLS - -#if CONFIG_EXT_TILE + if (cfg->large_scale_tile) { + oxcf->film_grain_test_vector = 0; + oxcf->film_grain_table_filename = NULL; + } else { + oxcf->film_grain_test_vector = extra_cfg->film_grain_test_vector; + oxcf->film_grain_table_filename = extra_cfg->film_grain_table_filename; + } oxcf->large_scale_tile = cfg->large_scale_tile; oxcf->single_tile_decoding = (oxcf->large_scale_tile) ? extra_cfg->single_tile_decoding : 0; if (oxcf->large_scale_tile) { -#if CONFIG_EXT_PARTITION - const unsigned int max = - extra_cfg->superblock_size == AOM_SUPERBLOCK_SIZE_64X64 ? 64 : 32; -#else - const unsigned int max = 64; -#endif // CONFIG_EXT_PARTITION - // If tile size is not set, set it to the default value. - const unsigned int tc = - (!extra_cfg->tile_columns) ? UINT_MAX : extra_cfg->tile_columns; - const unsigned int tr = - (!extra_cfg->tile_rows) ? UINT_MAX : extra_cfg->tile_rows; - - oxcf->tile_columns = AOMMIN(tc, max); - oxcf->tile_rows = AOMMIN(tr, max); - } else { -#endif // CONFIG_EXT_TILE - oxcf->tile_columns = extra_cfg->tile_columns; - oxcf->tile_rows = extra_cfg->tile_rows; -#if CONFIG_EXT_TILE + // The superblock_size can only be AOM_SUPERBLOCK_SIZE_64X64 or + // AOM_SUPERBLOCK_SIZE_128X128 while oxcf->large_scale_tile = 1. If + // superblock_size = AOM_SUPERBLOCK_SIZE_DYNAMIC, hard set it to + // AOM_SUPERBLOCK_SIZE_64X64(default value in large_scale_tile). + if (extra_cfg->superblock_size != AOM_SUPERBLOCK_SIZE_64X64 && + extra_cfg->superblock_size != AOM_SUPERBLOCK_SIZE_128X128) + oxcf->superblock_size = AOM_SUPERBLOCK_SIZE_64X64; + } + + oxcf->tile_columns = extra_cfg->tile_columns; + oxcf->tile_rows = extra_cfg->tile_rows; + + oxcf->monochrome = cfg->monochrome; + oxcf->full_still_picture_hdr = cfg->full_still_picture_hdr; + oxcf->enable_dual_filter = extra_cfg->use_dual_filter; + oxcf->enable_order_hint = extra_cfg->enable_order_hint; + oxcf->enable_jnt_comp = + extra_cfg->enable_jnt_comp & extra_cfg->enable_order_hint; + oxcf->enable_ref_frame_mvs = + extra_cfg->enable_ref_frame_mvs & extra_cfg->enable_order_hint; + + oxcf->enable_warped_motion = extra_cfg->enable_warped_motion; + oxcf->allow_warped_motion = + extra_cfg->allow_warped_motion & extra_cfg->enable_warped_motion; + + oxcf->enable_superres = + (oxcf->superres_mode != SUPERRES_NONE) && extra_cfg->enable_superres; + if (!oxcf->enable_superres) { + disable_superres(oxcf); } -#endif // CONFIG_EXT_TILE -#if CONFIG_MAX_TILE oxcf->tile_width_count = AOMMIN(cfg->tile_width_count, MAX_TILE_COLS); oxcf->tile_height_count = AOMMIN(cfg->tile_height_count, MAX_TILE_ROWS); for (int i = 0; i < oxcf->tile_width_count; i++) { @@ -639,25 +655,28 @@ static aom_codec_err_t set_encoder_config( for (int i = 0; i < oxcf->tile_height_count; i++) { oxcf->tile_heights[i] = AOMMAX(cfg->tile_heights[i], 1); } -#endif -#if CONFIG_DEPENDENT_HORZTILES - oxcf->dependent_horz_tiles = -#if CONFIG_EXT_TILE - (cfg->large_scale_tile) ? 0 : -#endif // CONFIG_EXT_TILE - extra_cfg->dependent_horz_tiles; -#endif -#if CONFIG_LOOPFILTERING_ACROSS_TILES - oxcf->loop_filter_across_tiles_enabled = - extra_cfg->loop_filter_across_tiles_enabled; -#endif // CONFIG_LOOPFILTERING_ACROSS_TILES - oxcf->error_resilient_mode = cfg->g_error_resilient; + oxcf->error_resilient_mode = + cfg->g_error_resilient | extra_cfg->error_resilient_mode; + oxcf->s_frame_mode = extra_cfg->s_frame_mode; oxcf->frame_parallel_decoding_mode = extra_cfg->frame_parallel_decoding_mode; + if (cfg->g_pass == AOM_RC_LAST_PASS) { + const size_t packet_sz = sizeof(FIRSTPASS_STATS); + const int n_packets = (int)(cfg->rc_twopass_stats_in.sz / packet_sz); + oxcf->limit = n_packets - 1; + } else { + oxcf->limit = cfg->g_limit; + } + + if (oxcf->limit == 1) { + // still picture mode, display model and timing is meaningless + oxcf->display_model_info_present_flag = 0; + oxcf->timing_info_present = 0; + } oxcf->aq_mode = extra_cfg->aq_mode; -#if CONFIG_EXT_DELTA_Q oxcf->deltaq_mode = extra_cfg->deltaq_mode; -#endif + + oxcf->save_as_annexb = cfg->save_as_annexb; oxcf->frame_periodic_boost = extra_cfg->frame_periodic_boost; oxcf->motion_vector_unit_test = extra_cfg->motion_vector_unit_test; @@ -734,6 +753,12 @@ static aom_codec_err_t ctrl_set_cpuused(aom_codec_alg_priv_t *ctx, return update_extra_cfg(ctx, &extra_cfg); } +static aom_codec_err_t ctrl_set_devsf(aom_codec_alg_priv_t *ctx, va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.dev_sf = CAST(AOME_SET_DEVSF, args); + return update_extra_cfg(ctx, &extra_cfg); +} + static aom_codec_err_t ctrl_set_enable_auto_alt_ref(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; @@ -741,14 +766,12 @@ static aom_codec_err_t ctrl_set_enable_auto_alt_ref(aom_codec_alg_priv_t *ctx, return update_extra_cfg(ctx, &extra_cfg); } -#if CONFIG_EXT_REFS static aom_codec_err_t ctrl_set_enable_auto_bwd_ref(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; extra_cfg.enable_auto_bwd_ref = CAST(AOME_SET_ENABLEAUTOBWDREF, args); return update_extra_cfg(ctx, &extra_cfg); } -#endif // CONFIG_EXT_REFS static aom_codec_err_t ctrl_set_noise_sensitivity(aom_codec_alg_priv_t *ctx, va_list args) { @@ -785,24 +808,6 @@ static aom_codec_err_t ctrl_set_tile_rows(aom_codec_alg_priv_t *ctx, return update_extra_cfg(ctx, &extra_cfg); } -#if CONFIG_DEPENDENT_HORZTILES -static aom_codec_err_t ctrl_set_tile_dependent_rows(aom_codec_alg_priv_t *ctx, - va_list args) { - struct av1_extracfg extra_cfg = ctx->extra_cfg; - extra_cfg.dependent_horz_tiles = CAST(AV1E_SET_TILE_DEPENDENT_ROWS, args); - return update_extra_cfg(ctx, &extra_cfg); -} -#endif -#if CONFIG_LOOPFILTERING_ACROSS_TILES -static aom_codec_err_t ctrl_set_tile_loopfilter(aom_codec_alg_priv_t *ctx, - va_list args) { - struct av1_extracfg extra_cfg = ctx->extra_cfg; - extra_cfg.loop_filter_across_tiles_enabled = - CAST(AV1E_SET_TILE_LOOPFILTER, args); - return update_extra_cfg(ctx, &extra_cfg); -} -#endif // CONFIG_LOOPFILTERING_ACROSS_TILES - static aom_codec_err_t ctrl_set_arnr_max_frames(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; @@ -861,14 +866,48 @@ static aom_codec_err_t ctrl_set_lossless(aom_codec_alg_priv_t *ctx, return update_extra_cfg(ctx, &extra_cfg); } -#if CONFIG_AOM_QM +static aom_codec_err_t ctrl_set_enable_cdef(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.enable_cdef = CAST(AV1E_SET_ENABLE_CDEF, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_enable_restoration(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.enable_restoration = CAST(AV1E_SET_ENABLE_RESTORATION, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_disable_trellis_quant(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.disable_trellis_quant = CAST(AV1E_SET_DISABLE_TRELLIS_QUANT, args); + return update_extra_cfg(ctx, &extra_cfg); +} + static aom_codec_err_t ctrl_set_enable_qm(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; extra_cfg.enable_qm = CAST(AV1E_SET_ENABLE_QM, args); return update_extra_cfg(ctx, &extra_cfg); } - +static aom_codec_err_t ctrl_set_qm_y(aom_codec_alg_priv_t *ctx, va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.qm_y = CAST(AV1E_SET_QM_Y, args); + return update_extra_cfg(ctx, &extra_cfg); +} +static aom_codec_err_t ctrl_set_qm_u(aom_codec_alg_priv_t *ctx, va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.qm_u = CAST(AV1E_SET_QM_U, args); + return update_extra_cfg(ctx, &extra_cfg); +} +static aom_codec_err_t ctrl_set_qm_v(aom_codec_alg_priv_t *ctx, va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.qm_v = CAST(AV1E_SET_QM_V, args); + return update_extra_cfg(ctx, &extra_cfg); +} static aom_codec_err_t ctrl_set_qm_min(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; @@ -882,7 +921,6 @@ static aom_codec_err_t ctrl_set_qm_max(aom_codec_alg_priv_t *ctx, extra_cfg.qm_max = CAST(AV1E_SET_QM_MAX, args); return update_extra_cfg(ctx, &extra_cfg); } -#endif #if CONFIG_DIST_8X8 static aom_codec_err_t ctrl_set_enable_dist_8x8(aom_codec_alg_priv_t *ctx, va_list args) { @@ -903,14 +941,83 @@ static aom_codec_err_t ctrl_set_mtu(aom_codec_alg_priv_t *ctx, va_list args) { extra_cfg.mtu_size = CAST(AV1E_SET_MTU, args); return update_extra_cfg(ctx, &extra_cfg); } -#if CONFIG_TEMPMV_SIGNALING -static aom_codec_err_t ctrl_set_disable_tempmv(aom_codec_alg_priv_t *ctx, - va_list args) { +static aom_codec_err_t ctrl_set_timing_info_type(aom_codec_alg_priv_t *ctx, + va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; - extra_cfg.disable_tempmv = CAST(AV1E_SET_DISABLE_TEMPMV, args); + extra_cfg.timing_info_type = CAST(AV1E_SET_TIMING_INFO_TYPE, args); return update_extra_cfg(ctx, &extra_cfg); } -#endif + +static aom_codec_err_t ctrl_set_enable_df(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.use_dual_filter = CAST(AV1E_SET_ENABLE_DF, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_enable_order_hint(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.enable_order_hint = CAST(AV1E_SET_ENABLE_ORDER_HINT, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_enable_jnt_comp(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.enable_jnt_comp = CAST(AV1E_SET_ENABLE_JNT_COMP, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_enable_ref_frame_mvs(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.enable_ref_frame_mvs = CAST(AV1E_SET_ENABLE_REF_FRAME_MVS, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_allow_ref_frame_mvs(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.allow_ref_frame_mvs = CAST(AV1E_SET_ALLOW_REF_FRAME_MVS, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_enable_warped_motion(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.enable_warped_motion = CAST(AV1E_SET_ENABLE_WARPED_MOTION, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_allow_warped_motion(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.allow_warped_motion = CAST(AV1E_SET_ALLOW_WARPED_MOTION, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_enable_superres(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.enable_superres = CAST(AV1E_SET_ENABLE_SUPERRES, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_error_resilient_mode(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.error_resilient_mode = CAST(AV1E_SET_ERROR_RESILIENT_MODE, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_s_frame_mode(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.s_frame_mode = CAST(AV1E_SET_S_FRAME_MODE, args); + return update_extra_cfg(ctx, &extra_cfg); +} + static aom_codec_err_t ctrl_set_frame_parallel_decoding_mode( aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; @@ -919,14 +1026,12 @@ static aom_codec_err_t ctrl_set_frame_parallel_decoding_mode( return update_extra_cfg(ctx, &extra_cfg); } -#if CONFIG_EXT_TILE static aom_codec_err_t ctrl_set_single_tile_decoding(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; extra_cfg.single_tile_decoding = CAST(AV1E_SET_SINGLE_TILE_DECODING, args); return update_extra_cfg(ctx, &extra_cfg); } -#endif // CONFIG_EXT_TILE static aom_codec_err_t ctrl_set_aq_mode(aom_codec_alg_priv_t *ctx, va_list args) { @@ -935,14 +1040,28 @@ static aom_codec_err_t ctrl_set_aq_mode(aom_codec_alg_priv_t *ctx, return update_extra_cfg(ctx, &extra_cfg); } -#if CONFIG_EXT_DELTA_Q +static aom_codec_err_t ctrl_set_film_grain_test_vector( + aom_codec_alg_priv_t *ctx, va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.film_grain_test_vector = + CAST(AV1E_SET_FILM_GRAIN_TEST_VECTOR, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_film_grain_table(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.film_grain_table_filename = CAST(AV1E_SET_FILM_GRAIN_TABLE, args); + return update_extra_cfg(ctx, &extra_cfg); +} + static aom_codec_err_t ctrl_set_deltaq_mode(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; extra_cfg.deltaq_mode = CAST(AV1E_SET_DELTAQ_MODE, args); return update_extra_cfg(ctx, &extra_cfg); } -#endif + static aom_codec_err_t ctrl_set_min_gf_interval(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; @@ -1006,10 +1125,8 @@ static aom_codec_err_t encoder_init(aom_codec_ctx_t *ctx, if (res == AOM_CODEC_OK) { set_encoder_config(&priv->oxcf, &priv->cfg, &priv->extra_cfg); -#if CONFIG_HIGHBITDEPTH priv->oxcf.use_highbitdepth = (ctx->init_flags & AOM_CODEC_USE_HIGHBITDEPTH) ? 1 : 0; -#endif priv->cpi = av1_create_compressor(&priv->oxcf, priv->buffer_pool); if (priv->cpi == NULL) res = AOM_CODEC_MEM_ERROR; @@ -1032,108 +1149,6 @@ static aom_codec_err_t encoder_destroy(aom_codec_alg_priv_t *ctx) { return AOM_CODEC_OK; } -static void pick_quickcompress_mode(aom_codec_alg_priv_t *ctx, - unsigned long deadline) { - MODE new_mode = GOOD; - - switch (ctx->cfg.g_pass) { - case AOM_RC_ONE_PASS: - switch (deadline) { - default: new_mode = GOOD; break; - } - break; - case AOM_RC_FIRST_PASS: break; - case AOM_RC_LAST_PASS: new_mode = GOOD; - } - - if (ctx->oxcf.mode != new_mode) { - ctx->oxcf.mode = new_mode; - av1_change_config(ctx->cpi, &ctx->oxcf); - } -} - -// Turn on to test if supplemental superframe data breaks decoding -#define TEST_SUPPLEMENTAL_SUPERFRAME_DATA 0 - -static int write_superframe_index(aom_codec_alg_priv_t *ctx) { - uint8_t marker = 0xc0; - size_t max_frame_sz = 0; - - assert(ctx->pending_frame_count); - assert(ctx->pending_frame_count <= 8); - - // Add the number of frames to the marker byte - marker |= ctx->pending_frame_count - 1; - for (int i = 0; i < ctx->pending_frame_count - 1; i++) { - const size_t frame_sz = ctx->pending_frame_sizes[i] - 1; - max_frame_sz = AOMMAX(frame_sz, max_frame_sz); - } - - // Choose the magnitude - int mag; - unsigned int mask; - for (mag = 0, mask = 0xff; mag < MAG_SIZE; mag++) { - if (max_frame_sz <= mask) break; - mask <<= 8; - mask |= 0xff; - } - marker |= mag << 3; - - // Write the index - uint8_t buffer[MAX_INDEX_SIZE]; - uint8_t *x = buffer; - - if (TEST_SUPPLEMENTAL_SUPERFRAME_DATA) { - uint8_t marker_test = 0xc0; - int mag_test = 2; // 1 - 4 - int frames_test = 4; // 1 - 8 - marker_test |= frames_test - 1; - marker_test |= (mag_test - 1) << 3; - *x++ = marker_test; - for (int i = 0; i < mag_test * frames_test; ++i) - *x++ = 0; // fill up with arbitrary data - *x++ = marker_test; - printf("Added supplemental superframe data\n"); - } - - *x++ = marker; - for (int i = 0; i < ctx->pending_frame_count - 1; i++) { - assert(ctx->pending_frame_sizes[i] > 0); - unsigned int this_sz = (unsigned int)ctx->pending_frame_sizes[i] - 1; - for (int j = 0; j <= mag; j++) { - *x++ = this_sz & 0xff; - this_sz >>= 8; - } - } - *x++ = marker; - - const size_t index_sz = x - buffer; - assert(index_sz < MAX_INDEX_SIZE); - assert(ctx->pending_cx_data_sz + index_sz < ctx->cx_data_sz); - - // move the frame to make room for the index - memmove(ctx->pending_cx_data + index_sz, ctx->pending_cx_data, - ctx->pending_cx_data_sz); - memcpy(ctx->pending_cx_data, buffer, index_sz); - ctx->pending_cx_data_sz += index_sz; - - return (int)index_sz; -} - -// av1 uses 10,000,000 ticks/second as time stamp -#define TICKS_PER_SEC 10000000LL - -static int64_t timebase_units_to_ticks(const aom_rational_t *timebase, - int64_t n) { - return n * TICKS_PER_SEC * timebase->num / timebase->den; -} - -static int64_t ticks_to_timebase_units(const aom_rational_t *timebase, - int64_t n) { - const int64_t round = TICKS_PER_SEC * timebase->num / 2 - 1; - return (n * timebase->den + round) / timebase->num / TICKS_PER_SEC; -} - static aom_codec_frame_flags_t get_frame_pkt_flags(const AV1_COMP *cpi, unsigned int lib_flags) { aom_codec_frame_flags_t flags = lib_flags << 16; @@ -1149,8 +1164,7 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx, const aom_image_t *img, aom_codec_pts_t pts, unsigned long duration, - aom_enc_frame_flags_t enc_flags, - unsigned long deadline) { + aom_enc_frame_flags_t enc_flags) { const size_t kMinCompressedSize = 8192; volatile aom_codec_err_t res = AOM_CODEC_OK; AV1_COMP *const cpi = ctx->cpi; @@ -1163,17 +1177,8 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx, // TODO(jzern) the checks related to cpi's validity should be treated as a // failure condition, encoder setup is done fully in init() currently. if (res == AOM_CODEC_OK) { -#if CONFIG_EXT_REFS size_t data_sz = ALIGN_POWER_OF_TWO(ctx->cfg.g_w, 5) * ALIGN_POWER_OF_TWO(ctx->cfg.g_h, 5) * get_image_bps(img); -#else - // There's no codec control for multiple alt-refs so check the encoder - // instance for its status to determine the compressed data size. - size_t data_sz = ALIGN_POWER_OF_TWO(ctx->cfg.g_w, 5) * - ALIGN_POWER_OF_TWO(ctx->cfg.g_h, 5) * - get_image_bps(img) / 8 * - (cpi->multi_arf_allowed ? 8 : 2); -#endif // CONFIG_EXT_REFS if (data_sz < kMinCompressedSize) data_sz = kMinCompressedSize; if (ctx->cx_data == NULL || ctx->cx_data_sz < data_sz) { ctx->cx_data_sz = data_sz; @@ -1186,18 +1191,15 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx, } } - pick_quickcompress_mode(ctx, deadline); + if (ctx->oxcf.mode != GOOD) { + ctx->oxcf.mode = GOOD; + av1_change_config(ctx->cpi, &ctx->oxcf); + } + aom_codec_pkt_list_init(&ctx->pkt_list); volatile aom_enc_frame_flags_t flags = enc_flags; - // Handle Flags - if (((flags & AOM_EFLAG_NO_UPD_GF) && (flags & AOM_EFLAG_FORCE_GF)) || - ((flags & AOM_EFLAG_NO_UPD_ARF) && (flags & AOM_EFLAG_FORCE_ARF))) { - ctx->base.err_detail = "Conflicting flags."; - return AOM_CODEC_INVALID_PARAM; - } - if (setjmp(cpi->common.error.jmp)) { cpi->common.error.setjmp = 0; res = update_error_state(ctx, &cpi->common.error); @@ -1206,6 +1208,9 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx, } cpi->common.error.setjmp = 1; + // Note(yunqing): While applying encoding flags, always start from enabling + // all, and then modifying according to the flags. Previous frame's flags are + // overwritten. av1_apply_encoding_flags(cpi, flags); // Handle fixed keyframe intervals @@ -1267,18 +1272,66 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx, !is_frame_visible && -1 != av1_get_compressed_data(cpi, &lib_flags, &frame_size, cx_data, &dst_time_stamp, &dst_end_time_stamp, - !img)) { -#if CONFIG_REFERENCE_BUFFER + !img, timebase)) { if (cpi->common.seq_params.frame_id_numbers_present_flag) { - if (cpi->common.invalid_delta_frame_id_minus1) { - ctx->base.err_detail = "Invalid delta_frame_id_minus1"; + if (cpi->common.invalid_delta_frame_id_minus_1) { + ctx->base.err_detail = "Invalid delta_frame_id_minus_1"; return AOM_CODEC_ERROR; } } -#endif // CONFIG_REFERENCE_BUFFER + cpi->seq_params_locked = 1; if (frame_size) { if (ctx->pending_cx_data == 0) ctx->pending_cx_data = cx_data; + const int write_temporal_delimiter = + !cpi->common.spatial_layer_id && !ctx->pending_frame_count; + + if (write_temporal_delimiter) { + uint32_t obu_header_size = 1; + const uint32_t obu_payload_size = 0; + const size_t length_field_size = + aom_uleb_size_in_bytes(obu_payload_size); + + if (ctx->pending_cx_data) { + const size_t move_offset = length_field_size + 1; + memmove(ctx->pending_cx_data + move_offset, ctx->pending_cx_data, + frame_size); + } + const uint32_t obu_header_offset = 0; + obu_header_size = write_obu_header( + OBU_TEMPORAL_DELIMITER, 0, + (uint8_t *)(ctx->pending_cx_data + obu_header_offset)); + + // OBUs are preceded/succeeded by an unsigned leb128 coded integer. + if (write_uleb_obu_size(obu_header_size, obu_payload_size, + ctx->pending_cx_data) != AOM_CODEC_OK) { + return AOM_CODEC_ERROR; + } + + frame_size += obu_header_size + obu_payload_size + length_field_size; + } + + if (ctx->oxcf.save_as_annexb) { + size_t curr_frame_size = frame_size; + if (av1_convert_sect5obus_to_annexb(cx_data, &curr_frame_size) != + AOM_CODEC_OK) { + return AOM_CODEC_ERROR; + } + frame_size = curr_frame_size; + + // B_PRIME (add frame size) + const size_t length_field_size = aom_uleb_size_in_bytes(frame_size); + if (ctx->pending_cx_data) { + const size_t move_offset = length_field_size; + memmove(cx_data + move_offset, cx_data, frame_size); + } + if (write_uleb_obu_size(0, (uint32_t)frame_size, cx_data) != + AOM_CODEC_OK) { + return AOM_CODEC_ERROR; + } + frame_size += length_field_size; + } + ctx->pending_frame_sizes[ctx->pending_frame_count++] = frame_size; ctx->pending_cx_data_sz += frame_size; @@ -1291,23 +1344,31 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx, } } if (is_frame_visible) { - // insert superframe index if needed - if (ctx->pending_frame_count > 1) { -#if CONFIG_DEBUG - assert(index_size >= write_superframe_index(ctx)); -#else - write_superframe_index(ctx); -#endif - } - // Add the frame packet to the list of returned packets. aom_codec_cx_pkt_t pkt; + if (ctx->oxcf.save_as_annexb) { + // B_PRIME (add TU size) + size_t tu_size = ctx->pending_cx_data_sz; + const size_t length_field_size = aom_uleb_size_in_bytes(tu_size); + if (ctx->pending_cx_data) { + const size_t move_offset = length_field_size; + memmove(ctx->pending_cx_data + move_offset, ctx->pending_cx_data, + tu_size); + } + if (write_uleb_obu_size(0, (uint32_t)tu_size, ctx->pending_cx_data) != + AOM_CODEC_OK) { + return AOM_CODEC_ERROR; + } + ctx->pending_cx_data_sz += length_field_size; + } + pkt.kind = AOM_CODEC_CX_FRAME_PKT; pkt.data.frame.buf = ctx->pending_cx_data; pkt.data.frame.sz = ctx->pending_cx_data_sz; pkt.data.frame.partition_id = -1; + pkt.data.frame.vis_frame_size = frame_size; pkt.data.frame.pts = ticks_to_timebase_units(timebase, dst_time_stamp); pkt.data.frame.flags = get_frame_pkt_flags(cpi, lib_flags); @@ -1394,6 +1455,25 @@ static aom_codec_err_t ctrl_get_new_frame_image(aom_codec_alg_priv_t *ctx, } } +static aom_codec_err_t ctrl_copy_new_frame_image(aom_codec_alg_priv_t *ctx, + va_list args) { + aom_image_t *const new_img = va_arg(args, aom_image_t *); + + if (new_img != NULL) { + YV12_BUFFER_CONFIG new_frame; + + if (av1_get_last_show_frame(ctx->cpi, &new_frame) == 0) { + YV12_BUFFER_CONFIG sd; + image2yuvconfig(new_img, &sd); + return av1_copy_new_frame_enc(&ctx->cpi->common, &new_frame, &sd); + } else { + return AOM_CODEC_ERROR; + } + } else { + return AOM_CODEC_INVALID_PARAM; + } +} + static aom_codec_err_t ctrl_set_previewpp(aom_codec_alg_priv_t *ctx, va_list args) { (void)ctx; @@ -1473,6 +1553,24 @@ static aom_codec_err_t ctrl_set_scale_mode(aom_codec_alg_priv_t *ctx, } } +static aom_codec_err_t ctrl_set_spatial_layer_id(aom_codec_alg_priv_t *ctx, + va_list args) { + const int spatial_layer_id = va_arg(args, int); + if (spatial_layer_id > MAX_NUM_ENHANCEMENT_LAYERS) + return AOM_CODEC_INVALID_PARAM; + ctx->cpi->common.spatial_layer_id = spatial_layer_id; + return AOM_CODEC_OK; +} + +static aom_codec_err_t ctrl_set_number_spatial_layers(aom_codec_alg_priv_t *ctx, + va_list args) { + const int number_spatial_layers = va_arg(args, int); + if (number_spatial_layers > MAX_NUM_ENHANCEMENT_LAYERS) + return AOM_CODEC_INVALID_PARAM; + ctx->cpi->common.number_spatial_layers = number_spatial_layers; + return AOM_CODEC_OK; +} + static aom_codec_err_t ctrl_set_tune_content(aom_codec_alg_priv_t *ctx, va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; @@ -1480,38 +1578,41 @@ static aom_codec_err_t ctrl_set_tune_content(aom_codec_alg_priv_t *ctx, return update_extra_cfg(ctx, &extra_cfg); } -static aom_codec_err_t ctrl_set_color_space(aom_codec_alg_priv_t *ctx, - va_list args) { +static aom_codec_err_t ctrl_set_cdf_update_mode(aom_codec_alg_priv_t *ctx, + va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; - extra_cfg.color_space = CAST(AV1E_SET_COLOR_SPACE, args); + extra_cfg.cdf_update_mode = CAST(AV1E_SET_CDF_UPDATE_MODE, args); return update_extra_cfg(ctx, &extra_cfg); } -static aom_codec_err_t ctrl_set_transfer_function(aom_codec_alg_priv_t *ctx, - va_list args) { -#if CONFIG_COLORSPACE_HEADERS +static aom_codec_err_t ctrl_set_color_primaries(aom_codec_alg_priv_t *ctx, + va_list args) { struct av1_extracfg extra_cfg = ctx->extra_cfg; - extra_cfg.transfer_function = CAST(AV1E_SET_TRANSFER_FUNCTION, args); + extra_cfg.color_primaries = CAST(AV1E_SET_COLOR_PRIMARIES, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_transfer_characteristics( + aom_codec_alg_priv_t *ctx, va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.transfer_characteristics = + CAST(AV1E_SET_TRANSFER_CHARACTERISTICS, args); + return update_extra_cfg(ctx, &extra_cfg); +} + +static aom_codec_err_t ctrl_set_matrix_coefficients(aom_codec_alg_priv_t *ctx, + va_list args) { + struct av1_extracfg extra_cfg = ctx->extra_cfg; + extra_cfg.matrix_coefficients = CAST(AV1E_SET_MATRIX_COEFFICIENTS, args); return update_extra_cfg(ctx, &extra_cfg); -#else - (void)ctx; - (void)args; - return AOM_CODEC_UNSUP_FEATURE; -#endif } static aom_codec_err_t ctrl_set_chroma_sample_position( aom_codec_alg_priv_t *ctx, va_list args) { -#if CONFIG_COLORSPACE_HEADERS struct av1_extracfg extra_cfg = ctx->extra_cfg; extra_cfg.chroma_sample_position = CAST(AV1E_SET_CHROMA_SAMPLE_POSITION, args); return update_extra_cfg(ctx, &extra_cfg); -#else - (void)ctx; - (void)args; - return AOM_CODEC_UNSUP_FEATURE; -#endif } static aom_codec_err_t ctrl_set_color_range(aom_codec_alg_priv_t *ctx, @@ -1537,15 +1638,6 @@ static aom_codec_err_t ctrl_set_superblock_size(aom_codec_alg_priv_t *ctx, return update_extra_cfg(ctx, &extra_cfg); } -#if CONFIG_ANS && ANS_MAX_SYMBOLS -static aom_codec_err_t ctrl_set_ans_window_size_log2(aom_codec_alg_priv_t *ctx, - va_list args) { - struct av1_extracfg extra_cfg = ctx->extra_cfg; - extra_cfg.ans_window_size_log2 = CAST(AV1E_SET_ANS_WINDOW_SIZE_LOG2, args); - return update_extra_cfg(ctx, &extra_cfg); -} -#endif - static aom_codec_ctrl_fn_map_t encoder_ctrl_maps[] = { { AV1_COPY_REFERENCE, ctrl_copy_reference }, { AOME_USE_REFERENCE, ctrl_use_reference }, @@ -1556,51 +1648,58 @@ static aom_codec_ctrl_fn_map_t encoder_ctrl_maps[] = { { AOME_SET_ROI_MAP, ctrl_set_roi_map }, { AOME_SET_ACTIVEMAP, ctrl_set_active_map }, { AOME_SET_SCALEMODE, ctrl_set_scale_mode }, + { AOME_SET_SPATIAL_LAYER_ID, ctrl_set_spatial_layer_id }, { AOME_SET_CPUUSED, ctrl_set_cpuused }, + { AOME_SET_DEVSF, ctrl_set_devsf }, { AOME_SET_ENABLEAUTOALTREF, ctrl_set_enable_auto_alt_ref }, -#if CONFIG_EXT_REFS { AOME_SET_ENABLEAUTOBWDREF, ctrl_set_enable_auto_bwd_ref }, -#endif // CONFIG_EXT_REFS { AOME_SET_SHARPNESS, ctrl_set_sharpness }, { AOME_SET_STATIC_THRESHOLD, ctrl_set_static_thresh }, { AV1E_SET_TILE_COLUMNS, ctrl_set_tile_columns }, { AV1E_SET_TILE_ROWS, ctrl_set_tile_rows }, -#if CONFIG_DEPENDENT_HORZTILES - { AV1E_SET_TILE_DEPENDENT_ROWS, ctrl_set_tile_dependent_rows }, -#endif -#if CONFIG_LOOPFILTERING_ACROSS_TILES - { AV1E_SET_TILE_LOOPFILTER, ctrl_set_tile_loopfilter }, -#endif // CONFIG_LOOPFILTERING_ACROSS_TILES { AOME_SET_ARNR_MAXFRAMES, ctrl_set_arnr_max_frames }, { AOME_SET_ARNR_STRENGTH, ctrl_set_arnr_strength }, { AOME_SET_TUNING, ctrl_set_tuning }, { AOME_SET_CQ_LEVEL, ctrl_set_cq_level }, { AOME_SET_MAX_INTRA_BITRATE_PCT, ctrl_set_rc_max_intra_bitrate_pct }, + { AOME_SET_NUMBER_SPATIAL_LAYERS, ctrl_set_number_spatial_layers }, { AV1E_SET_MAX_INTER_BITRATE_PCT, ctrl_set_rc_max_inter_bitrate_pct }, { AV1E_SET_GF_CBR_BOOST_PCT, ctrl_set_rc_gf_cbr_boost_pct }, { AV1E_SET_LOSSLESS, ctrl_set_lossless }, -#if CONFIG_AOM_QM + { AV1E_SET_ENABLE_CDEF, ctrl_set_enable_cdef }, + { AV1E_SET_ENABLE_RESTORATION, ctrl_set_enable_restoration }, + { AV1E_SET_DISABLE_TRELLIS_QUANT, ctrl_set_disable_trellis_quant }, { AV1E_SET_ENABLE_QM, ctrl_set_enable_qm }, + { AV1E_SET_QM_Y, ctrl_set_qm_y }, + { AV1E_SET_QM_U, ctrl_set_qm_u }, + { AV1E_SET_QM_V, ctrl_set_qm_v }, { AV1E_SET_QM_MIN, ctrl_set_qm_min }, { AV1E_SET_QM_MAX, ctrl_set_qm_max }, -#endif #if CONFIG_DIST_8X8 { AV1E_SET_ENABLE_DIST_8X8, ctrl_set_enable_dist_8x8 }, #endif { AV1E_SET_NUM_TG, ctrl_set_num_tg }, { AV1E_SET_MTU, ctrl_set_mtu }, -#if CONFIG_TEMPMV_SIGNALING - { AV1E_SET_DISABLE_TEMPMV, ctrl_set_disable_tempmv }, -#endif + { AV1E_SET_TIMING_INFO_TYPE, ctrl_set_timing_info_type }, { AV1E_SET_FRAME_PARALLEL_DECODING, ctrl_set_frame_parallel_decoding_mode }, + { AV1E_SET_ERROR_RESILIENT_MODE, ctrl_set_error_resilient_mode }, + { AV1E_SET_S_FRAME_MODE, ctrl_set_s_frame_mode }, + { AV1E_SET_ENABLE_DF, ctrl_set_enable_df }, + { AV1E_SET_ENABLE_ORDER_HINT, ctrl_set_enable_order_hint }, + { AV1E_SET_ENABLE_JNT_COMP, ctrl_set_enable_jnt_comp }, + { AV1E_SET_ENABLE_REF_FRAME_MVS, ctrl_set_enable_ref_frame_mvs }, + { AV1E_SET_ALLOW_REF_FRAME_MVS, ctrl_set_allow_ref_frame_mvs }, + { AV1E_SET_ENABLE_WARPED_MOTION, ctrl_set_enable_warped_motion }, + { AV1E_SET_ALLOW_WARPED_MOTION, ctrl_set_allow_warped_motion }, + { AV1E_SET_ENABLE_SUPERRES, ctrl_set_enable_superres }, { AV1E_SET_AQ_MODE, ctrl_set_aq_mode }, -#if CONFIG_EXT_DELTA_Q { AV1E_SET_DELTAQ_MODE, ctrl_set_deltaq_mode }, -#endif { AV1E_SET_FRAME_PERIODIC_BOOST, ctrl_set_frame_periodic_boost }, { AV1E_SET_TUNE_CONTENT, ctrl_set_tune_content }, - { AV1E_SET_COLOR_SPACE, ctrl_set_color_space }, - { AV1E_SET_TRANSFER_FUNCTION, ctrl_set_transfer_function }, + { AV1E_SET_CDF_UPDATE_MODE, ctrl_set_cdf_update_mode }, + { AV1E_SET_COLOR_PRIMARIES, ctrl_set_color_primaries }, + { AV1E_SET_TRANSFER_CHARACTERISTICS, ctrl_set_transfer_characteristics }, + { AV1E_SET_MATRIX_COEFFICIENTS, ctrl_set_matrix_coefficients }, { AV1E_SET_CHROMA_SAMPLE_POSITION, ctrl_set_chroma_sample_position }, { AV1E_SET_COLOR_RANGE, ctrl_set_color_range }, { AV1E_SET_NOISE_SENSITIVITY, ctrl_set_noise_sensitivity }, @@ -1608,12 +1707,9 @@ static aom_codec_ctrl_fn_map_t encoder_ctrl_maps[] = { { AV1E_SET_MAX_GF_INTERVAL, ctrl_set_max_gf_interval }, { AV1E_SET_RENDER_SIZE, ctrl_set_render_size }, { AV1E_SET_SUPERBLOCK_SIZE, ctrl_set_superblock_size }, -#if CONFIG_ANS && ANS_MAX_SYMBOLS - { AV1E_SET_ANS_WINDOW_SIZE_LOG2, ctrl_set_ans_window_size_log2 }, -#endif -#if CONFIG_EXT_TILE { AV1E_SET_SINGLE_TILE_DECODING, ctrl_set_single_tile_decoding }, -#endif // CONFIG_EXT_TILE + { AV1E_SET_FILM_GRAIN_TEST_VECTOR, ctrl_set_film_grain_test_vector }, + { AV1E_SET_FILM_GRAIN_TABLE, ctrl_set_film_grain_table }, { AV1E_ENABLE_MOTION_VECTOR_UNIT_TEST, ctrl_enable_motion_vector_unit_test }, // Getters @@ -1622,6 +1718,7 @@ static aom_codec_ctrl_fn_map_t encoder_ctrl_maps[] = { { AV1_GET_REFERENCE, ctrl_get_reference }, { AV1E_GET_ACTIVEMAP, ctrl_get_active_map }, { AV1_GET_NEW_FRAME_IMAGE, ctrl_get_new_frame_image }, + { AV1_COPY_NEW_FRAME_IMAGE, ctrl_copy_new_frame_image }, { -1, NULL }, }; @@ -1636,6 +1733,9 @@ static aom_codec_enc_cfg_map_t encoder_usage_cfg_map[] = { 320, // g_width 240, // g_height + 0, // g_limit + 0, // g_forced_max_frame_width + 0, // g_forced_max_frame_height AOM_BITS_8, // g_bit_depth 8, // g_input_bit_depth @@ -1645,7 +1745,7 @@ static aom_codec_enc_cfg_map_t encoder_usage_cfg_map[] = { AOM_RC_ONE_PASS, // g_pass - 17, // g_lag_in_frames + 19, // g_lag_in_frames 0, // rc_dropframe_thresh RESIZE_NONE, // rc_resize_mode @@ -1676,14 +1776,21 @@ static aom_codec_enc_cfg_map_t encoder_usage_cfg_map[] = { 2000, // rc_two_pass_vbrmax_section // keyframing settings (kf) + 0, // fwd_kf_enabled AOM_KF_AUTO, // g_kfmode 0, // kf_min_dist 9999, // kf_max_dist + 0, // sframe_dist + 1, // sframe_mode 0, // large_scale_tile + 0, // monochrome + 0, // full_still_picture_hdr + 0, // save_as_annexb 0, // tile_width_count 0, // tile_height_count { 0 }, // tile_widths { 0 }, // tile_heights + { 1 }, // config file } }, }; @@ -1693,13 +1800,11 @@ static aom_codec_enc_cfg_map_t encoder_usage_cfg_map[] = { CODEC_INTERFACE(aom_codec_av1_cx) = { "AOMedia Project AV1 Encoder" VERSION_STRING, AOM_CODEC_INTERNAL_ABI_VERSION, -#if CONFIG_HIGHBITDEPTH - AOM_CODEC_CAP_HIGHBITDEPTH | -#endif - AOM_CODEC_CAP_ENCODER | AOM_CODEC_CAP_PSNR, // aom_codec_caps_t - encoder_init, // aom_codec_init_fn_t - encoder_destroy, // aom_codec_destroy_fn_t - encoder_ctrl_maps, // aom_codec_ctrl_fn_map_t + AOM_CODEC_CAP_HIGHBITDEPTH | AOM_CODEC_CAP_ENCODER | + AOM_CODEC_CAP_PSNR, // aom_codec_caps_t + encoder_init, // aom_codec_init_fn_t + encoder_destroy, // aom_codec_destroy_fn_t + encoder_ctrl_maps, // aom_codec_ctrl_fn_map_t { // NOLINT NULL, // aom_codec_peek_si_fn_t |