diff options
Diffstat (limited to 'third_party/aom/av1/encoder/encoder.c')
| -rw-r--r-- | third_party/aom/av1/encoder/encoder.c | 4002 |
1 files changed, 1690 insertions, 2312 deletions
diff --git a/third_party/aom/av1/encoder/encoder.c b/third_party/aom/av1/encoder/encoder.c index e9ab3c87f..196e18d8a 100644 --- a/third_party/aom/av1/encoder/encoder.c +++ b/third_party/aom/av1/encoder/encoder.c @@ -13,12 +13,13 @@ #include <math.h> #include <stdio.h> -#include "./aom_config.h" +#include "config/aom_config.h" +#include "config/av1_rtcd.h" +#include "config/aom_dsp_rtcd.h" +#include "config/aom_scale_rtcd.h" #include "av1/common/alloccommon.h" -#if CONFIG_CDEF #include "av1/common/cdef.h" -#endif // CONFIG_CDEF #include "av1/common/filter.h" #include "av1/common/idct.h" #include "av1/common/reconinter.h" @@ -30,32 +31,17 @@ #include "av1/encoder/aq_cyclicrefresh.h" #include "av1/encoder/aq_variance.h" #include "av1/encoder/bitstream.h" -#if CONFIG_BGSPRITE -#include "av1/encoder/bgsprite.h" -#endif // CONFIG_BGSPRITE -#if CONFIG_ANS -#include "aom_dsp/buf_ans.h" -#endif #include "av1/encoder/context_tree.h" #include "av1/encoder/encodeframe.h" #include "av1/encoder/encodemv.h" #include "av1/encoder/encoder.h" -#if CONFIG_LV_MAP #include "av1/encoder/encodetxb.h" -#endif #include "av1/encoder/ethread.h" #include "av1/encoder/firstpass.h" -#if CONFIG_HASH_ME #include "av1/encoder/hash_motion.h" -#endif #include "av1/encoder/mbgraph.h" -#if CONFIG_NCOBMC_ADAPT_WEIGHT -#include "av1/common/ncobmc_kernels.h" -#endif // CONFIG_NCOBMC_ADAPT_WEIGHT #include "av1/encoder/picklpf.h" -#if CONFIG_LOOP_RESTORATION #include "av1/encoder/pickrst.h" -#endif // CONFIG_LOOP_RESTORATION #include "av1/encoder/random.h" #include "av1/encoder/ratectrl.h" #include "av1/encoder/rd.h" @@ -63,45 +49,41 @@ #include "av1/encoder/speed_features.h" #include "av1/encoder/temporal_filter.h" -#include "./av1_rtcd.h" -#include "./aom_dsp_rtcd.h" -#include "./aom_scale_rtcd.h" #include "aom_dsp/psnr.h" #if CONFIG_INTERNAL_STATS #include "aom_dsp/ssim.h" #endif +#include "av1/encoder/grain_test_vectors.h" #include "aom_dsp/aom_dsp_common.h" #include "aom_dsp/aom_filter.h" #include "aom_ports/aom_timer.h" #include "aom_ports/mem.h" #include "aom_ports/system_state.h" #include "aom_scale/aom_scale.h" -#if CONFIG_BITSTREAM_DEBUG +#if CONFIG_BITSTREAM_DEBUG || CONFIG_MISMATCH_DEBUG #include "aom_util/debug_util.h" -#endif // CONFIG_BITSTREAM_DEBUG +#endif // CONFIG_BITSTREAM_DEBUG || CONFIG_MISMATCH_DEBUG + +#define DEFAULT_EXPLICIT_ORDER_HINT_BITS 7 + +// av1 uses 10,000,000 ticks/second as time stamp +#define TICKS_PER_SEC 10000000LL #if CONFIG_ENTROPY_STATS FRAME_COUNTS aggregate_fc; -// Aggregate frame counts per frame context type -FRAME_COUNTS aggregate_fc_per_type[FRAME_CONTEXTS]; #endif // CONFIG_ENTROPY_STATS #define AM_SEGMENT_ID_INACTIVE 7 #define AM_SEGMENT_ID_ACTIVE 0 -#define SHARP_FILTER_QTHRESH 0 /* Q threshold for 8-tap sharp filter */ +// Whether to use high precision mv for altref computation. +#define ALTREF_HIGH_PRECISION_MV 1 -#define ALTREF_HIGH_PRECISION_MV 1 // Whether to use high precision mv - // for altref computation. -#define HIGH_PRECISION_MV_QTHRESH 200 // Q threshold for high precision - // mv. Choose a very high value for - // now so that HIGH_PRECISION is always - // chosen. +// Q threshold for high precision mv. Choose a very high value for now so that +// HIGH_PRECISION is always chosen. +#define HIGH_PRECISION_MV_QTHRESH 200 // #define OUTPUT_YUV_REC -#ifdef OUTPUT_YUV_DENOISED -FILE *yuv_denoised_file = NULL; -#endif #ifdef OUTPUT_YUV_SKINMAP FILE *yuv_skinmap_file = NULL; #endif @@ -110,20 +92,6 @@ FILE *yuv_rec_file; #define FILE_NAME_LEN 100 #endif -#if 0 -FILE *framepsnr; -FILE *kf_list; -FILE *keyfile; -#endif - -#if CONFIG_CFL -CFL_CTX NULL_CFL; -#endif - -#if CONFIG_INTERNAL_STATS -typedef enum { Y, U, V, ALL } STAT_TYPE; -#endif // CONFIG_INTERNAL_STATS - static INLINE void Scale2Ratio(AOM_SCALING mode, int *hr, int *hs) { switch (mode) { case NORMAL: @@ -180,7 +148,6 @@ static void apply_active_map(AV1_COMP *cpi) { if (seg_map[i] == AM_SEGMENT_ID_ACTIVE) seg_map[i] = active_map[i]; av1_enable_segmentation(seg); av1_enable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_SKIP); -#if CONFIG_LOOPFILTER_LEVEL av1_enable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF_Y_H); av1_enable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF_Y_V); av1_enable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF_U); @@ -194,23 +161,12 @@ static void apply_active_map(AV1_COMP *cpi) { -MAX_LOOP_FILTER); av1_set_segdata(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF_V, -MAX_LOOP_FILTER); -#else - av1_enable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF); - // Setting the data to -MAX_LOOP_FILTER will result in the computed loop - // filter level being zero regardless of the value of seg->abs_delta. - av1_set_segdata(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF, - -MAX_LOOP_FILTER); -#endif // CONFIG_LOOPFILTER_LEVEL } else { av1_disable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_SKIP); -#if CONFIG_LOOPFILTER_LEVEL av1_disable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF_Y_H); av1_disable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF_Y_V); av1_disable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF_U); av1_disable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF_V); -#else - av1_disable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF); -#endif // CONFIG_LOOPFILTER_LEVEL if (seg->enabled) { seg->update_data = 1; seg->update_map = 1; @@ -277,54 +233,45 @@ int av1_get_active_map(AV1_COMP *cpi, unsigned char *new_map_16x16, int rows, } } -static void set_high_precision_mv(AV1_COMP *cpi, int allow_high_precision_mv -#if CONFIG_AMVR - , - int cur_frame_mv_precision_level -#endif - ) { +static void set_high_precision_mv(AV1_COMP *cpi, int allow_high_precision_mv, + int cur_frame_force_integer_mv) { MACROBLOCK *const mb = &cpi->td.mb; - cpi->common.allow_high_precision_mv = allow_high_precision_mv; - -#if CONFIG_AMVR - if (cpi->common.allow_high_precision_mv && - cur_frame_mv_precision_level == 0) { -#else - if (cpi->common.allow_high_precision_mv) { -#endif - int i; - for (i = 0; i < NMV_CONTEXTS; ++i) { - mb->mv_cost_stack[i] = mb->nmvcost_hp[i]; - } - } else { - int i; - for (i = 0; i < NMV_CONTEXTS; ++i) { - mb->mv_cost_stack[i] = mb->nmvcost[i]; - } - } + cpi->common.allow_high_precision_mv = + allow_high_precision_mv && cur_frame_force_integer_mv == 0; + const int copy_hp = + cpi->common.allow_high_precision_mv && cur_frame_force_integer_mv == 0; + int *(*src)[2] = copy_hp ? &mb->nmvcost_hp : &mb->nmvcost; + mb->mv_cost_stack = *src; } static BLOCK_SIZE select_sb_size(const AV1_COMP *const cpi) { -#if CONFIG_EXT_PARTITION + const AV1_COMMON *const cm = &cpi->common; + if (cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_64X64) return BLOCK_64X64; - - if (cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_128X128) - return BLOCK_128X128; +#if CONFIG_FILEOPTIONS + if (cm->options && cm->options->ext_partition) +#endif + if (cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_128X128) + return BLOCK_128X128; assert(cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_DYNAMIC); - assert(IMPLIES(cpi->common.tile_cols > 1, - cpi->common.tile_width % MAX_MIB_SIZE == 0)); - assert(IMPLIES(cpi->common.tile_rows > 1, - cpi->common.tile_height % MAX_MIB_SIZE == 0)); +// TODO(any): Possibly could improve this with a heuristic. +#if CONFIG_FILEOPTIONS + if (cm->options && !cm->options->ext_partition) return BLOCK_64X64; +#endif + + // When superres / resize is on, 'cm->width / height' can change between + // calls, so we don't apply this heuristic there. Also, this heuristic gives + // compression gain for speed >= 2 only. + if (cpi->oxcf.superres_mode == SUPERRES_NONE && + cpi->oxcf.resize_mode == RESIZE_NONE && cpi->oxcf.speed >= 2) { + return (cm->width >= 480 && cm->height >= 360) ? BLOCK_128X128 + : BLOCK_64X64; + } - // TODO(any): Possibly could improve this with a heuristic. return BLOCK_128X128; -#else - (void)cpi; - return BLOCK_64X64; -#endif // CONFIG_EXT_PARTITION } static void setup_frame(AV1_COMP *cpi) { @@ -334,96 +281,82 @@ static void setup_frame(AV1_COMP *cpi) { // frames where the error_resilient_mode or intra_only flag is set. For // other inter-frames the encoder currently uses only two contexts; // context 1 for ALTREF frames and context 0 for the others. - if (frame_is_intra_only(cm) || cm->error_resilient_mode) { + + cm->primary_ref_frame = PRIMARY_REF_NONE; + if (frame_is_intra_only(cm) || cm->error_resilient_mode || + cm->force_primary_ref_none) { av1_setup_past_independence(cm); + for (int i = 0; i < REF_FRAMES; i++) { + cm->fb_of_context_type[i] = -1; + } + cm->fb_of_context_type[REGULAR_FRAME] = + get_ref_frame_map_idx(cpi, GOLDEN_FRAME); + cm->frame_context_idx = REGULAR_FRAME; } else { -#if CONFIG_NO_FRAME_CONTEXT_SIGNALING -// Just use frame context from first signaled reference frame. -// This will always be LAST_FRAME for now. -#else -#if CONFIG_EXT_REFS const GF_GROUP *gf_group = &cpi->twopass.gf_group; if (gf_group->update_type[gf_group->index] == INTNL_ARF_UPDATE) cm->frame_context_idx = EXT_ARF_FRAME; else if (cpi->refresh_alt_ref_frame) cm->frame_context_idx = ARF_FRAME; -#else // !CONFIG_EXT_REFS - if (cpi->refresh_alt_ref_frame) cm->frame_context_idx = ARF_FRAME; -#endif // CONFIG_EXT_REFS else if (cpi->rc.is_src_frame_alt_ref) cm->frame_context_idx = OVERLAY_FRAME; else if (cpi->refresh_golden_frame) cm->frame_context_idx = GLD_FRAME; -#if CONFIG_EXT_REFS else if (cpi->refresh_bwd_ref_frame) cm->frame_context_idx = BRF_FRAME; -#endif // CONFIG_EXT_REFS else cm->frame_context_idx = REGULAR_FRAME; -#endif // CONFIG_NO_FRAME_CONTEXT_SIGNALING + int wanted_fb = cm->fb_of_context_type[cm->frame_context_idx]; + for (int ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ref_frame++) { + int fb = get_ref_frame_map_idx(cpi, ref_frame); + if (fb == wanted_fb) { + cm->primary_ref_frame = ref_frame - LAST_FRAME; + } + } } if (cm->frame_type == KEY_FRAME) { cpi->refresh_golden_frame = 1; cpi->refresh_alt_ref_frame = 1; av1_zero(cpi->interp_filter_selected); - set_sb_size(cm, select_sb_size(cpi)); -#if CONFIG_REFERENCE_BUFFER + set_sb_size(&cm->seq_params, select_sb_size(cpi)); set_use_reference_buffer(cm, 0); -#endif // CONFIG_REFERENCE_BUFFER + } else if (frame_is_sframe(cm)) { + cpi->refresh_golden_frame = 1; + cpi->refresh_alt_ref_frame = 1; + av1_zero(cpi->interp_filter_selected); + set_sb_size(&cm->seq_params, select_sb_size(cpi)); } else { -#if CONFIG_NO_FRAME_CONTEXT_SIGNALING - if (frame_is_intra_only(cm) || cm->error_resilient_mode || - cm->frame_refs[0].idx < 0) { - *cm->fc = cm->frame_contexts[FRAME_CONTEXT_DEFAULTS]; + if (cm->primary_ref_frame == PRIMARY_REF_NONE || + cm->frame_refs[cm->primary_ref_frame].idx < 0) { + av1_setup_past_independence(cm); + cm->seg.update_map = 1; + cm->seg.update_data = 1; } else { - *cm->fc = cm->frame_contexts[cm->frame_refs[0].idx]; + *cm->fc = cm->frame_contexts[cm->frame_refs[cm->primary_ref_frame].idx]; } -#else - *cm->fc = cm->frame_contexts[cm->frame_context_idx]; -#endif // CONFIG_NO_FRAME_CONTEXT_SIGNALING av1_zero(cpi->interp_filter_selected[0]); } -#if CONFIG_EXT_REFS -#if CONFIG_ONE_SIDED_COMPOUND && \ - !CONFIG_EXT_COMP_REFS // No change to bitstream - if (cpi->sf.recode_loop == DISALLOW_RECODE) { - cpi->refresh_bwd_ref_frame = cpi->refresh_last_frame; - cpi->rc.is_bipred_frame = 1; - } -#endif // CONFIG_ONE_SIDED_COMPOUND && !CONFIG_EXT_COMP_REFS -#endif // CONFIG_EXT_REFS -#if CONFIG_NO_FRAME_CONTEXT_SIGNALING - if (frame_is_intra_only(cm) || cm->error_resilient_mode || - cm->frame_refs[0].idx < 0) { - // use default frame context values - cm->pre_fc = &cm->frame_contexts[FRAME_CONTEXT_DEFAULTS]; - } else { - *cm->fc = cm->frame_contexts[cm->frame_refs[0].idx]; - cm->pre_fc = &cm->frame_contexts[cm->frame_refs[0].idx]; - } -#else - cm->pre_fc = &cm->frame_contexts[cm->frame_context_idx]; -#endif // CONFIG_NO_FRAME_CONTEXT_SIGNALING + cm->prev_frame = get_prev_frame(cm); cpi->vaq_refresh = 0; } static void enc_setup_mi(AV1_COMMON *cm) { int i; - cm->mi = cm->mip + cm->mi_stride + 1; - memset(cm->mip, 0, cm->mi_stride * (cm->mi_rows + 1) * sizeof(*cm->mip)); - cm->prev_mi = cm->prev_mip + cm->mi_stride + 1; + cm->mi = cm->mip; + memset(cm->mip, 0, cm->mi_stride * cm->mi_rows * sizeof(*cm->mip)); + cm->prev_mi = cm->prev_mip; // Clear top border row memset(cm->prev_mip, 0, sizeof(*cm->prev_mip) * cm->mi_stride); // Clear left border column - for (i = 1; i < cm->mi_rows + 1; ++i) + for (i = 0; i < cm->mi_rows; ++i) memset(&cm->prev_mip[i * cm->mi_stride], 0, sizeof(*cm->prev_mip)); - cm->mi_grid_visible = cm->mi_grid_base + cm->mi_stride + 1; - cm->prev_mi_grid_visible = cm->prev_mi_grid_base + cm->mi_stride + 1; + cm->mi_grid_visible = cm->mi_grid_base; + cm->prev_mi_grid_visible = cm->prev_mi_grid_base; memset(cm->mi_grid_base, 0, - cm->mi_stride * (cm->mi_rows + 1) * sizeof(*cm->mi_grid_base)); + cm->mi_stride * cm->mi_rows * sizeof(*cm->mi_grid_base)); } static int enc_alloc_mi(AV1_COMMON *cm, int mi_size) { @@ -433,10 +366,11 @@ static int enc_alloc_mi(AV1_COMMON *cm, int mi_size) { if (!cm->prev_mip) return 1; cm->mi_alloc_size = mi_size; - cm->mi_grid_base = (MODE_INFO **)aom_calloc(mi_size, sizeof(MODE_INFO *)); + cm->mi_grid_base = + (MB_MODE_INFO **)aom_calloc(mi_size, sizeof(MB_MODE_INFO *)); if (!cm->mi_grid_base) return 1; cm->prev_mi_grid_base = - (MODE_INFO **)aom_calloc(mi_size, sizeof(MODE_INFO *)); + (MB_MODE_INFO **)aom_calloc(mi_size, sizeof(MB_MODE_INFO *)); if (!cm->prev_mi_grid_base) return 1; return 0; @@ -456,19 +390,19 @@ static void enc_free_mi(AV1_COMMON *cm) { static void swap_mi_and_prev_mi(AV1_COMMON *cm) { // Current mip will be the prev_mip for the next frame. - MODE_INFO **temp_base = cm->prev_mi_grid_base; - MODE_INFO *temp = cm->prev_mip; + MB_MODE_INFO **temp_base = cm->prev_mi_grid_base; + MB_MODE_INFO *temp = cm->prev_mip; cm->prev_mip = cm->mip; cm->mip = temp; // Update the upper left visible macroblock ptrs. - cm->mi = cm->mip + cm->mi_stride + 1; - cm->prev_mi = cm->prev_mip + cm->mi_stride + 1; + cm->mi = cm->mip; + cm->prev_mi = cm->prev_mip; cm->prev_mi_grid_base = cm->mi_grid_base; cm->mi_grid_base = temp_base; - cm->mi_grid_visible = cm->mi_grid_base + cm->mi_stride + 1; - cm->prev_mi_grid_visible = cm->prev_mi_grid_base + cm->mi_stride + 1; + cm->mi_grid_visible = cm->mi_grid_base; + cm->prev_mi_grid_visible = cm->prev_mi_grid_base; } void av1_initialize_enc(void) { @@ -480,11 +414,7 @@ void av1_initialize_enc(void) { aom_scale_rtcd(); av1_init_intra_predictors(); av1_init_me_luts(); -#if !CONFIG_XIPHRC av1_rc_init_minq_luts(); -#endif - av1_entropy_mv_init(); - av1_encode_token_init(); av1_init_wedge_masks(); init_done = 1; } @@ -506,25 +436,47 @@ static void alloc_context_buffers_ext(AV1_COMP *cpi) { aom_calloc(mi_size, sizeof(*cpi->mbmi_ext_base))); } -static void dealloc_compressor_data(AV1_COMP *cpi) { +static void update_film_grain_parameters(struct AV1_COMP *cpi, + const AV1EncoderConfig *oxcf) { AV1_COMMON *const cm = &cpi->common; + cpi->oxcf = *oxcf; - dealloc_context_buffers_ext(cpi); + if (cm->film_grain_table) { + aom_film_grain_table_free(cm->film_grain_table); + aom_free(cm->film_grain_table); + } + cm->film_grain_table = 0; + + if (oxcf->film_grain_test_vector) { + cm->film_grain_params_present = 1; + if (cm->frame_type == KEY_FRAME) { + memcpy(&cm->film_grain_params, + film_grain_test_vectors + oxcf->film_grain_test_vector - 1, + sizeof(cm->film_grain_params)); -#if CONFIG_PVQ - if (cpi->oxcf.pass != 1) { - const int tile_cols = cm->tile_cols; - const int tile_rows = cm->tile_rows; - int tile_col, tile_row; - - for (tile_row = 0; tile_row < tile_rows; ++tile_row) - for (tile_col = 0; tile_col < tile_cols; ++tile_col) { - TileDataEnc *tile_data = - &cpi->tile_data[tile_row * tile_cols + tile_col]; - aom_free(tile_data->pvq_q.buf); + cm->film_grain_params.bit_depth = cm->bit_depth; + if (cm->color_range == AOM_CR_FULL_RANGE) { + cm->film_grain_params.clip_to_restricted_range = 0; } + } + } else if (oxcf->film_grain_table_filename) { + cm->film_grain_table = aom_malloc(sizeof(*cm->film_grain_table)); + memset(cm->film_grain_table, 0, sizeof(aom_film_grain_table_t)); + + aom_film_grain_table_read(cm->film_grain_table, + oxcf->film_grain_table_filename, &cm->error); + } else { + cm->film_grain_params_present = 0; + memset(&cm->film_grain_params, 0, sizeof(cm->film_grain_params)); } -#endif +} + +static void dealloc_compressor_data(AV1_COMP *cpi) { + AV1_COMMON *const cm = &cpi->common; + const int num_planes = av1_num_planes(cm); + + dealloc_context_buffers_ext(cpi); + aom_free(cpi->tile_data); cpi->tile_data = NULL; @@ -538,7 +490,6 @@ static void dealloc_compressor_data(AV1_COMP *cpi) { aom_free(cpi->active_map.map); cpi->active_map.map = NULL; -#if CONFIG_MOTION_VAR aom_free(cpi->td.mb.above_pred_buf); cpi->td.mb.above_pred_buf = NULL; @@ -550,26 +501,17 @@ static void dealloc_compressor_data(AV1_COMP *cpi) { aom_free(cpi->td.mb.mask_buf); cpi->td.mb.mask_buf = NULL; -#endif + + aom_free(cm->tpl_mvs); + cm->tpl_mvs = NULL; av1_free_ref_frame_buffers(cm->buffer_pool); -#if CONFIG_LV_MAP av1_free_txb_buf(cpi); -#endif av1_free_context_buffers(cm); aom_free_frame_buffer(&cpi->last_frame_uf); -#if CONFIG_LOOP_RESTORATION av1_free_restoration_buffers(cm); - aom_free_frame_buffer(&cpi->last_frame_db); aom_free_frame_buffer(&cpi->trial_frame_rst); - aom_free(cpi->extra_rstbuf); - { - int i; - for (i = 0; i < MAX_MB_PLANE; ++i) - av1_free_restoration_struct(&cpi->rst_search[i]); - } -#endif // CONFIG_LOOP_RESTORATION aom_free_frame_buffer(&cpi->scaled_source); aom_free_frame_buffer(&cpi->scaled_last_source); aom_free_frame_buffer(&cpi->alt_ref_buffer); @@ -578,32 +520,22 @@ static void dealloc_compressor_data(AV1_COMP *cpi) { aom_free(cpi->tile_tok[0][0]); cpi->tile_tok[0][0] = 0; - av1_free_pc_tree(&cpi->td); + av1_free_pc_tree(&cpi->td, num_planes); aom_free(cpi->td.mb.palette_buffer); - -#if CONFIG_ANS - aom_buf_ans_free(&cpi->buf_ans); -#endif // CONFIG_ANS } static void save_coding_context(AV1_COMP *cpi) { CODING_CONTEXT *const cc = &cpi->coding_context; AV1_COMMON *cm = &cpi->common; - int i; // Stores a snapshot of key state variables which can subsequently be // restored with a call to av1_restore_coding_context. These functions are // intended for use in a re-code loop in av1_compress_frame where the // quantizer value is adjusted between loop iterations. - for (i = 0; i < NMV_CONTEXTS; ++i) { - av1_copy(cc->nmv_vec_cost[i], cpi->td.mb.nmv_vec_cost[i]); - av1_copy(cc->nmv_costs, cpi->nmv_costs); - av1_copy(cc->nmv_costs_hp, cpi->nmv_costs_hp); - } - - av1_copy(cc->last_ref_lf_deltas, cm->lf.last_ref_deltas); - av1_copy(cc->last_mode_lf_deltas, cm->lf.last_mode_deltas); + av1_copy(cc->nmv_vec_cost, cpi->td.mb.nmv_vec_cost); + av1_copy(cc->nmv_costs, cpi->nmv_costs); + av1_copy(cc->nmv_costs_hp, cpi->nmv_costs_hp); cc->fc = *cm->fc; } @@ -611,18 +543,12 @@ static void save_coding_context(AV1_COMP *cpi) { static void restore_coding_context(AV1_COMP *cpi) { CODING_CONTEXT *const cc = &cpi->coding_context; AV1_COMMON *cm = &cpi->common; - int i; // Restore key state variables to the snapshot state stored in the // previous call to av1_save_coding_context. - for (i = 0; i < NMV_CONTEXTS; ++i) { - av1_copy(cpi->td.mb.nmv_vec_cost[i], cc->nmv_vec_cost[i]); - av1_copy(cpi->nmv_costs, cc->nmv_costs); - av1_copy(cpi->nmv_costs_hp, cc->nmv_costs_hp); - } - - av1_copy(cm->lf.last_ref_deltas, cc->last_ref_lf_deltas); - av1_copy(cm->lf.last_mode_deltas, cc->last_mode_lf_deltas); + av1_copy(cpi->td.mb.nmv_vec_cost, cc->nmv_vec_cost); + av1_copy(cpi->nmv_costs, cc->nmv_costs); + av1_copy(cpi->nmv_costs_hp, cc->nmv_costs_hp); *cm->fc = cc->fc; } @@ -673,7 +599,6 @@ static void configure_static_seg_features(AV1_COMP *cpi) { qi_delta = av1_compute_qdelta(rc, rc->avg_q, rc->avg_q * 0.875, cm->bit_depth); av1_set_segdata(seg, 1, SEG_LVL_ALT_Q, qi_delta - 2); -#if CONFIG_LOOPFILTER_LEVEL av1_set_segdata(seg, 1, SEG_LVL_ALT_LF_Y_H, -2); av1_set_segdata(seg, 1, SEG_LVL_ALT_LF_Y_V, -2); av1_set_segdata(seg, 1, SEG_LVL_ALT_LF_U, -2); @@ -683,15 +608,8 @@ static void configure_static_seg_features(AV1_COMP *cpi) { av1_enable_segfeature(seg, 1, SEG_LVL_ALT_LF_Y_V); av1_enable_segfeature(seg, 1, SEG_LVL_ALT_LF_U); av1_enable_segfeature(seg, 1, SEG_LVL_ALT_LF_V); -#else - av1_set_segdata(seg, 1, SEG_LVL_ALT_LF, -2); - av1_enable_segfeature(seg, 1, SEG_LVL_ALT_LF); -#endif // CONFIG_LOOPFILTER_LEVEL av1_enable_segfeature(seg, 1, SEG_LVL_ALT_Q); - - // Where relevant assume segment data is delta data - seg->abs_delta = SEGMENT_DELTADATA; } } else if (seg->enabled) { // All other frames if segmentation has been enabled @@ -702,14 +620,12 @@ static void configure_static_seg_features(AV1_COMP *cpi) { if (rc->source_alt_ref_active) { seg->update_map = 0; seg->update_data = 1; - seg->abs_delta = SEGMENT_DELTADATA; qi_delta = av1_compute_qdelta(rc, rc->avg_q, rc->avg_q * 1.125, cm->bit_depth); av1_set_segdata(seg, 1, SEG_LVL_ALT_Q, qi_delta + 2); av1_enable_segfeature(seg, 1, SEG_LVL_ALT_Q); -#if CONFIG_LOOPFILTER_LEVEL av1_set_segdata(seg, 1, SEG_LVL_ALT_LF_Y_H, -2); av1_set_segdata(seg, 1, SEG_LVL_ALT_LF_Y_V, -2); av1_set_segdata(seg, 1, SEG_LVL_ALT_LF_U, -2); @@ -719,10 +635,6 @@ static void configure_static_seg_features(AV1_COMP *cpi) { av1_enable_segfeature(seg, 1, SEG_LVL_ALT_LF_Y_V); av1_enable_segfeature(seg, 1, SEG_LVL_ALT_LF_U); av1_enable_segfeature(seg, 1, SEG_LVL_ALT_LF_V); -#else - av1_set_segdata(seg, 1, SEG_LVL_ALT_LF, -2); - av1_enable_segfeature(seg, 1, SEG_LVL_ALT_LF); -#endif // CONFIG_LOOPFILTER_LEVEL // Segment coding disabled for compred testing if (high_q || (cpi->static_mb_pct == 100)) { @@ -777,16 +689,16 @@ static void configure_static_seg_features(AV1_COMP *cpi) { static void update_reference_segmentation_map(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; - MODE_INFO **mi_8x8_ptr = cm->mi_grid_visible; - uint8_t *cache_ptr = cm->last_frame_seg_map; + MB_MODE_INFO **mi_4x4_ptr = cm->mi_grid_visible; + uint8_t *cache_ptr = cm->current_frame_seg_map; int row, col; for (row = 0; row < cm->mi_rows; row++) { - MODE_INFO **mi_8x8 = mi_8x8_ptr; + MB_MODE_INFO **mi_4x4 = mi_4x4_ptr; uint8_t *cache = cache_ptr; - for (col = 0; col < cm->mi_cols; col++, mi_8x8++, cache++) - cache[0] = mi_8x8[0]->mbmi.segment_id; - mi_8x8_ptr += cm->mi_stride; + for (col = 0; col < cm->mi_cols; col++, mi_4x4++, cache++) + cache[0] = mi_4x4[0]->segment_id; + mi_4x4_ptr += cm->mi_stride; cache_ptr += cm->mi_cols; } } @@ -796,12 +708,9 @@ static void alloc_raw_frame_buffers(AV1_COMP *cpi) { const AV1EncoderConfig *oxcf = &cpi->oxcf; if (!cpi->lookahead) - cpi->lookahead = av1_lookahead_init(oxcf->width, oxcf->height, - cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif - oxcf->lag_in_frames); + cpi->lookahead = av1_lookahead_init( + oxcf->width, oxcf->height, cm->subsampling_x, cm->subsampling_y, + cm->use_highbitdepth, oxcf->lag_in_frames); if (!cpi->lookahead) aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, "Failed to allocate lag buffers"); @@ -809,11 +718,8 @@ static void alloc_raw_frame_buffers(AV1_COMP *cpi) { // TODO(agrange) Check if ARF is enabled and skip allocation if not. if (aom_realloc_frame_buffer(&cpi->alt_ref_buffer, oxcf->width, oxcf->height, cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif - AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, - NULL, NULL)) + cm->use_highbitdepth, AOM_BORDER_IN_PIXELS, + cm->byte_alignment, NULL, NULL, NULL)) aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, "Failed to allocate altref buffer"); } @@ -822,84 +728,49 @@ static void alloc_util_frame_buffers(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; if (aom_realloc_frame_buffer(&cpi->last_frame_uf, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif - AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, - NULL, NULL)) + cm->use_highbitdepth, AOM_BORDER_IN_PIXELS, + cm->byte_alignment, NULL, NULL, NULL)) aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, "Failed to allocate last frame buffer"); -#if CONFIG_LOOP_RESTORATION - if (aom_realloc_frame_buffer(&cpi->last_frame_db, cm->width, cm->height, - cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif - AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, - NULL, NULL)) - aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, - "Failed to allocate last frame deblocked buffer"); if (aom_realloc_frame_buffer( - &cpi->trial_frame_rst, -#if CONFIG_FRAME_SUPERRES - cm->superres_upscaled_width, cm->superres_upscaled_height, -#else - cm->width, cm->height, -#endif // CONFIG_FRAME_SUPERRES - cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif - AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, NULL, NULL)) + &cpi->trial_frame_rst, cm->superres_upscaled_width, + cm->superres_upscaled_height, cm->subsampling_x, cm->subsampling_y, + cm->use_highbitdepth, AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, + NULL, NULL)) aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, "Failed to allocate trial restored frame buffer"); - int extra_rstbuf_sz = RESTORATION_EXTBUF_SIZE; - if (extra_rstbuf_sz > 0) { - aom_free(cpi->extra_rstbuf); - CHECK_MEM_ERROR(cm, cpi->extra_rstbuf, - (uint8_t *)aom_malloc(extra_rstbuf_sz)); - } else { - cpi->extra_rstbuf = NULL; - } -#endif // CONFIG_LOOP_RESTORATION if (aom_realloc_frame_buffer(&cpi->scaled_source, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif - AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, - NULL, NULL)) + cm->use_highbitdepth, AOM_BORDER_IN_PIXELS, + cm->byte_alignment, NULL, NULL, NULL)) aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, "Failed to allocate scaled source buffer"); if (aom_realloc_frame_buffer(&cpi->scaled_last_source, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif - AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, - NULL, NULL)) + cm->use_highbitdepth, AOM_BORDER_IN_PIXELS, + cm->byte_alignment, NULL, NULL, NULL)) aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, "Failed to allocate scaled last source buffer"); } static void alloc_compressor_data(AV1_COMP *cpi) { AV1_COMMON *cm = &cpi->common; + const int num_planes = av1_num_planes(cm); av1_alloc_context_buffers(cm, cm->width, cm->height); -#if CONFIG_LV_MAP av1_alloc_txb_buf(cpi); -#endif alloc_context_buffers_ext(cpi); aom_free(cpi->tile_tok[0][0]); { - unsigned int tokens = get_token_alloc(cm->mb_rows, cm->mb_cols); + unsigned int tokens = + get_token_alloc(cm->mb_rows, cm->mb_cols, MAX_SB_SIZE_LOG2, num_planes); CHECK_MEM_ERROR(cm, cpi->tile_tok[0][0], aom_calloc(tokens, sizeof(*cpi->tile_tok[0][0]))); } @@ -909,18 +780,10 @@ static void alloc_compressor_data(AV1_COMP *cpi) { void av1_new_framerate(AV1_COMP *cpi, double framerate) { cpi->framerate = framerate < 0.1 ? 30 : framerate; -#if CONFIG_XIPHRC - if (!cpi->od_rc.cur_frame) return; - cpi->od_rc.framerate = cpi->framerate; - od_enc_rc_resize(&cpi->od_rc); -#else av1_rc_update_framerate(cpi, cpi->common.width, cpi->common.height); -#endif } -#if CONFIG_MAX_TILE - -static void set_tile_info_max_tile(AV1_COMP *cpi) { +static void set_tile_info(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; int i, start_sb; @@ -932,15 +795,15 @@ static void set_tile_info_max_tile(AV1_COMP *cpi) { cm->log2_tile_cols = AOMMAX(cpi->oxcf.tile_columns, cm->min_log2_tile_cols); cm->log2_tile_cols = AOMMIN(cm->log2_tile_cols, cm->max_log2_tile_cols); } else { - int mi_cols = ALIGN_POWER_OF_TWO(cm->mi_cols, MAX_MIB_SIZE_LOG2); - int sb_cols = mi_cols >> MAX_MIB_SIZE_LOG2; + int mi_cols = ALIGN_POWER_OF_TWO(cm->mi_cols, cm->seq_params.mib_size_log2); + int sb_cols = mi_cols >> cm->seq_params.mib_size_log2; int size_sb, j = 0; cm->uniform_tile_spacing_flag = 0; for (i = 0, start_sb = 0; start_sb < sb_cols && i < MAX_TILE_COLS; i++) { cm->tile_col_start_sb[i] = start_sb; size_sb = cpi->oxcf.tile_widths[j++]; if (j >= cpi->oxcf.tile_width_count) j = 0; - start_sb += AOMMIN(size_sb, MAX_TILE_WIDTH_SB); + start_sb += AOMMIN(size_sb, cm->max_tile_width_sb); } cm->tile_cols = i; cm->tile_col_start_sb[i] = sb_cols; @@ -952,8 +815,8 @@ static void set_tile_info_max_tile(AV1_COMP *cpi) { cm->log2_tile_rows = AOMMAX(cpi->oxcf.tile_rows, cm->min_log2_tile_rows); cm->log2_tile_rows = AOMMIN(cm->log2_tile_rows, cm->max_log2_tile_rows); } else { - int mi_rows = ALIGN_POWER_OF_TWO(cm->mi_rows, MAX_MIB_SIZE_LOG2); - int sb_rows = mi_rows >> MAX_MIB_SIZE_LOG2; + int mi_rows = ALIGN_POWER_OF_TWO(cm->mi_rows, cm->seq_params.mib_size_log2); + int sb_rows = mi_rows >> cm->seq_params.mib_size_log2; int size_sb, j = 0; for (i = 0, start_sb = 0; start_sb < sb_rows && i < MAX_TILE_ROWS; i++) { cm->tile_row_start_sb[i] = start_sb; @@ -967,158 +830,174 @@ static void set_tile_info_max_tile(AV1_COMP *cpi) { av1_calculate_tile_rows(cm); } -#endif - -static void set_tile_info(AV1_COMP *cpi) { - AV1_COMMON *const cm = &cpi->common; -#if CONFIG_DEPENDENT_HORZTILES - int tile_row, tile_col, num_tiles_in_tg; - int tg_row_start, tg_col_start; -#endif -#if CONFIG_EXT_TILE - if (cpi->oxcf.large_scale_tile) { -#if CONFIG_EXT_PARTITION - if (cpi->oxcf.superblock_size != AOM_SUPERBLOCK_SIZE_64X64) { - cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 32); - cm->tile_height = clamp(cpi->oxcf.tile_rows, 1, 32); - cm->tile_width <<= MAX_MIB_SIZE_LOG2; - cm->tile_height <<= MAX_MIB_SIZE_LOG2; - } else { - cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 64); - cm->tile_height = clamp(cpi->oxcf.tile_rows, 1, 64); - cm->tile_width <<= MAX_MIB_SIZE_LOG2 - 1; - cm->tile_height <<= MAX_MIB_SIZE_LOG2 - 1; - } -#else - cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 64); - cm->tile_height = clamp(cpi->oxcf.tile_rows, 1, 64); - cm->tile_width <<= MAX_MIB_SIZE_LOG2; - cm->tile_height <<= MAX_MIB_SIZE_LOG2; -#endif // CONFIG_EXT_PARTITION - - cm->tile_width = AOMMIN(cm->tile_width, cm->mi_cols); - cm->tile_height = AOMMIN(cm->tile_height, cm->mi_rows); - - assert(cm->tile_width >> MAX_MIB_SIZE <= 32); - assert(cm->tile_height >> MAX_MIB_SIZE <= 32); - - // Get the number of tiles - cm->tile_cols = 1; - while (cm->tile_cols * cm->tile_width < cm->mi_cols) ++cm->tile_cols; - - cm->tile_rows = 1; - while (cm->tile_rows * cm->tile_height < cm->mi_rows) ++cm->tile_rows; - } else { -#endif // CONFIG_EXT_TILE - -#if CONFIG_MAX_TILE - set_tile_info_max_tile(cpi); -#else - int min_log2_tile_cols, max_log2_tile_cols; - av1_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols); - - cm->log2_tile_cols = - clamp(cpi->oxcf.tile_columns, min_log2_tile_cols, max_log2_tile_cols); - cm->log2_tile_rows = cpi->oxcf.tile_rows; - - cm->tile_width = - get_tile_size(cm->mi_cols, cm->log2_tile_cols, &cm->tile_cols); - cm->tile_height = - get_tile_size(cm->mi_rows, cm->log2_tile_rows, &cm->tile_rows); -#endif // CONFIG_MAX_TILE -#if CONFIG_EXT_TILE - } -#endif // CONFIG_EXT_TILE - -#if CONFIG_DEPENDENT_HORZTILES - cm->dependent_horz_tiles = cpi->oxcf.dependent_horz_tiles; -#if CONFIG_EXT_TILE - if (cm->large_scale_tile) { - // May not needed since cpi->oxcf.dependent_horz_tiles is already adjusted. - cm->dependent_horz_tiles = 0; - } else { -#endif // CONFIG_EXT_TILE - if (cm->log2_tile_rows == 0) cm->dependent_horz_tiles = 0; -#if CONFIG_EXT_TILE - } -#endif // CONFIG_EXT_TILE - -#if CONFIG_EXT_TILE - if (!cm->large_scale_tile) { -#endif // CONFIG_EXT_TILE - if (cpi->oxcf.mtu == 0) { - cm->num_tg = cpi->oxcf.num_tile_groups; - } else { - // Use a default value for the purposes of weighting costs in probability - // updates - cm->num_tg = DEFAULT_MAX_NUM_TG; - } - num_tiles_in_tg = - (cm->tile_cols * cm->tile_rows + cm->num_tg - 1) / cm->num_tg; - tg_row_start = 0; - tg_col_start = 0; - for (tile_row = 0; tile_row < cm->tile_rows; ++tile_row) { - for (tile_col = 0; tile_col < cm->tile_cols; ++tile_col) { - if ((tile_row * cm->tile_cols + tile_col) % num_tiles_in_tg == 0) { - tg_row_start = tile_row; - tg_col_start = tile_col; - } - cm->tile_group_start_row[tile_row][tile_col] = tg_row_start; - cm->tile_group_start_col[tile_row][tile_col] = tg_col_start; - } - } -#if CONFIG_EXT_TILE - } -#endif // CONFIG_EXT_TILE -#endif - -#if CONFIG_LOOPFILTERING_ACROSS_TILES - cm->loop_filter_across_tiles_enabled = - cpi->oxcf.loop_filter_across_tiles_enabled; -#endif // CONFIG_LOOPFILTERING_ACROSS_TILES -} - static void update_frame_size(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; MACROBLOCKD *const xd = &cpi->td.mb.e_mbd; av1_set_mb_mi(cm, cm->width, cm->height); av1_init_context_buffers(cm); - av1_init_macroblockd(cm, xd, -#if CONFIG_PVQ - NULL, -#endif -#if CONFIG_CFL - &NULL_CFL, -#endif - NULL); + av1_init_macroblockd(cm, xd, NULL); memset(cpi->mbmi_ext_base, 0, cm->mi_rows * cm->mi_cols * sizeof(*cpi->mbmi_ext_base)); set_tile_info(cpi); } static void init_buffer_indices(AV1_COMP *cpi) { -#if CONFIG_EXT_REFS int fb_idx; - for (fb_idx = 0; fb_idx < LAST_REF_FRAMES; ++fb_idx) - cpi->lst_fb_idxes[fb_idx] = fb_idx; - cpi->gld_fb_idx = LAST_REF_FRAMES; - cpi->bwd_fb_idx = LAST_REF_FRAMES + 1; - cpi->alt2_fb_idx = LAST_REF_FRAMES + 2; - cpi->alt_fb_idx = LAST_REF_FRAMES + 3; - cpi->ext_fb_idx = LAST_REF_FRAMES + 4; + for (fb_idx = 0; fb_idx < REF_FRAMES; ++fb_idx) + cpi->ref_fb_idx[fb_idx] = fb_idx; for (fb_idx = 0; fb_idx < MAX_EXT_ARFS + 1; ++fb_idx) cpi->arf_map[fb_idx] = LAST_REF_FRAMES + 2 + fb_idx; -#else // !CONFIG_EXT_REFS - cpi->lst_fb_idx = 0; - cpi->gld_fb_idx = 1; - cpi->alt_fb_idx = 2; -#endif // CONFIG_EXT_REFS -#if CONFIG_AMVR cpi->rate_index = 0; cpi->rate_size = 0; cpi->cur_poc = -1; -#endif +} + +static INLINE int does_level_match(int width, int height, double fps, + int lvl_width, int lvl_height, + double lvl_fps, int lvl_dim_mult) { + const int64_t lvl_luma_pels = lvl_width * lvl_height; + const double lvl_display_sample_rate = lvl_luma_pels * lvl_fps; + const int64_t luma_pels = width * height; + const double display_sample_rate = luma_pels * fps; + return luma_pels <= lvl_luma_pels && + display_sample_rate <= lvl_display_sample_rate && + width <= lvl_width * lvl_dim_mult && + height <= lvl_height * lvl_dim_mult; +} + +static void set_bitstream_level_tier(SequenceHeader *seq, AV1_COMMON *cm, + const AV1EncoderConfig *oxcf) { + // TODO(any): This is a placeholder function that only addresses dimensions + // and max display sample rates. + // Need to add checks for max bit rate, max decoded luma sample rate, header + // rate, etc. that are not covered by this function. + (void)oxcf; + BitstreamLevel bl = { 9, 3 }; + if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, 512, + 288, 30.0, 4)) { + bl.major = 2; + bl.minor = 0; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 704, 396, 30.0, 4)) { + bl.major = 2; + bl.minor = 1; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 1088, 612, 30.0, 4)) { + bl.major = 3; + bl.minor = 0; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 1376, 774, 30.0, 4)) { + bl.major = 3; + bl.minor = 1; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 2048, 1152, 30.0, 3)) { + bl.major = 4; + bl.minor = 0; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 2048, 1152, 60.0, 3)) { + bl.major = 4; + bl.minor = 1; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 4096, 2176, 30.0, 2)) { + bl.major = 5; + bl.minor = 0; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 4096, 2176, 60.0, 2)) { + bl.major = 5; + bl.minor = 1; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 4096, 2176, 120.0, 2)) { + bl.major = 5; + bl.minor = 2; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 8192, 4352, 30.0, 2)) { + bl.major = 6; + bl.minor = 0; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 8192, 4352, 60.0, 2)) { + bl.major = 6; + bl.minor = 1; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 8192, 4352, 120.0, 2)) { + bl.major = 6; + bl.minor = 2; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 16384, 8704, 30.0, 2)) { + bl.major = 7; + bl.minor = 0; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 16384, 8704, 60.0, 2)) { + bl.major = 7; + bl.minor = 1; + } else if (does_level_match(oxcf->width, oxcf->height, oxcf->init_framerate, + 16384, 8704, 120.0, 2)) { + bl.major = 7; + bl.minor = 2; + } + for (int i = 0; i < MAX_NUM_OPERATING_POINTS; ++i) { + seq->level[i] = bl; + seq->tier[i] = 0; // setting main tier by default + // Set the maximum parameters for bitrate and buffer size for this profile, + // level, and tier + cm->op_params[i].bitrate = max_level_bitrate( + cm->profile, major_minor_to_seq_level_idx(seq->level[i]), seq->tier[i]); + // Level with seq_level_idx = 31 returns a high "dummy" bitrate to pass the + // check + if (cm->op_params[i].bitrate == 0) + aom_internal_error( + &cm->error, AOM_CODEC_UNSUP_BITSTREAM, + "AV1 does not support this combination of profile, level, and tier."); + // Buffer size in bits/s is bitrate in bits/s * 1 s + cm->op_params[i].buffer_size = cm->op_params[i].bitrate; + } +} + +static void init_seq_coding_tools(SequenceHeader *seq, AV1_COMMON *cm, + const AV1EncoderConfig *oxcf) { + seq->still_picture = (oxcf->limit == 1); + seq->reduced_still_picture_hdr = seq->still_picture; + seq->reduced_still_picture_hdr &= !oxcf->full_still_picture_hdr; + seq->force_screen_content_tools = 2; + seq->force_integer_mv = 2; + seq->enable_order_hint = oxcf->enable_order_hint; + seq->frame_id_numbers_present_flag = oxcf->large_scale_tile; + if (seq->still_picture && seq->reduced_still_picture_hdr) { + seq->enable_order_hint = 0; + seq->frame_id_numbers_present_flag = 0; + seq->force_screen_content_tools = 2; + seq->force_integer_mv = 2; + } + seq->order_hint_bits_minus_1 = + seq->enable_order_hint ? DEFAULT_EXPLICIT_ORDER_HINT_BITS - 1 : -1; + + seq->enable_dual_filter = oxcf->enable_dual_filter; + seq->enable_jnt_comp = oxcf->enable_jnt_comp; + seq->enable_jnt_comp &= seq->enable_order_hint; + seq->enable_ref_frame_mvs = oxcf->enable_ref_frame_mvs; + seq->enable_ref_frame_mvs &= seq->enable_order_hint; + seq->enable_superres = oxcf->enable_superres; + seq->enable_cdef = oxcf->enable_cdef; + seq->enable_restoration = oxcf->enable_restoration; + seq->enable_warped_motion = oxcf->enable_warped_motion; + seq->enable_interintra_compound = 1; + seq->enable_masked_compound = 1; + seq->enable_intra_edge_filter = 1; + seq->enable_filter_intra = 1; + + set_bitstream_level_tier(seq, cm, oxcf); + + if (seq->operating_points_cnt_minus_1 == 0) { + seq->operating_point_idc[0] = 0; + } else { + // Set operating_point_idc[] such that for the i-th operating point the + // first (operating_points_cnt-i) spatial layers and the first temporal + // layer are decoded Note that highest quality operating point should come + // first + for (int i = 0; i < seq->operating_points_cnt_minus_1 + 1; i++) + seq->operating_point_idc[i] = + (~(~0u << (seq->operating_points_cnt_minus_1 + 1 - i)) << 8) | 1; + } } static void init_config(struct AV1_COMP *cpi, AV1EncoderConfig *oxcf) { @@ -1129,22 +1008,53 @@ static void init_config(struct AV1_COMP *cpi, AV1EncoderConfig *oxcf) { cm->profile = oxcf->profile; cm->bit_depth = oxcf->bit_depth; -#if CONFIG_HIGHBITDEPTH cm->use_highbitdepth = oxcf->use_highbitdepth; -#endif - cm->color_space = oxcf->color_space; -#if CONFIG_COLORSPACE_HEADERS - cm->transfer_function = oxcf->transfer_function; + cm->color_primaries = oxcf->color_primaries; + cm->transfer_characteristics = oxcf->transfer_characteristics; + cm->matrix_coefficients = oxcf->matrix_coefficients; + cm->seq_params.monochrome = oxcf->monochrome; cm->chroma_sample_position = oxcf->chroma_sample_position; -#endif cm->color_range = oxcf->color_range; + cm->timing_info_present = oxcf->timing_info_present; + cm->timing_info.num_units_in_display_tick = + oxcf->timing_info.num_units_in_display_tick; + cm->timing_info.time_scale = oxcf->timing_info.time_scale; + cm->timing_info.equal_picture_interval = + oxcf->timing_info.equal_picture_interval; + cm->timing_info.num_ticks_per_picture = + oxcf->timing_info.num_ticks_per_picture; + + cm->seq_params.display_model_info_present_flag = + oxcf->display_model_info_present_flag; + cm->seq_params.decoder_model_info_present_flag = + oxcf->decoder_model_info_present_flag; + if (oxcf->decoder_model_info_present_flag) { + // set the decoder model parameters in schedule mode + cm->buffer_model.num_units_in_decoding_tick = + oxcf->buffer_model.num_units_in_decoding_tick; + cm->buffer_removal_delay_present = 1; + set_aom_dec_model_info(&cm->buffer_model); + set_dec_model_op_parameters(&cm->op_params[0]); + } else if (cm->timing_info_present && + cm->timing_info.equal_picture_interval && + !cm->seq_params.decoder_model_info_present_flag) { + // set the decoder model parameters in resource availability mode + set_resource_availability_parameters(&cm->op_params[0]); + } else { + cm->op_params[0].initial_display_delay = + 10; // Default value (not signaled) + } cm->width = oxcf->width; cm->height = oxcf->height; + set_sb_size(&cm->seq_params, + select_sb_size(cpi)); // set sb size before allocations alloc_compressor_data(cpi); + update_film_grain_parameters(cpi, oxcf); + // Single thread case: use counts in common. - cpi->td.counts = &cm->counts; + cpi->td.counts = &cpi->counts; // change includes all joint functionality av1_change_config(cpi, oxcf); @@ -1173,16 +1083,15 @@ static void set_rc_buffer_sizes(RATE_CONTROL *rc, (maximum == 0) ? bandwidth / 8 : maximum * bandwidth / 1000; } -#if CONFIG_HIGHBITDEPTH -#define HIGHBD_BFP(BT, SDF, SDAF, VF, SVF, SVAF, SDX3F, SDX8F, SDX4DF) \ +#define HIGHBD_BFP(BT, SDF, SDAF, VF, SVF, SVAF, SDX4DF, JSDAF, JSVAF) \ cpi->fn_ptr[BT].sdf = SDF; \ cpi->fn_ptr[BT].sdaf = SDAF; \ cpi->fn_ptr[BT].vf = VF; \ cpi->fn_ptr[BT].svf = SVF; \ cpi->fn_ptr[BT].svaf = SVAF; \ - cpi->fn_ptr[BT].sdx3f = SDX3F; \ - cpi->fn_ptr[BT].sdx8f = SDX8F; \ - cpi->fn_ptr[BT].sdx4df = SDX4DF; + cpi->fn_ptr[BT].sdx4df = SDX4DF; \ + cpi->fn_ptr[BT].jsdaf = JSDAF; \ + cpi->fn_ptr[BT].jsvaf = JSVAF; #define MAKE_BFP_SAD_WRAPPER(fnname) \ static unsigned int fnname##_bits8(const uint8_t *src_ptr, \ @@ -1220,47 +1129,6 @@ static void set_rc_buffer_sizes(RATE_CONTROL *rc, 4; \ } -#define MAKE_BFP_SAD3_WRAPPER(fnname) \ - static void fnname##_bits8(const uint8_t *src_ptr, int source_stride, \ - const uint8_t *ref_ptr, int ref_stride, \ - unsigned int *sad_array) { \ - fnname(src_ptr, source_stride, ref_ptr, ref_stride, sad_array); \ - } \ - static void fnname##_bits10(const uint8_t *src_ptr, int source_stride, \ - const uint8_t *ref_ptr, int ref_stride, \ - unsigned int *sad_array) { \ - int i; \ - fnname(src_ptr, source_stride, ref_ptr, ref_stride, sad_array); \ - for (i = 0; i < 3; i++) sad_array[i] >>= 2; \ - } \ - static void fnname##_bits12(const uint8_t *src_ptr, int source_stride, \ - const uint8_t *ref_ptr, int ref_stride, \ - unsigned int *sad_array) { \ - int i; \ - fnname(src_ptr, source_stride, ref_ptr, ref_stride, sad_array); \ - for (i = 0; i < 3; i++) sad_array[i] >>= 4; \ - } - -#define MAKE_BFP_SAD8_WRAPPER(fnname) \ - static void fnname##_bits8(const uint8_t *src_ptr, int source_stride, \ - const uint8_t *ref_ptr, int ref_stride, \ - unsigned int *sad_array) { \ - fnname(src_ptr, source_stride, ref_ptr, ref_stride, sad_array); \ - } \ - static void fnname##_bits10(const uint8_t *src_ptr, int source_stride, \ - const uint8_t *ref_ptr, int ref_stride, \ - unsigned int *sad_array) { \ - int i; \ - fnname(src_ptr, source_stride, ref_ptr, ref_stride, sad_array); \ - for (i = 0; i < 8; i++) sad_array[i] >>= 2; \ - } \ - static void fnname##_bits12(const uint8_t *src_ptr, int source_stride, \ - const uint8_t *ref_ptr, int ref_stride, \ - unsigned int *sad_array) { \ - int i; \ - fnname(src_ptr, source_stride, ref_ptr, ref_stride, sad_array); \ - for (i = 0; i < 8; i++) sad_array[i] >>= 4; \ - } #define MAKE_BFP_SAD4D_WRAPPER(fnname) \ static void fnname##_bits8(const uint8_t *src_ptr, int source_stride, \ const uint8_t *const ref_ptr[], int ref_stride, \ @@ -1282,11 +1150,33 @@ static void set_rc_buffer_sizes(RATE_CONTROL *rc, for (i = 0; i < 4; i++) sad_array[i] >>= 4; \ } -#if CONFIG_EXT_PARTITION +#define MAKE_BFP_JSADAVG_WRAPPER(fnname) \ + static unsigned int fnname##_bits8( \ + const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, \ + int ref_stride, const uint8_t *second_pred, \ + const JNT_COMP_PARAMS *jcp_param) { \ + return fnname(src_ptr, source_stride, ref_ptr, ref_stride, second_pred, \ + jcp_param); \ + } \ + static unsigned int fnname##_bits10( \ + const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, \ + int ref_stride, const uint8_t *second_pred, \ + const JNT_COMP_PARAMS *jcp_param) { \ + return fnname(src_ptr, source_stride, ref_ptr, ref_stride, second_pred, \ + jcp_param) >> \ + 2; \ + } \ + static unsigned int fnname##_bits12( \ + const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, \ + int ref_stride, const uint8_t *second_pred, \ + const JNT_COMP_PARAMS *jcp_param) { \ + return fnname(src_ptr, source_stride, ref_ptr, ref_stride, second_pred, \ + jcp_param) >> \ + 4; \ + } + MAKE_BFP_SAD_WRAPPER(aom_highbd_sad128x128) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad128x128_avg) -MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad128x128x3) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad128x128x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad128x128x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad128x64) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad128x64_avg) @@ -1294,7 +1184,6 @@ MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad128x64x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad64x128) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x128_avg) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x128x4d) -#endif // CONFIG_EXT_PARTITION MAKE_BFP_SAD_WRAPPER(aom_highbd_sad32x16) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad32x16_avg) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad32x16x4d) @@ -1309,49 +1198,32 @@ MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad32x64_avg) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad32x64x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad32x32) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad32x32_avg) -MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad32x32x3) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad32x32x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad32x32x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad64x64) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x64_avg) -MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad64x64x3) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad64x64x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x64x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad16x16) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad16x16_avg) -MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad16x16x3) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad16x16x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad16x16x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad16x8) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad16x8_avg) -MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad16x8x3) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad16x8x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad16x8x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad8x16) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad8x16_avg) -MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad8x16x3) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad8x16x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad8x16x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad8x8) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad8x8_avg) -MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad8x8x3) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad8x8x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad8x8x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad8x4) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad8x4_avg) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad8x4x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad8x4x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad4x8) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad4x8_avg) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad4x8x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad4x8x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad4x4) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad4x4_avg) -MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad4x4x3) -MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad4x4x8) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad4x4x4d) -#if CONFIG_EXT_PARTITION_TYPES MAKE_BFP_SAD_WRAPPER(aom_highbd_sad4x16) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad4x16_avg) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad4x16x4d) @@ -1370,15 +1242,29 @@ MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad16x64x4d) MAKE_BFP_SAD_WRAPPER(aom_highbd_sad64x16) MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x16_avg) MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x16x4d) -#if CONFIG_EXT_PARTITION -MAKE_BFP_SAD_WRAPPER(aom_highbd_sad32x128) -MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad32x128_avg) -MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad32x128x4d) -MAKE_BFP_SAD_WRAPPER(aom_highbd_sad128x32) -MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad128x32_avg) -MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad128x32x4d) -#endif // CONFIG_EXT_PARTITION -#endif // CONFIG_EXT_PARTITION_TYPES + +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x128_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x64_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x128_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x16_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x32_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x32_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x64_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x32_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x64_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x16_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x8_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad8x16_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad8x8_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad8x4_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad4x8_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad4x4_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad4x16_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x4_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad8x32_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x8_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x64_avg) +MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x16_avg) #define HIGHBD_MBFP(BT, MCSDF, MCSVF) \ cpi->fn_ptr[BT].msdf = MCSDF; \ @@ -1409,11 +1295,9 @@ MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad128x32x4d) 4; \ } -#if CONFIG_EXT_PARTITION MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x128) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x64) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x128) -#endif // CONFIG_EXT_PARTITION MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x64) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x32) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x64) @@ -1427,21 +1311,13 @@ MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad8x8) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad8x4) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x8) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x4) - -#if CONFIG_EXT_PARTITION_TYPES MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x16) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad16x4) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad8x32) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x8) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad16x64) MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x16) -#if CONFIG_EXT_PARTITION -MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x128) -MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x32) -#endif // CONFIG_EXT_PARTITION -#endif // CONFIG_EXT_PARTITION_TYPES -#if CONFIG_MOTION_VAR #define HIGHBD_OBFP(BT, OSDF, OVF, OSVF) \ cpi->fn_ptr[BT].osdf = OSDF; \ cpi->fn_ptr[BT].ovf = OVF; \ @@ -1464,11 +1340,9 @@ MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x32) return fnname(ref, ref_stride, wsrc, msk) >> 4; \ } -#if CONFIG_EXT_PARTITION MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x128) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x64) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x128) -#endif // CONFIG_EXT_PARTITION MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x64) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x32) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x64) @@ -1482,198 +1356,190 @@ MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad8x8) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad8x4) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad4x8) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad4x4) - -#if CONFIG_EXT_PARTITION_TYPES MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad4x16) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad16x4) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad8x32) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x8) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad16x64) MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x16) -#if CONFIG_EXT_PARTITION -MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x128) -MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x32) -#endif // CONFIG_EXT_PARTITION -#endif // CONFIG_EXT_PARTITION_TYPES -#endif // CONFIG_MOTION_VAR static void highbd_set_var_fns(AV1_COMP *const cpi) { AV1_COMMON *const cm = &cpi->common; if (cm->use_highbitdepth) { switch (cm->bit_depth) { case AOM_BITS_8: -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits8, - aom_highbd_sad128x32_avg_bits8, aom_highbd_8_variance128x32, - aom_highbd_8_sub_pixel_variance128x32, - aom_highbd_8_sub_pixel_avg_variance128x32, NULL, NULL, - aom_highbd_sad128x32x4d_bits8) - - HIGHBD_BFP(BLOCK_32X128, aom_highbd_sad32x128_bits8, - aom_highbd_sad32x128_avg_bits8, aom_highbd_8_variance32x128, - aom_highbd_8_sub_pixel_variance32x128, - aom_highbd_8_sub_pixel_avg_variance32x128, NULL, NULL, - aom_highbd_sad32x128x4d_bits8) -#endif // CONFIG_EXT_PARTITION - HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits8, aom_highbd_sad64x16_avg_bits8, aom_highbd_8_variance64x16, aom_highbd_8_sub_pixel_variance64x16, - aom_highbd_8_sub_pixel_avg_variance64x16, NULL, NULL, - aom_highbd_sad64x16x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance64x16, + aom_highbd_sad64x16x4d_bits8, + aom_highbd_jnt_sad64x16_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance64x16) HIGHBD_BFP(BLOCK_16X64, aom_highbd_sad16x64_bits8, aom_highbd_sad16x64_avg_bits8, aom_highbd_8_variance16x64, aom_highbd_8_sub_pixel_variance16x64, - aom_highbd_8_sub_pixel_avg_variance16x64, NULL, NULL, - aom_highbd_sad16x64x4d_bits8) - - HIGHBD_BFP(BLOCK_32X8, aom_highbd_sad32x8_bits8, - aom_highbd_sad32x8_avg_bits8, aom_highbd_8_variance32x8, - aom_highbd_8_sub_pixel_variance32x8, - aom_highbd_8_sub_pixel_avg_variance32x8, NULL, NULL, - aom_highbd_sad32x8x4d_bits8) - - HIGHBD_BFP(BLOCK_8X32, aom_highbd_sad8x32_bits8, - aom_highbd_sad8x32_avg_bits8, aom_highbd_8_variance8x32, - aom_highbd_8_sub_pixel_variance8x32, - aom_highbd_8_sub_pixel_avg_variance8x32, NULL, NULL, - aom_highbd_sad8x32x4d_bits8) - - HIGHBD_BFP(BLOCK_16X4, aom_highbd_sad16x4_bits8, - aom_highbd_sad16x4_avg_bits8, aom_highbd_8_variance16x4, - aom_highbd_8_sub_pixel_variance16x4, - aom_highbd_8_sub_pixel_avg_variance16x4, NULL, NULL, - aom_highbd_sad16x4x4d_bits8) - - HIGHBD_BFP(BLOCK_4X16, aom_highbd_sad4x16_bits8, - aom_highbd_sad4x16_avg_bits8, aom_highbd_8_variance4x16, - aom_highbd_8_sub_pixel_variance4x16, - aom_highbd_8_sub_pixel_avg_variance4x16, NULL, NULL, - aom_highbd_sad4x16x4d_bits8) -#endif + aom_highbd_8_sub_pixel_avg_variance16x64, + aom_highbd_sad16x64x4d_bits8, + aom_highbd_jnt_sad16x64_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance16x64) + + HIGHBD_BFP( + BLOCK_32X8, aom_highbd_sad32x8_bits8, aom_highbd_sad32x8_avg_bits8, + aom_highbd_8_variance32x8, aom_highbd_8_sub_pixel_variance32x8, + aom_highbd_8_sub_pixel_avg_variance32x8, + aom_highbd_sad32x8x4d_bits8, aom_highbd_jnt_sad32x8_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance32x8) + + HIGHBD_BFP( + BLOCK_8X32, aom_highbd_sad8x32_bits8, aom_highbd_sad8x32_avg_bits8, + aom_highbd_8_variance8x32, aom_highbd_8_sub_pixel_variance8x32, + aom_highbd_8_sub_pixel_avg_variance8x32, + aom_highbd_sad8x32x4d_bits8, aom_highbd_jnt_sad8x32_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance8x32) + + HIGHBD_BFP( + BLOCK_16X4, aom_highbd_sad16x4_bits8, aom_highbd_sad16x4_avg_bits8, + aom_highbd_8_variance16x4, aom_highbd_8_sub_pixel_variance16x4, + aom_highbd_8_sub_pixel_avg_variance16x4, + aom_highbd_sad16x4x4d_bits8, aom_highbd_jnt_sad16x4_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance16x4) + + HIGHBD_BFP( + BLOCK_4X16, aom_highbd_sad4x16_bits8, aom_highbd_sad4x16_avg_bits8, + aom_highbd_8_variance4x16, aom_highbd_8_sub_pixel_variance4x16, + aom_highbd_8_sub_pixel_avg_variance4x16, + aom_highbd_sad4x16x4d_bits8, aom_highbd_jnt_sad4x16_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance4x16) HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits8, aom_highbd_sad32x16_avg_bits8, aom_highbd_8_variance32x16, aom_highbd_8_sub_pixel_variance32x16, - aom_highbd_8_sub_pixel_avg_variance32x16, NULL, NULL, - aom_highbd_sad32x16x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance32x16, + aom_highbd_sad32x16x4d_bits8, + aom_highbd_jnt_sad32x16_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance32x16) HIGHBD_BFP(BLOCK_16X32, aom_highbd_sad16x32_bits8, aom_highbd_sad16x32_avg_bits8, aom_highbd_8_variance16x32, aom_highbd_8_sub_pixel_variance16x32, - aom_highbd_8_sub_pixel_avg_variance16x32, NULL, NULL, - aom_highbd_sad16x32x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance16x32, + aom_highbd_sad16x32x4d_bits8, + aom_highbd_jnt_sad16x32_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance16x32) HIGHBD_BFP(BLOCK_64X32, aom_highbd_sad64x32_bits8, aom_highbd_sad64x32_avg_bits8, aom_highbd_8_variance64x32, aom_highbd_8_sub_pixel_variance64x32, - aom_highbd_8_sub_pixel_avg_variance64x32, NULL, NULL, - aom_highbd_sad64x32x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance64x32, + aom_highbd_sad64x32x4d_bits8, + aom_highbd_jnt_sad64x32_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance64x32) HIGHBD_BFP(BLOCK_32X64, aom_highbd_sad32x64_bits8, aom_highbd_sad32x64_avg_bits8, aom_highbd_8_variance32x64, aom_highbd_8_sub_pixel_variance32x64, - aom_highbd_8_sub_pixel_avg_variance32x64, NULL, NULL, - aom_highbd_sad32x64x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance32x64, + aom_highbd_sad32x64x4d_bits8, + aom_highbd_jnt_sad32x64_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance32x64) HIGHBD_BFP(BLOCK_32X32, aom_highbd_sad32x32_bits8, aom_highbd_sad32x32_avg_bits8, aom_highbd_8_variance32x32, aom_highbd_8_sub_pixel_variance32x32, aom_highbd_8_sub_pixel_avg_variance32x32, - aom_highbd_sad32x32x3_bits8, aom_highbd_sad32x32x8_bits8, - aom_highbd_sad32x32x4d_bits8) + aom_highbd_sad32x32x4d_bits8, + aom_highbd_jnt_sad32x32_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance32x32) HIGHBD_BFP(BLOCK_64X64, aom_highbd_sad64x64_bits8, aom_highbd_sad64x64_avg_bits8, aom_highbd_8_variance64x64, aom_highbd_8_sub_pixel_variance64x64, aom_highbd_8_sub_pixel_avg_variance64x64, - aom_highbd_sad64x64x3_bits8, aom_highbd_sad64x64x8_bits8, - aom_highbd_sad64x64x4d_bits8) + aom_highbd_sad64x64x4d_bits8, + aom_highbd_jnt_sad64x64_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance64x64) HIGHBD_BFP(BLOCK_16X16, aom_highbd_sad16x16_bits8, aom_highbd_sad16x16_avg_bits8, aom_highbd_8_variance16x16, aom_highbd_8_sub_pixel_variance16x16, aom_highbd_8_sub_pixel_avg_variance16x16, - aom_highbd_sad16x16x3_bits8, aom_highbd_sad16x16x8_bits8, - aom_highbd_sad16x16x4d_bits8) + aom_highbd_sad16x16x4d_bits8, + aom_highbd_jnt_sad16x16_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance16x16) HIGHBD_BFP( BLOCK_16X8, aom_highbd_sad16x8_bits8, aom_highbd_sad16x8_avg_bits8, aom_highbd_8_variance16x8, aom_highbd_8_sub_pixel_variance16x8, - aom_highbd_8_sub_pixel_avg_variance16x8, aom_highbd_sad16x8x3_bits8, - aom_highbd_sad16x8x8_bits8, aom_highbd_sad16x8x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance16x8, + aom_highbd_sad16x8x4d_bits8, aom_highbd_jnt_sad16x8_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance16x8) HIGHBD_BFP( BLOCK_8X16, aom_highbd_sad8x16_bits8, aom_highbd_sad8x16_avg_bits8, aom_highbd_8_variance8x16, aom_highbd_8_sub_pixel_variance8x16, - aom_highbd_8_sub_pixel_avg_variance8x16, aom_highbd_sad8x16x3_bits8, - aom_highbd_sad8x16x8_bits8, aom_highbd_sad8x16x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance8x16, + aom_highbd_sad8x16x4d_bits8, aom_highbd_jnt_sad8x16_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance8x16) - HIGHBD_BFP( - BLOCK_8X8, aom_highbd_sad8x8_bits8, aom_highbd_sad8x8_avg_bits8, - aom_highbd_8_variance8x8, aom_highbd_8_sub_pixel_variance8x8, - aom_highbd_8_sub_pixel_avg_variance8x8, aom_highbd_sad8x8x3_bits8, - aom_highbd_sad8x8x8_bits8, aom_highbd_sad8x8x4d_bits8) + HIGHBD_BFP(BLOCK_8X8, aom_highbd_sad8x8_bits8, + aom_highbd_sad8x8_avg_bits8, aom_highbd_8_variance8x8, + aom_highbd_8_sub_pixel_variance8x8, + aom_highbd_8_sub_pixel_avg_variance8x8, + aom_highbd_sad8x8x4d_bits8, aom_highbd_jnt_sad8x8_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance8x8) HIGHBD_BFP(BLOCK_8X4, aom_highbd_sad8x4_bits8, aom_highbd_sad8x4_avg_bits8, aom_highbd_8_variance8x4, aom_highbd_8_sub_pixel_variance8x4, - aom_highbd_8_sub_pixel_avg_variance8x4, NULL, - aom_highbd_sad8x4x8_bits8, aom_highbd_sad8x4x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance8x4, + aom_highbd_sad8x4x4d_bits8, aom_highbd_jnt_sad8x4_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance8x4) HIGHBD_BFP(BLOCK_4X8, aom_highbd_sad4x8_bits8, aom_highbd_sad4x8_avg_bits8, aom_highbd_8_variance4x8, aom_highbd_8_sub_pixel_variance4x8, - aom_highbd_8_sub_pixel_avg_variance4x8, NULL, - aom_highbd_sad4x8x8_bits8, aom_highbd_sad4x8x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance4x8, + aom_highbd_sad4x8x4d_bits8, aom_highbd_jnt_sad4x8_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance4x8) - HIGHBD_BFP( - BLOCK_4X4, aom_highbd_sad4x4_bits8, aom_highbd_sad4x4_avg_bits8, - aom_highbd_8_variance4x4, aom_highbd_8_sub_pixel_variance4x4, - aom_highbd_8_sub_pixel_avg_variance4x4, aom_highbd_sad4x4x3_bits8, - aom_highbd_sad4x4x8_bits8, aom_highbd_sad4x4x4d_bits8) - -#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 - HIGHBD_BFP(BLOCK_2X2, NULL, NULL, aom_highbd_8_variance2x2, NULL, NULL, - NULL, NULL, NULL) - HIGHBD_BFP(BLOCK_4X2, NULL, NULL, aom_highbd_8_variance4x2, NULL, NULL, - NULL, NULL, NULL) - HIGHBD_BFP(BLOCK_2X4, NULL, NULL, aom_highbd_8_variance2x4, NULL, NULL, - NULL, NULL, NULL) -#endif + HIGHBD_BFP(BLOCK_4X4, aom_highbd_sad4x4_bits8, + aom_highbd_sad4x4_avg_bits8, aom_highbd_8_variance4x4, + aom_highbd_8_sub_pixel_variance4x4, + aom_highbd_8_sub_pixel_avg_variance4x4, + aom_highbd_sad4x4x4d_bits8, aom_highbd_jnt_sad4x4_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance4x4) -#if CONFIG_EXT_PARTITION - HIGHBD_BFP(BLOCK_128X128, aom_highbd_sad128x128_bits8, - aom_highbd_sad128x128_avg_bits8, - aom_highbd_8_variance128x128, - aom_highbd_8_sub_pixel_variance128x128, - aom_highbd_8_sub_pixel_avg_variance128x128, - aom_highbd_sad128x128x3_bits8, aom_highbd_sad128x128x8_bits8, - aom_highbd_sad128x128x4d_bits8) + HIGHBD_BFP( + BLOCK_128X128, aom_highbd_sad128x128_bits8, + aom_highbd_sad128x128_avg_bits8, aom_highbd_8_variance128x128, + aom_highbd_8_sub_pixel_variance128x128, + aom_highbd_8_sub_pixel_avg_variance128x128, + aom_highbd_sad128x128x4d_bits8, aom_highbd_jnt_sad128x128_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance128x128) HIGHBD_BFP(BLOCK_128X64, aom_highbd_sad128x64_bits8, aom_highbd_sad128x64_avg_bits8, aom_highbd_8_variance128x64, aom_highbd_8_sub_pixel_variance128x64, - aom_highbd_8_sub_pixel_avg_variance128x64, NULL, NULL, - aom_highbd_sad128x64x4d_bits8) + aom_highbd_8_sub_pixel_avg_variance128x64, + aom_highbd_sad128x64x4d_bits8, + aom_highbd_jnt_sad128x64_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance128x64) HIGHBD_BFP(BLOCK_64X128, aom_highbd_sad64x128_bits8, aom_highbd_sad64x128_avg_bits8, aom_highbd_8_variance64x128, aom_highbd_8_sub_pixel_variance64x128, - aom_highbd_8_sub_pixel_avg_variance64x128, NULL, NULL, - aom_highbd_sad64x128x4d_bits8) -#endif // CONFIG_EXT_PARTITION + aom_highbd_8_sub_pixel_avg_variance64x128, + aom_highbd_sad64x128x4d_bits8, + aom_highbd_jnt_sad64x128_avg_bits8, + aom_highbd_8_jnt_sub_pixel_avg_variance64x128) -#if CONFIG_EXT_PARTITION HIGHBD_MBFP(BLOCK_128X128, aom_highbd_masked_sad128x128_bits8, aom_highbd_8_masked_sub_pixel_variance128x128) HIGHBD_MBFP(BLOCK_128X64, aom_highbd_masked_sad128x64_bits8, aom_highbd_8_masked_sub_pixel_variance128x64) HIGHBD_MBFP(BLOCK_64X128, aom_highbd_masked_sad64x128_bits8, aom_highbd_8_masked_sub_pixel_variance64x128) -#endif // CONFIG_EXT_PARTITION HIGHBD_MBFP(BLOCK_64X64, aom_highbd_masked_sad64x64_bits8, aom_highbd_8_masked_sub_pixel_variance64x64) HIGHBD_MBFP(BLOCK_64X32, aom_highbd_masked_sad64x32_bits8, @@ -1700,35 +1566,18 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { aom_highbd_8_masked_sub_pixel_variance8x4) HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits8, aom_highbd_8_masked_sub_pixel_variance4x4) -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits8, - aom_highbd_8_masked_sub_pixel_variance128x32) - - HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits8, - aom_highbd_8_masked_sub_pixel_variance32x128) -#endif // CONFIG_EXT_PARTITION - HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits8, aom_highbd_8_masked_sub_pixel_variance64x16) - HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits8, aom_highbd_8_masked_sub_pixel_variance16x64) - HIGHBD_MBFP(BLOCK_32X8, aom_highbd_masked_sad32x8_bits8, aom_highbd_8_masked_sub_pixel_variance32x8) - HIGHBD_MBFP(BLOCK_8X32, aom_highbd_masked_sad8x32_bits8, aom_highbd_8_masked_sub_pixel_variance8x32) - HIGHBD_MBFP(BLOCK_16X4, aom_highbd_masked_sad16x4_bits8, aom_highbd_8_masked_sub_pixel_variance16x4) - HIGHBD_MBFP(BLOCK_4X16, aom_highbd_masked_sad4x16_bits8, aom_highbd_8_masked_sub_pixel_variance4x16) -#endif -#if CONFIG_MOTION_VAR -#if CONFIG_EXT_PARTITION HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits8, aom_highbd_obmc_variance128x128, aom_highbd_obmc_sub_pixel_variance128x128) @@ -1738,7 +1587,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { HIGHBD_OBFP(BLOCK_64X128, aom_highbd_obmc_sad64x128_bits8, aom_highbd_obmc_variance64x128, aom_highbd_obmc_sub_pixel_variance64x128) -#endif // CONFIG_EXT_PARTITION HIGHBD_OBFP(BLOCK_64X64, aom_highbd_obmc_sad64x64_bits8, aom_highbd_obmc_variance64x64, aom_highbd_obmc_sub_pixel_variance64x64) @@ -1778,223 +1626,206 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits8, aom_highbd_obmc_variance4x4, aom_highbd_obmc_sub_pixel_variance4x4) -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits8, - aom_highbd_obmc_variance128x32, - aom_highbd_obmc_sub_pixel_variance128x32) - - HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits8, - aom_highbd_obmc_variance32x128, - aom_highbd_obmc_sub_pixel_variance32x128) -#endif // CONFIG_EXT_PARTITION - HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits8, aom_highbd_obmc_variance64x16, aom_highbd_obmc_sub_pixel_variance64x16) - HIGHBD_OBFP(BLOCK_16X64, aom_highbd_obmc_sad16x64_bits8, aom_highbd_obmc_variance16x64, aom_highbd_obmc_sub_pixel_variance16x64) - HIGHBD_OBFP(BLOCK_32X8, aom_highbd_obmc_sad32x8_bits8, aom_highbd_obmc_variance32x8, aom_highbd_obmc_sub_pixel_variance32x8) - HIGHBD_OBFP(BLOCK_8X32, aom_highbd_obmc_sad8x32_bits8, aom_highbd_obmc_variance8x32, aom_highbd_obmc_sub_pixel_variance8x32) - HIGHBD_OBFP(BLOCK_16X4, aom_highbd_obmc_sad16x4_bits8, aom_highbd_obmc_variance16x4, aom_highbd_obmc_sub_pixel_variance16x4) - HIGHBD_OBFP(BLOCK_4X16, aom_highbd_obmc_sad4x16_bits8, aom_highbd_obmc_variance4x16, aom_highbd_obmc_sub_pixel_variance4x16) -#endif -#endif // CONFIG_MOTION_VAR break; case AOM_BITS_10: -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits10, - aom_highbd_sad128x32_avg_bits10, - aom_highbd_10_variance128x32, - aom_highbd_10_sub_pixel_variance128x32, - aom_highbd_10_sub_pixel_avg_variance128x32, NULL, NULL, - aom_highbd_sad128x32x4d_bits10) - - HIGHBD_BFP(BLOCK_32X128, aom_highbd_sad32x128_bits10, - aom_highbd_sad32x128_avg_bits10, - aom_highbd_10_variance32x128, - aom_highbd_10_sub_pixel_variance32x128, - aom_highbd_10_sub_pixel_avg_variance32x128, NULL, NULL, - aom_highbd_sad32x128x4d_bits10) -#endif // CONFIG_EXT_PARTITION - HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits10, aom_highbd_sad64x16_avg_bits10, aom_highbd_10_variance64x16, aom_highbd_10_sub_pixel_variance64x16, - aom_highbd_10_sub_pixel_avg_variance64x16, NULL, NULL, - aom_highbd_sad64x16x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance64x16, + aom_highbd_sad64x16x4d_bits10, + aom_highbd_jnt_sad64x16_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance64x16); HIGHBD_BFP(BLOCK_16X64, aom_highbd_sad16x64_bits10, aom_highbd_sad16x64_avg_bits10, aom_highbd_10_variance16x64, aom_highbd_10_sub_pixel_variance16x64, - aom_highbd_10_sub_pixel_avg_variance16x64, NULL, NULL, - aom_highbd_sad16x64x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance16x64, + aom_highbd_sad16x64x4d_bits10, + aom_highbd_jnt_sad16x64_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance16x64); HIGHBD_BFP(BLOCK_32X8, aom_highbd_sad32x8_bits10, aom_highbd_sad32x8_avg_bits10, aom_highbd_10_variance32x8, aom_highbd_10_sub_pixel_variance32x8, - aom_highbd_10_sub_pixel_avg_variance32x8, NULL, NULL, - aom_highbd_sad32x8x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance32x8, + aom_highbd_sad32x8x4d_bits10, + aom_highbd_jnt_sad32x8_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance32x8); HIGHBD_BFP(BLOCK_8X32, aom_highbd_sad8x32_bits10, aom_highbd_sad8x32_avg_bits10, aom_highbd_10_variance8x32, aom_highbd_10_sub_pixel_variance8x32, - aom_highbd_10_sub_pixel_avg_variance8x32, NULL, NULL, - aom_highbd_sad8x32x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance8x32, + aom_highbd_sad8x32x4d_bits10, + aom_highbd_jnt_sad8x32_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance8x32); HIGHBD_BFP(BLOCK_16X4, aom_highbd_sad16x4_bits10, aom_highbd_sad16x4_avg_bits10, aom_highbd_10_variance16x4, aom_highbd_10_sub_pixel_variance16x4, - aom_highbd_10_sub_pixel_avg_variance16x4, NULL, NULL, - aom_highbd_sad16x4x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance16x4, + aom_highbd_sad16x4x4d_bits10, + aom_highbd_jnt_sad16x4_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance16x4); HIGHBD_BFP(BLOCK_4X16, aom_highbd_sad4x16_bits10, aom_highbd_sad4x16_avg_bits10, aom_highbd_10_variance4x16, aom_highbd_10_sub_pixel_variance4x16, - aom_highbd_10_sub_pixel_avg_variance4x16, NULL, NULL, - aom_highbd_sad4x16x4d_bits10) -#endif + aom_highbd_10_sub_pixel_avg_variance4x16, + aom_highbd_sad4x16x4d_bits10, + aom_highbd_jnt_sad4x16_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance4x16); HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits10, aom_highbd_sad32x16_avg_bits10, aom_highbd_10_variance32x16, aom_highbd_10_sub_pixel_variance32x16, - aom_highbd_10_sub_pixel_avg_variance32x16, NULL, NULL, - aom_highbd_sad32x16x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance32x16, + aom_highbd_sad32x16x4d_bits10, + aom_highbd_jnt_sad32x16_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance32x16); HIGHBD_BFP(BLOCK_16X32, aom_highbd_sad16x32_bits10, aom_highbd_sad16x32_avg_bits10, aom_highbd_10_variance16x32, aom_highbd_10_sub_pixel_variance16x32, - aom_highbd_10_sub_pixel_avg_variance16x32, NULL, NULL, - aom_highbd_sad16x32x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance16x32, + aom_highbd_sad16x32x4d_bits10, + aom_highbd_jnt_sad16x32_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance16x32); HIGHBD_BFP(BLOCK_64X32, aom_highbd_sad64x32_bits10, aom_highbd_sad64x32_avg_bits10, aom_highbd_10_variance64x32, aom_highbd_10_sub_pixel_variance64x32, - aom_highbd_10_sub_pixel_avg_variance64x32, NULL, NULL, - aom_highbd_sad64x32x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance64x32, + aom_highbd_sad64x32x4d_bits10, + aom_highbd_jnt_sad64x32_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance64x32); HIGHBD_BFP(BLOCK_32X64, aom_highbd_sad32x64_bits10, aom_highbd_sad32x64_avg_bits10, aom_highbd_10_variance32x64, aom_highbd_10_sub_pixel_variance32x64, - aom_highbd_10_sub_pixel_avg_variance32x64, NULL, NULL, - aom_highbd_sad32x64x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance32x64, + aom_highbd_sad32x64x4d_bits10, + aom_highbd_jnt_sad32x64_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance32x64); HIGHBD_BFP(BLOCK_32X32, aom_highbd_sad32x32_bits10, aom_highbd_sad32x32_avg_bits10, aom_highbd_10_variance32x32, aom_highbd_10_sub_pixel_variance32x32, aom_highbd_10_sub_pixel_avg_variance32x32, - aom_highbd_sad32x32x3_bits10, aom_highbd_sad32x32x8_bits10, - aom_highbd_sad32x32x4d_bits10) + aom_highbd_sad32x32x4d_bits10, + aom_highbd_jnt_sad32x32_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance32x32); HIGHBD_BFP(BLOCK_64X64, aom_highbd_sad64x64_bits10, aom_highbd_sad64x64_avg_bits10, aom_highbd_10_variance64x64, aom_highbd_10_sub_pixel_variance64x64, aom_highbd_10_sub_pixel_avg_variance64x64, - aom_highbd_sad64x64x3_bits10, aom_highbd_sad64x64x8_bits10, - aom_highbd_sad64x64x4d_bits10) + aom_highbd_sad64x64x4d_bits10, + aom_highbd_jnt_sad64x64_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance64x64); HIGHBD_BFP(BLOCK_16X16, aom_highbd_sad16x16_bits10, aom_highbd_sad16x16_avg_bits10, aom_highbd_10_variance16x16, aom_highbd_10_sub_pixel_variance16x16, aom_highbd_10_sub_pixel_avg_variance16x16, - aom_highbd_sad16x16x3_bits10, aom_highbd_sad16x16x8_bits10, - aom_highbd_sad16x16x4d_bits10) + aom_highbd_sad16x16x4d_bits10, + aom_highbd_jnt_sad16x16_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance16x16); HIGHBD_BFP(BLOCK_16X8, aom_highbd_sad16x8_bits10, aom_highbd_sad16x8_avg_bits10, aom_highbd_10_variance16x8, aom_highbd_10_sub_pixel_variance16x8, aom_highbd_10_sub_pixel_avg_variance16x8, - aom_highbd_sad16x8x3_bits10, aom_highbd_sad16x8x8_bits10, - aom_highbd_sad16x8x4d_bits10) + aom_highbd_sad16x8x4d_bits10, + aom_highbd_jnt_sad16x8_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance16x8); HIGHBD_BFP(BLOCK_8X16, aom_highbd_sad8x16_bits10, aom_highbd_sad8x16_avg_bits10, aom_highbd_10_variance8x16, aom_highbd_10_sub_pixel_variance8x16, aom_highbd_10_sub_pixel_avg_variance8x16, - aom_highbd_sad8x16x3_bits10, aom_highbd_sad8x16x8_bits10, - aom_highbd_sad8x16x4d_bits10) + aom_highbd_sad8x16x4d_bits10, + aom_highbd_jnt_sad8x16_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance8x16); HIGHBD_BFP( BLOCK_8X8, aom_highbd_sad8x8_bits10, aom_highbd_sad8x8_avg_bits10, aom_highbd_10_variance8x8, aom_highbd_10_sub_pixel_variance8x8, - aom_highbd_10_sub_pixel_avg_variance8x8, aom_highbd_sad8x8x3_bits10, - aom_highbd_sad8x8x8_bits10, aom_highbd_sad8x8x4d_bits10) + aom_highbd_10_sub_pixel_avg_variance8x8, + aom_highbd_sad8x8x4d_bits10, aom_highbd_jnt_sad8x8_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance8x8); - HIGHBD_BFP(BLOCK_8X4, aom_highbd_sad8x4_bits10, - aom_highbd_sad8x4_avg_bits10, aom_highbd_10_variance8x4, - aom_highbd_10_sub_pixel_variance8x4, - aom_highbd_10_sub_pixel_avg_variance8x4, NULL, - aom_highbd_sad8x4x8_bits10, aom_highbd_sad8x4x4d_bits10) + HIGHBD_BFP( + BLOCK_8X4, aom_highbd_sad8x4_bits10, aom_highbd_sad8x4_avg_bits10, + aom_highbd_10_variance8x4, aom_highbd_10_sub_pixel_variance8x4, + aom_highbd_10_sub_pixel_avg_variance8x4, + aom_highbd_sad8x4x4d_bits10, aom_highbd_jnt_sad8x4_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance8x4); - HIGHBD_BFP(BLOCK_4X8, aom_highbd_sad4x8_bits10, - aom_highbd_sad4x8_avg_bits10, aom_highbd_10_variance4x8, - aom_highbd_10_sub_pixel_variance4x8, - aom_highbd_10_sub_pixel_avg_variance4x8, NULL, - aom_highbd_sad4x8x8_bits10, aom_highbd_sad4x8x4d_bits10) + HIGHBD_BFP( + BLOCK_4X8, aom_highbd_sad4x8_bits10, aom_highbd_sad4x8_avg_bits10, + aom_highbd_10_variance4x8, aom_highbd_10_sub_pixel_variance4x8, + aom_highbd_10_sub_pixel_avg_variance4x8, + aom_highbd_sad4x8x4d_bits10, aom_highbd_jnt_sad4x8_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance4x8); HIGHBD_BFP( BLOCK_4X4, aom_highbd_sad4x4_bits10, aom_highbd_sad4x4_avg_bits10, aom_highbd_10_variance4x4, aom_highbd_10_sub_pixel_variance4x4, - aom_highbd_10_sub_pixel_avg_variance4x4, aom_highbd_sad4x4x3_bits10, - aom_highbd_sad4x4x8_bits10, aom_highbd_sad4x4x4d_bits10) - -#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 - HIGHBD_BFP(BLOCK_2X2, NULL, NULL, aom_highbd_10_variance2x2, NULL, NULL, - NULL, NULL, NULL) - HIGHBD_BFP(BLOCK_4X2, NULL, NULL, aom_highbd_10_variance4x2, NULL, NULL, - NULL, NULL, NULL) - HIGHBD_BFP(BLOCK_2X4, NULL, NULL, aom_highbd_10_variance2x4, NULL, NULL, - NULL, NULL, NULL) -#endif + aom_highbd_10_sub_pixel_avg_variance4x4, + aom_highbd_sad4x4x4d_bits10, aom_highbd_jnt_sad4x4_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance4x4); + + HIGHBD_BFP(BLOCK_128X128, aom_highbd_sad128x128_bits10, + aom_highbd_sad128x128_avg_bits10, + aom_highbd_10_variance128x128, + aom_highbd_10_sub_pixel_variance128x128, + aom_highbd_10_sub_pixel_avg_variance128x128, + aom_highbd_sad128x128x4d_bits10, + aom_highbd_jnt_sad128x128_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance128x128); -#if CONFIG_EXT_PARTITION HIGHBD_BFP( - BLOCK_128X128, aom_highbd_sad128x128_bits10, - aom_highbd_sad128x128_avg_bits10, aom_highbd_10_variance128x128, - aom_highbd_10_sub_pixel_variance128x128, - aom_highbd_10_sub_pixel_avg_variance128x128, - aom_highbd_sad128x128x3_bits10, aom_highbd_sad128x128x8_bits10, - aom_highbd_sad128x128x4d_bits10) - - HIGHBD_BFP(BLOCK_128X64, aom_highbd_sad128x64_bits10, - aom_highbd_sad128x64_avg_bits10, - aom_highbd_10_variance128x64, - aom_highbd_10_sub_pixel_variance128x64, - aom_highbd_10_sub_pixel_avg_variance128x64, NULL, NULL, - aom_highbd_sad128x64x4d_bits10) - - HIGHBD_BFP(BLOCK_64X128, aom_highbd_sad64x128_bits10, - aom_highbd_sad64x128_avg_bits10, - aom_highbd_10_variance64x128, - aom_highbd_10_sub_pixel_variance64x128, - aom_highbd_10_sub_pixel_avg_variance64x128, NULL, NULL, - aom_highbd_sad64x128x4d_bits10) -#endif // CONFIG_EXT_PARTITION - -#if CONFIG_EXT_PARTITION + BLOCK_128X64, aom_highbd_sad128x64_bits10, + aom_highbd_sad128x64_avg_bits10, aom_highbd_10_variance128x64, + aom_highbd_10_sub_pixel_variance128x64, + aom_highbd_10_sub_pixel_avg_variance128x64, + aom_highbd_sad128x64x4d_bits10, aom_highbd_jnt_sad128x64_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance128x64); + + HIGHBD_BFP( + BLOCK_64X128, aom_highbd_sad64x128_bits10, + aom_highbd_sad64x128_avg_bits10, aom_highbd_10_variance64x128, + aom_highbd_10_sub_pixel_variance64x128, + aom_highbd_10_sub_pixel_avg_variance64x128, + aom_highbd_sad64x128x4d_bits10, aom_highbd_jnt_sad64x128_avg_bits10, + aom_highbd_10_jnt_sub_pixel_avg_variance64x128); + HIGHBD_MBFP(BLOCK_128X128, aom_highbd_masked_sad128x128_bits10, aom_highbd_10_masked_sub_pixel_variance128x128) HIGHBD_MBFP(BLOCK_128X64, aom_highbd_masked_sad128x64_bits10, aom_highbd_10_masked_sub_pixel_variance128x64) HIGHBD_MBFP(BLOCK_64X128, aom_highbd_masked_sad64x128_bits10, aom_highbd_10_masked_sub_pixel_variance64x128) -#endif // CONFIG_EXT_PARTITION HIGHBD_MBFP(BLOCK_64X64, aom_highbd_masked_sad64x64_bits10, aom_highbd_10_masked_sub_pixel_variance64x64) HIGHBD_MBFP(BLOCK_64X32, aom_highbd_masked_sad64x32_bits10, @@ -2021,35 +1852,18 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { aom_highbd_10_masked_sub_pixel_variance8x4) HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits10, aom_highbd_10_masked_sub_pixel_variance4x4) -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits10, - aom_highbd_10_masked_sub_pixel_variance128x32) - - HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits10, - aom_highbd_10_masked_sub_pixel_variance32x128) -#endif // CONFIG_EXT_PARTITION - HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits10, aom_highbd_10_masked_sub_pixel_variance64x16) - HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits10, aom_highbd_10_masked_sub_pixel_variance16x64) - HIGHBD_MBFP(BLOCK_32X8, aom_highbd_masked_sad32x8_bits10, aom_highbd_10_masked_sub_pixel_variance32x8) - HIGHBD_MBFP(BLOCK_8X32, aom_highbd_masked_sad8x32_bits10, aom_highbd_10_masked_sub_pixel_variance8x32) - HIGHBD_MBFP(BLOCK_16X4, aom_highbd_masked_sad16x4_bits10, aom_highbd_10_masked_sub_pixel_variance16x4) - HIGHBD_MBFP(BLOCK_4X16, aom_highbd_masked_sad4x16_bits10, aom_highbd_10_masked_sub_pixel_variance4x16) -#endif -#if CONFIG_MOTION_VAR -#if CONFIG_EXT_PARTITION HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits10, aom_highbd_10_obmc_variance128x128, aom_highbd_10_obmc_sub_pixel_variance128x128) @@ -2059,7 +1873,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { HIGHBD_OBFP(BLOCK_64X128, aom_highbd_obmc_sad64x128_bits10, aom_highbd_10_obmc_variance64x128, aom_highbd_10_obmc_sub_pixel_variance64x128) -#endif // CONFIG_EXT_PARTITION HIGHBD_OBFP(BLOCK_64X64, aom_highbd_obmc_sad64x64_bits10, aom_highbd_10_obmc_variance64x64, aom_highbd_10_obmc_sub_pixel_variance64x64) @@ -2099,16 +1912,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits10, aom_highbd_10_obmc_variance4x4, aom_highbd_10_obmc_sub_pixel_variance4x4) -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits10, - aom_highbd_10_obmc_variance128x32, - aom_highbd_10_obmc_sub_pixel_variance128x32) - - HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits10, - aom_highbd_10_obmc_variance32x128, - aom_highbd_10_obmc_sub_pixel_variance32x128) -#endif // CONFIG_EXT_PARTITION HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits10, aom_highbd_10_obmc_variance64x16, @@ -2133,189 +1936,188 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { HIGHBD_OBFP(BLOCK_4X16, aom_highbd_obmc_sad4x16_bits10, aom_highbd_10_obmc_variance4x16, aom_highbd_10_obmc_sub_pixel_variance4x16) -#endif -#endif // CONFIG_MOTION_VAR break; case AOM_BITS_12: -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits12, - aom_highbd_sad128x32_avg_bits12, - aom_highbd_12_variance128x32, - aom_highbd_12_sub_pixel_variance128x32, - aom_highbd_12_sub_pixel_avg_variance128x32, NULL, NULL, - aom_highbd_sad128x32x4d_bits12) - - HIGHBD_BFP(BLOCK_32X128, aom_highbd_sad32x128_bits12, - aom_highbd_sad32x128_avg_bits12, - aom_highbd_12_variance32x128, - aom_highbd_12_sub_pixel_variance32x128, - aom_highbd_12_sub_pixel_avg_variance32x128, NULL, NULL, - aom_highbd_sad32x128x4d_bits12) -#endif // CONFIG_EXT_PARTITION - HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits12, aom_highbd_sad64x16_avg_bits12, aom_highbd_12_variance64x16, aom_highbd_12_sub_pixel_variance64x16, - aom_highbd_12_sub_pixel_avg_variance64x16, NULL, NULL, - aom_highbd_sad64x16x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance64x16, + aom_highbd_sad64x16x4d_bits12, + aom_highbd_jnt_sad64x16_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance64x16); HIGHBD_BFP(BLOCK_16X64, aom_highbd_sad16x64_bits12, aom_highbd_sad16x64_avg_bits12, aom_highbd_12_variance16x64, aom_highbd_12_sub_pixel_variance16x64, - aom_highbd_12_sub_pixel_avg_variance16x64, NULL, NULL, - aom_highbd_sad16x64x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance16x64, + aom_highbd_sad16x64x4d_bits12, + aom_highbd_jnt_sad16x64_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance16x64); HIGHBD_BFP(BLOCK_32X8, aom_highbd_sad32x8_bits12, aom_highbd_sad32x8_avg_bits12, aom_highbd_12_variance32x8, aom_highbd_12_sub_pixel_variance32x8, - aom_highbd_12_sub_pixel_avg_variance32x8, NULL, NULL, - aom_highbd_sad32x8x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance32x8, + aom_highbd_sad32x8x4d_bits12, + aom_highbd_jnt_sad32x8_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance32x8); HIGHBD_BFP(BLOCK_8X32, aom_highbd_sad8x32_bits12, aom_highbd_sad8x32_avg_bits12, aom_highbd_12_variance8x32, aom_highbd_12_sub_pixel_variance8x32, - aom_highbd_12_sub_pixel_avg_variance8x32, NULL, NULL, - aom_highbd_sad8x32x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance8x32, + aom_highbd_sad8x32x4d_bits12, + aom_highbd_jnt_sad8x32_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance8x32); HIGHBD_BFP(BLOCK_16X4, aom_highbd_sad16x4_bits12, aom_highbd_sad16x4_avg_bits12, aom_highbd_12_variance16x4, aom_highbd_12_sub_pixel_variance16x4, - aom_highbd_12_sub_pixel_avg_variance16x4, NULL, NULL, - aom_highbd_sad16x4x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance16x4, + aom_highbd_sad16x4x4d_bits12, + aom_highbd_jnt_sad16x4_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance16x4); HIGHBD_BFP(BLOCK_4X16, aom_highbd_sad4x16_bits12, aom_highbd_sad4x16_avg_bits12, aom_highbd_12_variance4x16, aom_highbd_12_sub_pixel_variance4x16, - aom_highbd_12_sub_pixel_avg_variance4x16, NULL, NULL, - aom_highbd_sad4x16x4d_bits12) -#endif + aom_highbd_12_sub_pixel_avg_variance4x16, + aom_highbd_sad4x16x4d_bits12, + aom_highbd_jnt_sad4x16_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance4x16); HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits12, aom_highbd_sad32x16_avg_bits12, aom_highbd_12_variance32x16, aom_highbd_12_sub_pixel_variance32x16, - aom_highbd_12_sub_pixel_avg_variance32x16, NULL, NULL, - aom_highbd_sad32x16x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance32x16, + aom_highbd_sad32x16x4d_bits12, + aom_highbd_jnt_sad32x16_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance32x16); HIGHBD_BFP(BLOCK_16X32, aom_highbd_sad16x32_bits12, aom_highbd_sad16x32_avg_bits12, aom_highbd_12_variance16x32, aom_highbd_12_sub_pixel_variance16x32, - aom_highbd_12_sub_pixel_avg_variance16x32, NULL, NULL, - aom_highbd_sad16x32x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance16x32, + aom_highbd_sad16x32x4d_bits12, + aom_highbd_jnt_sad16x32_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance16x32); HIGHBD_BFP(BLOCK_64X32, aom_highbd_sad64x32_bits12, aom_highbd_sad64x32_avg_bits12, aom_highbd_12_variance64x32, aom_highbd_12_sub_pixel_variance64x32, - aom_highbd_12_sub_pixel_avg_variance64x32, NULL, NULL, - aom_highbd_sad64x32x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance64x32, + aom_highbd_sad64x32x4d_bits12, + aom_highbd_jnt_sad64x32_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance64x32); HIGHBD_BFP(BLOCK_32X64, aom_highbd_sad32x64_bits12, aom_highbd_sad32x64_avg_bits12, aom_highbd_12_variance32x64, aom_highbd_12_sub_pixel_variance32x64, - aom_highbd_12_sub_pixel_avg_variance32x64, NULL, NULL, - aom_highbd_sad32x64x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance32x64, + aom_highbd_sad32x64x4d_bits12, + aom_highbd_jnt_sad32x64_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance32x64); HIGHBD_BFP(BLOCK_32X32, aom_highbd_sad32x32_bits12, aom_highbd_sad32x32_avg_bits12, aom_highbd_12_variance32x32, aom_highbd_12_sub_pixel_variance32x32, aom_highbd_12_sub_pixel_avg_variance32x32, - aom_highbd_sad32x32x3_bits12, aom_highbd_sad32x32x8_bits12, - aom_highbd_sad32x32x4d_bits12) + aom_highbd_sad32x32x4d_bits12, + aom_highbd_jnt_sad32x32_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance32x32); HIGHBD_BFP(BLOCK_64X64, aom_highbd_sad64x64_bits12, aom_highbd_sad64x64_avg_bits12, aom_highbd_12_variance64x64, aom_highbd_12_sub_pixel_variance64x64, aom_highbd_12_sub_pixel_avg_variance64x64, - aom_highbd_sad64x64x3_bits12, aom_highbd_sad64x64x8_bits12, - aom_highbd_sad64x64x4d_bits12) + aom_highbd_sad64x64x4d_bits12, + aom_highbd_jnt_sad64x64_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance64x64); HIGHBD_BFP(BLOCK_16X16, aom_highbd_sad16x16_bits12, aom_highbd_sad16x16_avg_bits12, aom_highbd_12_variance16x16, aom_highbd_12_sub_pixel_variance16x16, aom_highbd_12_sub_pixel_avg_variance16x16, - aom_highbd_sad16x16x3_bits12, aom_highbd_sad16x16x8_bits12, - aom_highbd_sad16x16x4d_bits12) + aom_highbd_sad16x16x4d_bits12, + aom_highbd_jnt_sad16x16_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance16x16); HIGHBD_BFP(BLOCK_16X8, aom_highbd_sad16x8_bits12, aom_highbd_sad16x8_avg_bits12, aom_highbd_12_variance16x8, aom_highbd_12_sub_pixel_variance16x8, aom_highbd_12_sub_pixel_avg_variance16x8, - aom_highbd_sad16x8x3_bits12, aom_highbd_sad16x8x8_bits12, - aom_highbd_sad16x8x4d_bits12) + aom_highbd_sad16x8x4d_bits12, + aom_highbd_jnt_sad16x8_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance16x8); HIGHBD_BFP(BLOCK_8X16, aom_highbd_sad8x16_bits12, aom_highbd_sad8x16_avg_bits12, aom_highbd_12_variance8x16, aom_highbd_12_sub_pixel_variance8x16, aom_highbd_12_sub_pixel_avg_variance8x16, - aom_highbd_sad8x16x3_bits12, aom_highbd_sad8x16x8_bits12, - aom_highbd_sad8x16x4d_bits12) + aom_highbd_sad8x16x4d_bits12, + aom_highbd_jnt_sad8x16_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance8x16); HIGHBD_BFP( BLOCK_8X8, aom_highbd_sad8x8_bits12, aom_highbd_sad8x8_avg_bits12, aom_highbd_12_variance8x8, aom_highbd_12_sub_pixel_variance8x8, - aom_highbd_12_sub_pixel_avg_variance8x8, aom_highbd_sad8x8x3_bits12, - aom_highbd_sad8x8x8_bits12, aom_highbd_sad8x8x4d_bits12) + aom_highbd_12_sub_pixel_avg_variance8x8, + aom_highbd_sad8x8x4d_bits12, aom_highbd_jnt_sad8x8_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance8x8); - HIGHBD_BFP(BLOCK_8X4, aom_highbd_sad8x4_bits12, - aom_highbd_sad8x4_avg_bits12, aom_highbd_12_variance8x4, - aom_highbd_12_sub_pixel_variance8x4, - aom_highbd_12_sub_pixel_avg_variance8x4, NULL, - aom_highbd_sad8x4x8_bits12, aom_highbd_sad8x4x4d_bits12) + HIGHBD_BFP( + BLOCK_8X4, aom_highbd_sad8x4_bits12, aom_highbd_sad8x4_avg_bits12, + aom_highbd_12_variance8x4, aom_highbd_12_sub_pixel_variance8x4, + aom_highbd_12_sub_pixel_avg_variance8x4, + aom_highbd_sad8x4x4d_bits12, aom_highbd_jnt_sad8x4_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance8x4); - HIGHBD_BFP(BLOCK_4X8, aom_highbd_sad4x8_bits12, - aom_highbd_sad4x8_avg_bits12, aom_highbd_12_variance4x8, - aom_highbd_12_sub_pixel_variance4x8, - aom_highbd_12_sub_pixel_avg_variance4x8, NULL, - aom_highbd_sad4x8x8_bits12, aom_highbd_sad4x8x4d_bits12) + HIGHBD_BFP( + BLOCK_4X8, aom_highbd_sad4x8_bits12, aom_highbd_sad4x8_avg_bits12, + aom_highbd_12_variance4x8, aom_highbd_12_sub_pixel_variance4x8, + aom_highbd_12_sub_pixel_avg_variance4x8, + aom_highbd_sad4x8x4d_bits12, aom_highbd_jnt_sad4x8_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance4x8); HIGHBD_BFP( BLOCK_4X4, aom_highbd_sad4x4_bits12, aom_highbd_sad4x4_avg_bits12, aom_highbd_12_variance4x4, aom_highbd_12_sub_pixel_variance4x4, - aom_highbd_12_sub_pixel_avg_variance4x4, aom_highbd_sad4x4x3_bits12, - aom_highbd_sad4x4x8_bits12, aom_highbd_sad4x4x4d_bits12) - -#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 - HIGHBD_BFP(BLOCK_2X2, NULL, NULL, aom_highbd_12_variance2x2, NULL, NULL, - NULL, NULL, NULL) - HIGHBD_BFP(BLOCK_4X2, NULL, NULL, aom_highbd_12_variance4x2, NULL, NULL, - NULL, NULL, NULL) - HIGHBD_BFP(BLOCK_2X4, NULL, NULL, aom_highbd_12_variance2x4, NULL, NULL, - NULL, NULL, NULL) -#endif + aom_highbd_12_sub_pixel_avg_variance4x4, + aom_highbd_sad4x4x4d_bits12, aom_highbd_jnt_sad4x4_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance4x4); + + HIGHBD_BFP(BLOCK_128X128, aom_highbd_sad128x128_bits12, + aom_highbd_sad128x128_avg_bits12, + aom_highbd_12_variance128x128, + aom_highbd_12_sub_pixel_variance128x128, + aom_highbd_12_sub_pixel_avg_variance128x128, + aom_highbd_sad128x128x4d_bits12, + aom_highbd_jnt_sad128x128_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance128x128); + + HIGHBD_BFP( + BLOCK_128X64, aom_highbd_sad128x64_bits12, + aom_highbd_sad128x64_avg_bits12, aom_highbd_12_variance128x64, + aom_highbd_12_sub_pixel_variance128x64, + aom_highbd_12_sub_pixel_avg_variance128x64, + aom_highbd_sad128x64x4d_bits12, aom_highbd_jnt_sad128x64_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance128x64); -#if CONFIG_EXT_PARTITION HIGHBD_BFP( - BLOCK_128X128, aom_highbd_sad128x128_bits12, - aom_highbd_sad128x128_avg_bits12, aom_highbd_12_variance128x128, - aom_highbd_12_sub_pixel_variance128x128, - aom_highbd_12_sub_pixel_avg_variance128x128, - aom_highbd_sad128x128x3_bits12, aom_highbd_sad128x128x8_bits12, - aom_highbd_sad128x128x4d_bits12) - - HIGHBD_BFP(BLOCK_128X64, aom_highbd_sad128x64_bits12, - aom_highbd_sad128x64_avg_bits12, - aom_highbd_12_variance128x64, - aom_highbd_12_sub_pixel_variance128x64, - aom_highbd_12_sub_pixel_avg_variance128x64, NULL, NULL, - aom_highbd_sad128x64x4d_bits12) - - HIGHBD_BFP(BLOCK_64X128, aom_highbd_sad64x128_bits12, - aom_highbd_sad64x128_avg_bits12, - aom_highbd_12_variance64x128, - aom_highbd_12_sub_pixel_variance64x128, - aom_highbd_12_sub_pixel_avg_variance64x128, NULL, NULL, - aom_highbd_sad64x128x4d_bits12) -#endif // CONFIG_EXT_PARTITION - -#if CONFIG_EXT_PARTITION + BLOCK_64X128, aom_highbd_sad64x128_bits12, + aom_highbd_sad64x128_avg_bits12, aom_highbd_12_variance64x128, + aom_highbd_12_sub_pixel_variance64x128, + aom_highbd_12_sub_pixel_avg_variance64x128, + aom_highbd_sad64x128x4d_bits12, aom_highbd_jnt_sad64x128_avg_bits12, + aom_highbd_12_jnt_sub_pixel_avg_variance64x128); + HIGHBD_MBFP(BLOCK_128X128, aom_highbd_masked_sad128x128_bits12, aom_highbd_12_masked_sub_pixel_variance128x128) HIGHBD_MBFP(BLOCK_128X64, aom_highbd_masked_sad128x64_bits12, aom_highbd_12_masked_sub_pixel_variance128x64) HIGHBD_MBFP(BLOCK_64X128, aom_highbd_masked_sad64x128_bits12, aom_highbd_12_masked_sub_pixel_variance64x128) -#endif // CONFIG_EXT_PARTITION HIGHBD_MBFP(BLOCK_64X64, aom_highbd_masked_sad64x64_bits12, aom_highbd_12_masked_sub_pixel_variance64x64) HIGHBD_MBFP(BLOCK_64X32, aom_highbd_masked_sad64x32_bits12, @@ -2342,36 +2144,18 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { aom_highbd_12_masked_sub_pixel_variance8x4) HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits12, aom_highbd_12_masked_sub_pixel_variance4x4) -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits12, - aom_highbd_12_masked_sub_pixel_variance128x32) - - HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits12, - aom_highbd_12_masked_sub_pixel_variance32x128) -#endif // CONFIG_EXT_PARTITION - HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits12, aom_highbd_12_masked_sub_pixel_variance64x16) - HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits12, aom_highbd_12_masked_sub_pixel_variance16x64) - HIGHBD_MBFP(BLOCK_32X8, aom_highbd_masked_sad32x8_bits12, aom_highbd_12_masked_sub_pixel_variance32x8) - HIGHBD_MBFP(BLOCK_8X32, aom_highbd_masked_sad8x32_bits12, aom_highbd_12_masked_sub_pixel_variance8x32) - HIGHBD_MBFP(BLOCK_16X4, aom_highbd_masked_sad16x4_bits12, aom_highbd_12_masked_sub_pixel_variance16x4) - HIGHBD_MBFP(BLOCK_4X16, aom_highbd_masked_sad4x16_bits12, aom_highbd_12_masked_sub_pixel_variance4x16) -#endif - -#if CONFIG_MOTION_VAR -#if CONFIG_EXT_PARTITION HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits12, aom_highbd_12_obmc_variance128x128, aom_highbd_12_obmc_sub_pixel_variance128x128) @@ -2381,7 +2165,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { HIGHBD_OBFP(BLOCK_64X128, aom_highbd_obmc_sad64x128_bits12, aom_highbd_12_obmc_variance64x128, aom_highbd_12_obmc_sub_pixel_variance64x128) -#endif // CONFIG_EXT_PARTITION HIGHBD_OBFP(BLOCK_64X64, aom_highbd_obmc_sad64x64_bits12, aom_highbd_12_obmc_variance64x64, aom_highbd_12_obmc_sub_pixel_variance64x64) @@ -2421,42 +2204,24 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits12, aom_highbd_12_obmc_variance4x4, aom_highbd_12_obmc_sub_pixel_variance4x4) -#if CONFIG_EXT_PARTITION_TYPES -#if CONFIG_EXT_PARTITION - HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits12, - aom_highbd_12_obmc_variance128x32, - aom_highbd_12_obmc_sub_pixel_variance128x32) - - HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits12, - aom_highbd_12_obmc_variance32x128, - aom_highbd_12_obmc_sub_pixel_variance32x128) -#endif // CONFIG_EXT_PARTITION - HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits12, aom_highbd_12_obmc_variance64x16, aom_highbd_12_obmc_sub_pixel_variance64x16) - HIGHBD_OBFP(BLOCK_16X64, aom_highbd_obmc_sad16x64_bits12, aom_highbd_12_obmc_variance16x64, aom_highbd_12_obmc_sub_pixel_variance16x64) - HIGHBD_OBFP(BLOCK_32X8, aom_highbd_obmc_sad32x8_bits12, aom_highbd_12_obmc_variance32x8, aom_highbd_12_obmc_sub_pixel_variance32x8) - HIGHBD_OBFP(BLOCK_8X32, aom_highbd_obmc_sad8x32_bits12, aom_highbd_12_obmc_variance8x32, aom_highbd_12_obmc_sub_pixel_variance8x32) - HIGHBD_OBFP(BLOCK_16X4, aom_highbd_obmc_sad16x4_bits12, aom_highbd_12_obmc_variance16x4, aom_highbd_12_obmc_sub_pixel_variance16x4) - HIGHBD_OBFP(BLOCK_4X16, aom_highbd_obmc_sad4x16_bits12, aom_highbd_12_obmc_variance4x16, aom_highbd_12_obmc_sub_pixel_variance4x16) -#endif -#endif // CONFIG_MOTION_VAR break; default: @@ -2466,7 +2231,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { } } } -#endif // CONFIG_HIGHBITDEPTH static void realloc_segmentation_maps(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; @@ -2487,40 +2251,59 @@ static void realloc_segmentation_maps(AV1_COMP *cpi) { aom_calloc(cm->mi_rows * cm->mi_cols, 1)); } -void set_compound_tools(AV1_COMMON *cm) { - (void)cm; -#if CONFIG_INTERINTRA - cm->allow_interintra_compound = 1; -#endif // CONFIG_INTERINTRA -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT - cm->allow_masked_compound = 1; -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT -} - void av1_change_config(struct AV1_COMP *cpi, const AV1EncoderConfig *oxcf) { AV1_COMMON *const cm = &cpi->common; + const int num_planes = av1_num_planes(cm); RATE_CONTROL *const rc = &cpi->rc; MACROBLOCK *const x = &cpi->td.mb; if (cm->profile != oxcf->profile) cm->profile = oxcf->profile; cm->bit_depth = oxcf->bit_depth; - cm->color_space = oxcf->color_space; -#if CONFIG_COLORSPACE_HEADERS - cm->transfer_function = oxcf->transfer_function; + cm->color_primaries = oxcf->color_primaries; + cm->transfer_characteristics = oxcf->transfer_characteristics; + cm->matrix_coefficients = oxcf->matrix_coefficients; + cm->seq_params.monochrome = oxcf->monochrome; cm->chroma_sample_position = oxcf->chroma_sample_position; -#endif cm->color_range = oxcf->color_range; - if (cm->profile <= PROFILE_1) - assert(cm->bit_depth == AOM_BITS_8); - else - assert(cm->bit_depth > AOM_BITS_8); + assert(IMPLIES(cm->profile <= PROFILE_1, cm->bit_depth <= AOM_BITS_10)); + + cm->timing_info_present = oxcf->timing_info_present; + cm->timing_info.num_units_in_display_tick = + oxcf->timing_info.num_units_in_display_tick; + cm->timing_info.time_scale = oxcf->timing_info.time_scale; + cm->timing_info.equal_picture_interval = + oxcf->timing_info.equal_picture_interval; + cm->timing_info.num_ticks_per_picture = + oxcf->timing_info.num_ticks_per_picture; + + cm->seq_params.display_model_info_present_flag = + oxcf->display_model_info_present_flag; + cm->seq_params.decoder_model_info_present_flag = + oxcf->decoder_model_info_present_flag; + if (oxcf->decoder_model_info_present_flag) { + // set the decoder model parameters in schedule mode + cm->buffer_model.num_units_in_decoding_tick = + oxcf->buffer_model.num_units_in_decoding_tick; + cm->buffer_removal_delay_present = 1; + set_aom_dec_model_info(&cm->buffer_model); + set_dec_model_op_parameters(&cm->op_params[0]); + } else if (cm->timing_info_present && + cm->timing_info.equal_picture_interval && + !cm->seq_params.decoder_model_info_present_flag) { + // set the decoder model parameters in resource availability mode + set_resource_availability_parameters(&cm->op_params[0]); + } else { + cm->op_params[0].initial_display_delay = + 10; // Default value (not signaled) + } + + update_film_grain_parameters(cpi, oxcf); cpi->oxcf = *oxcf; + cpi->common.options = oxcf->cfg; x->e_mbd.bd = (int)cm->bit_depth; -#if CONFIG_GLOBAL_MOTION x->e_mbd.global_motion = cm->global_motion; -#endif // CONFIG_GLOBAL_MOTION if ((oxcf->pass == 0) && (oxcf->rc_mode == AOM_Q)) { rc->baseline_gf_interval = FIXED_GF_INTERVAL; @@ -2530,30 +2313,21 @@ void av1_change_config(struct AV1_COMP *cpi, const AV1EncoderConfig *oxcf) { cpi->refresh_last_frame = 1; cpi->refresh_golden_frame = 0; -#if CONFIG_EXT_REFS cpi->refresh_bwd_ref_frame = 0; cpi->refresh_alt2_ref_frame = 0; -#endif // CONFIG_EXT_REFS - - cm->refresh_frame_context = - (oxcf->error_resilient_mode || oxcf->frame_parallel_decoding_mode) - ? REFRESH_FRAME_CONTEXT_FORWARD - : REFRESH_FRAME_CONTEXT_BACKWARD; -#if !CONFIG_NO_FRAME_CONTEXT_SIGNALING - cm->reset_frame_context = RESET_FRAME_CONTEXT_NONE; -#endif + + cm->refresh_frame_context = (oxcf->frame_parallel_decoding_mode) + ? REFRESH_FRAME_CONTEXT_DISABLED + : REFRESH_FRAME_CONTEXT_BACKWARD; + if (oxcf->large_scale_tile) + cm->refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED; if (x->palette_buffer == NULL) { CHECK_MEM_ERROR(cm, x->palette_buffer, aom_memalign(16, sizeof(*x->palette_buffer))); } - set_compound_tools(cm); av1_reset_segment_features(cm); -#if CONFIG_AMVR - set_high_precision_mv(cpi, 0, 0); -#else - set_high_precision_mv(cpi, 0); -#endif + set_high_precision_mv(cpi, 1, 0); set_rc_buffer_sizes(rc, &cpi->oxcf); @@ -2569,7 +2343,12 @@ void av1_change_config(struct AV1_COMP *cpi, const AV1EncoderConfig *oxcf) { rc->worst_quality = cpi->oxcf.worst_allowed_q; rc->best_quality = cpi->oxcf.best_allowed_q; - cm->interp_filter = cpi->sf.default_interp_filter; + if (!oxcf->large_scale_tile) + cm->interp_filter = cpi->sf.default_interp_filter; + else + cm->interp_filter = EIGHTTAP_REGULAR; + + cm->switchable_motion_mode = 1; if (cpi->oxcf.render_width > 0 && cpi->oxcf.render_height > 0) { cm->render_width = cpi->oxcf.render_width; @@ -2581,10 +2360,17 @@ void av1_change_config(struct AV1_COMP *cpi, const AV1EncoderConfig *oxcf) { cm->width = cpi->oxcf.width; cm->height = cpi->oxcf.height; - if (cpi->initial_width) { - if (cm->width > cpi->initial_width || cm->height > cpi->initial_height) { + int sb_size = cm->seq_params.sb_size; + // Superblock size should not be updated after the first key frame. + if (!cpi->seq_params_locked) { + set_sb_size(&cm->seq_params, select_sb_size(cpi)); + } + + if (cpi->initial_width || sb_size != cm->seq_params.sb_size) { + if (cm->width > cpi->initial_width || cm->height > cpi->initial_height || + cm->seq_params.sb_size != sb_size) { av1_free_context_buffers(cm); - av1_free_pc_tree(&cpi->td); + av1_free_pc_tree(&cpi->td, num_planes); alloc_compressor_data(cpi); realloc_segmentation_maps(cpi); cpi->initial_width = cpi->initial_height = 0; @@ -2595,32 +2381,24 @@ void av1_change_config(struct AV1_COMP *cpi, const AV1EncoderConfig *oxcf) { cpi->alt_ref_source = NULL; rc->is_src_frame_alt_ref = 0; -#if CONFIG_EXT_REFS rc->is_bwd_ref_frame = 0; rc->is_last_bipred_frame = 0; rc->is_bipred_frame = 0; -#endif // CONFIG_EXT_REFS - -#if 0 - // Experimental RD Code - cpi->frame_distortion = 0; - cpi->last_frame_distortion = 0; -#endif set_tile_info(cpi); cpi->ext_refresh_frame_flags_pending = 0; cpi->ext_refresh_frame_context_pending = 0; -#if CONFIG_HIGHBITDEPTH highbd_set_var_fns(cpi); -#endif -#if CONFIG_ANS && ANS_MAX_SYMBOLS - cpi->common.ans_window_size_log2 = cpi->oxcf.ans_window_size_log2; -#endif // CONFIG_ANS && ANS_MAX_SYMBOLS -#if CONFIG_AMVR - cm->seq_mv_precision_level = 2; -#endif + + // Init sequence level coding tools + // This should not be called after the first key frame. + if (!cpi->seq_params_locked) { + cm->seq_params.operating_points_cnt_minus_1 = + cm->number_spatial_layers > 1 ? cm->number_spatial_layers - 1 : 0; + init_seq_coding_tools(&cm->seq_params, cm, oxcf); + } } AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, @@ -2644,10 +2422,6 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, cm->free_mi = enc_free_mi; cm->setup_mi = enc_setup_mi; -#if CONFIG_NCOBMC_ADAPT_WEIGHT - get_default_ncobmc_kernels(cm); -#endif // CONFIG_NCOBMC_ADAPT_WEIGHT - CHECK_MEM_ERROR(cm, cm->fc, (FRAME_CONTEXT *)aom_memalign(32, sizeof(*cm->fc))); CHECK_MEM_ERROR(cm, cm->frame_contexts, @@ -2663,38 +2437,18 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, cpi->common.buffer_pool = pool; init_config(cpi, oxcf); -#if CONFIG_XIPHRC - cpi->od_rc.framerate = cpi->framerate; - cpi->od_rc.frame_width = cm->render_width; - cpi->od_rc.frame_height = cm->render_height; - cpi->od_rc.keyframe_rate = oxcf->key_freq; - cpi->od_rc.goldenframe_rate = FIXED_GF_INTERVAL; - cpi->od_rc.altref_rate = 25; - cpi->od_rc.firstpass_quant = 1; - cpi->od_rc.bit_depth = cm->bit_depth; - cpi->od_rc.minq = oxcf->best_allowed_q; - cpi->od_rc.maxq = oxcf->worst_allowed_q; - if (cpi->oxcf.rc_mode == AOM_CQ) cpi->od_rc.minq = cpi->od_rc.quality; - cpi->od_rc.quality = cpi->oxcf.rc_mode == AOM_Q ? oxcf->cq_level : -1; - cpi->od_rc.periodic_boosts = oxcf->frame_periodic_boost; - od_enc_rc_init(&cpi->od_rc, - cpi->oxcf.rc_mode == AOM_Q ? -1 : oxcf->target_bandwidth, - oxcf->maximum_buffer_size_ms); -#else av1_rc_init(&cpi->oxcf, oxcf->pass, &cpi->rc); -#endif cm->current_video_frame = 0; + cpi->seq_params_locked = 0; cpi->partition_search_skippable_frame = 0; cpi->tile_data = NULL; cpi->last_show_frame_buf_idx = INVALID_IDX; realloc_segmentation_maps(cpi); - for (i = 0; i < NMV_CONTEXTS; ++i) { - memset(cpi->nmv_costs, 0, sizeof(cpi->nmv_costs)); - memset(cpi->nmv_costs_hp, 0, sizeof(cpi->nmv_costs_hp)); - } + memset(cpi->nmv_costs, 0, sizeof(cpi->nmv_costs)); + memset(cpi->nmv_costs_hp, 0, sizeof(cpi->nmv_costs_hp)); for (i = 0; i < (sizeof(cpi->mbgraph_stats) / sizeof(cpi->mbgraph_stats[0])); i++) { @@ -2715,7 +2469,6 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, #endif cpi->refresh_alt_ref_frame = 0; - cpi->multi_arf_last_grp_enabled = 0; cpi->b_calculate_psnr = CONFIG_INTERNAL_STATS; #if CONFIG_INTERNAL_STATS @@ -2753,17 +2506,14 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, #endif #if CONFIG_ENTROPY_STATS av1_zero(aggregate_fc); - av1_zero_array(aggregate_fc_per_type, FRAME_CONTEXTS); #endif // CONFIG_ENTROPY_STATS cpi->first_time_stamp_ever = INT64_MAX; - for (i = 0; i < NMV_CONTEXTS; ++i) { - cpi->td.mb.nmvcost[i][0] = &cpi->nmv_costs[i][0][MV_MAX]; - cpi->td.mb.nmvcost[i][1] = &cpi->nmv_costs[i][1][MV_MAX]; - cpi->td.mb.nmvcost_hp[i][0] = &cpi->nmv_costs_hp[i][0][MV_MAX]; - cpi->td.mb.nmvcost_hp[i][1] = &cpi->nmv_costs_hp[i][1][MV_MAX]; - } + cpi->td.mb.nmvcost[0] = &cpi->nmv_costs[0][MV_MAX]; + cpi->td.mb.nmvcost[1] = &cpi->nmv_costs[1][MV_MAX]; + cpi->td.mb.nmvcost_hp[0] = &cpi->nmv_costs_hp[0][MV_MAX]; + cpi->td.mb.nmvcost_hp[1] = &cpi->nmv_costs_hp[1][MV_MAX]; #ifdef OUTPUT_YUV_SKINMAP yuv_skinmap_file = fopen("skinmap.yuv", "ab"); @@ -2772,17 +2522,6 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, yuv_rec_file = fopen("rec.yuv", "wb"); #endif -#if 0 - framepsnr = fopen("framepsnr.stt", "a"); - kf_list = fopen("kf_list.stt", "w"); -#endif - -#if CONFIG_XIPHRC - if (oxcf->pass == 2) { - cpi->od_rc.twopass_allframes_buf = oxcf->two_pass_stats_in.buf; - cpi->od_rc.twopass_allframes_buf_size = oxcf->two_pass_stats_in.sz; - } -#else if (oxcf->pass == 1) { av1_init_first_pass(cpi); } else if (oxcf->pass == 2) { @@ -2808,24 +2547,15 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, av1_init_second_pass(cpi); } -#endif -#if CONFIG_MOTION_VAR -#if CONFIG_HIGHBITDEPTH - int buf_scaler = 2; -#else - int buf_scaler = 1; -#endif CHECK_MEM_ERROR( cm, cpi->td.mb.above_pred_buf, - (uint8_t *)aom_memalign(16, - buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE * - sizeof(*cpi->td.mb.above_pred_buf))); + (uint8_t *)aom_memalign(16, MAX_MB_PLANE * MAX_SB_SQUARE * + sizeof(*cpi->td.mb.above_pred_buf))); CHECK_MEM_ERROR( cm, cpi->td.mb.left_pred_buf, - (uint8_t *)aom_memalign(16, - buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE * - sizeof(*cpi->td.mb.left_pred_buf))); + (uint8_t *)aom_memalign(16, MAX_MB_PLANE * MAX_SB_SQUARE * + sizeof(*cpi->td.mb.left_pred_buf))); CHECK_MEM_ERROR(cm, cpi->td.mb.wsrc_buf, (int32_t *)aom_memalign( @@ -2835,143 +2565,130 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, (int32_t *)aom_memalign( 16, MAX_SB_SQUARE * sizeof(*cpi->td.mb.mask_buf))); -#endif - av1_set_speed_features_framesize_independent(cpi); av1_set_speed_features_framesize_dependent(cpi); -#define BFP(BT, SDF, SDAF, VF, SVF, SVAF, SDX3F, SDX8F, SDX4DF) \ +#define BFP(BT, SDF, SDAF, VF, SVF, SVAF, SDX4DF, JSDAF, JSVAF) \ cpi->fn_ptr[BT].sdf = SDF; \ cpi->fn_ptr[BT].sdaf = SDAF; \ cpi->fn_ptr[BT].vf = VF; \ cpi->fn_ptr[BT].svf = SVF; \ cpi->fn_ptr[BT].svaf = SVAF; \ - cpi->fn_ptr[BT].sdx3f = SDX3F; \ - cpi->fn_ptr[BT].sdx8f = SDX8F; \ - cpi->fn_ptr[BT].sdx4df = SDX4DF; + cpi->fn_ptr[BT].sdx4df = SDX4DF; \ + cpi->fn_ptr[BT].jsdaf = JSDAF; \ + cpi->fn_ptr[BT].jsvaf = JSVAF; -#if CONFIG_EXT_PARTITION_TYPES BFP(BLOCK_4X16, aom_sad4x16, aom_sad4x16_avg, aom_variance4x16, - aom_sub_pixel_variance4x16, aom_sub_pixel_avg_variance4x16, NULL, NULL, - aom_sad4x16x4d) + aom_sub_pixel_variance4x16, aom_sub_pixel_avg_variance4x16, + aom_sad4x16x4d, aom_jnt_sad4x16_avg, aom_jnt_sub_pixel_avg_variance4x16) BFP(BLOCK_16X4, aom_sad16x4, aom_sad16x4_avg, aom_variance16x4, - aom_sub_pixel_variance16x4, aom_sub_pixel_avg_variance16x4, NULL, NULL, - aom_sad16x4x4d) + aom_sub_pixel_variance16x4, aom_sub_pixel_avg_variance16x4, + aom_sad16x4x4d, aom_jnt_sad16x4_avg, aom_jnt_sub_pixel_avg_variance16x4) BFP(BLOCK_8X32, aom_sad8x32, aom_sad8x32_avg, aom_variance8x32, - aom_sub_pixel_variance8x32, aom_sub_pixel_avg_variance8x32, NULL, NULL, - aom_sad8x32x4d) + aom_sub_pixel_variance8x32, aom_sub_pixel_avg_variance8x32, + aom_sad8x32x4d, aom_jnt_sad8x32_avg, aom_jnt_sub_pixel_avg_variance8x32) BFP(BLOCK_32X8, aom_sad32x8, aom_sad32x8_avg, aom_variance32x8, - aom_sub_pixel_variance32x8, aom_sub_pixel_avg_variance32x8, NULL, NULL, - aom_sad32x8x4d) + aom_sub_pixel_variance32x8, aom_sub_pixel_avg_variance32x8, + aom_sad32x8x4d, aom_jnt_sad32x8_avg, aom_jnt_sub_pixel_avg_variance32x8) BFP(BLOCK_16X64, aom_sad16x64, aom_sad16x64_avg, aom_variance16x64, - aom_sub_pixel_variance16x64, aom_sub_pixel_avg_variance16x64, NULL, NULL, - aom_sad16x64x4d) + aom_sub_pixel_variance16x64, aom_sub_pixel_avg_variance16x64, + aom_sad16x64x4d, aom_jnt_sad16x64_avg, + aom_jnt_sub_pixel_avg_variance16x64) BFP(BLOCK_64X16, aom_sad64x16, aom_sad64x16_avg, aom_variance64x16, - aom_sub_pixel_variance64x16, aom_sub_pixel_avg_variance64x16, NULL, NULL, - aom_sad64x16x4d) + aom_sub_pixel_variance64x16, aom_sub_pixel_avg_variance64x16, + aom_sad64x16x4d, aom_jnt_sad64x16_avg, + aom_jnt_sub_pixel_avg_variance64x16) -#if CONFIG_EXT_PARTITION - BFP(BLOCK_32X128, aom_sad32x128, aom_sad32x128_avg, aom_variance32x128, - aom_sub_pixel_variance32x128, aom_sub_pixel_avg_variance32x128, NULL, - NULL, aom_sad32x128x4d) - - BFP(BLOCK_128X32, aom_sad128x32, aom_sad128x32_avg, aom_variance128x32, - aom_sub_pixel_variance128x32, aom_sub_pixel_avg_variance128x32, NULL, - NULL, aom_sad128x32x4d) -#endif // CONFIG_EXT_PARTITION -#endif // CONFIG_EXT_PARTITION_TYPES - -#if CONFIG_EXT_PARTITION BFP(BLOCK_128X128, aom_sad128x128, aom_sad128x128_avg, aom_variance128x128, aom_sub_pixel_variance128x128, aom_sub_pixel_avg_variance128x128, - aom_sad128x128x3, aom_sad128x128x8, aom_sad128x128x4d) + aom_sad128x128x4d, aom_jnt_sad128x128_avg, + aom_jnt_sub_pixel_avg_variance128x128) BFP(BLOCK_128X64, aom_sad128x64, aom_sad128x64_avg, aom_variance128x64, - aom_sub_pixel_variance128x64, aom_sub_pixel_avg_variance128x64, NULL, - NULL, aom_sad128x64x4d) + aom_sub_pixel_variance128x64, aom_sub_pixel_avg_variance128x64, + aom_sad128x64x4d, aom_jnt_sad128x64_avg, + aom_jnt_sub_pixel_avg_variance128x64) BFP(BLOCK_64X128, aom_sad64x128, aom_sad64x128_avg, aom_variance64x128, - aom_sub_pixel_variance64x128, aom_sub_pixel_avg_variance64x128, NULL, - NULL, aom_sad64x128x4d) -#endif // CONFIG_EXT_PARTITION + aom_sub_pixel_variance64x128, aom_sub_pixel_avg_variance64x128, + aom_sad64x128x4d, aom_jnt_sad64x128_avg, + aom_jnt_sub_pixel_avg_variance64x128) BFP(BLOCK_32X16, aom_sad32x16, aom_sad32x16_avg, aom_variance32x16, - aom_sub_pixel_variance32x16, aom_sub_pixel_avg_variance32x16, NULL, NULL, - aom_sad32x16x4d) + aom_sub_pixel_variance32x16, aom_sub_pixel_avg_variance32x16, + aom_sad32x16x4d, aom_jnt_sad32x16_avg, + aom_jnt_sub_pixel_avg_variance32x16) BFP(BLOCK_16X32, aom_sad16x32, aom_sad16x32_avg, aom_variance16x32, - aom_sub_pixel_variance16x32, aom_sub_pixel_avg_variance16x32, NULL, NULL, - aom_sad16x32x4d) + aom_sub_pixel_variance16x32, aom_sub_pixel_avg_variance16x32, + aom_sad16x32x4d, aom_jnt_sad16x32_avg, + aom_jnt_sub_pixel_avg_variance16x32) BFP(BLOCK_64X32, aom_sad64x32, aom_sad64x32_avg, aom_variance64x32, - aom_sub_pixel_variance64x32, aom_sub_pixel_avg_variance64x32, NULL, NULL, - aom_sad64x32x4d) + aom_sub_pixel_variance64x32, aom_sub_pixel_avg_variance64x32, + aom_sad64x32x4d, aom_jnt_sad64x32_avg, + aom_jnt_sub_pixel_avg_variance64x32) BFP(BLOCK_32X64, aom_sad32x64, aom_sad32x64_avg, aom_variance32x64, - aom_sub_pixel_variance32x64, aom_sub_pixel_avg_variance32x64, NULL, NULL, - aom_sad32x64x4d) + aom_sub_pixel_variance32x64, aom_sub_pixel_avg_variance32x64, + aom_sad32x64x4d, aom_jnt_sad32x64_avg, + aom_jnt_sub_pixel_avg_variance32x64) BFP(BLOCK_32X32, aom_sad32x32, aom_sad32x32_avg, aom_variance32x32, aom_sub_pixel_variance32x32, aom_sub_pixel_avg_variance32x32, - aom_sad32x32x3, aom_sad32x32x8, aom_sad32x32x4d) + aom_sad32x32x4d, aom_jnt_sad32x32_avg, + aom_jnt_sub_pixel_avg_variance32x32) BFP(BLOCK_64X64, aom_sad64x64, aom_sad64x64_avg, aom_variance64x64, aom_sub_pixel_variance64x64, aom_sub_pixel_avg_variance64x64, - aom_sad64x64x3, aom_sad64x64x8, aom_sad64x64x4d) + aom_sad64x64x4d, aom_jnt_sad64x64_avg, + aom_jnt_sub_pixel_avg_variance64x64) BFP(BLOCK_16X16, aom_sad16x16, aom_sad16x16_avg, aom_variance16x16, aom_sub_pixel_variance16x16, aom_sub_pixel_avg_variance16x16, - aom_sad16x16x3, aom_sad16x16x8, aom_sad16x16x4d) + aom_sad16x16x4d, aom_jnt_sad16x16_avg, + aom_jnt_sub_pixel_avg_variance16x16) BFP(BLOCK_16X8, aom_sad16x8, aom_sad16x8_avg, aom_variance16x8, - aom_sub_pixel_variance16x8, aom_sub_pixel_avg_variance16x8, aom_sad16x8x3, - aom_sad16x8x8, aom_sad16x8x4d) + aom_sub_pixel_variance16x8, aom_sub_pixel_avg_variance16x8, + aom_sad16x8x4d, aom_jnt_sad16x8_avg, aom_jnt_sub_pixel_avg_variance16x8) BFP(BLOCK_8X16, aom_sad8x16, aom_sad8x16_avg, aom_variance8x16, - aom_sub_pixel_variance8x16, aom_sub_pixel_avg_variance8x16, aom_sad8x16x3, - aom_sad8x16x8, aom_sad8x16x4d) + aom_sub_pixel_variance8x16, aom_sub_pixel_avg_variance8x16, + aom_sad8x16x4d, aom_jnt_sad8x16_avg, aom_jnt_sub_pixel_avg_variance8x16) BFP(BLOCK_8X8, aom_sad8x8, aom_sad8x8_avg, aom_variance8x8, - aom_sub_pixel_variance8x8, aom_sub_pixel_avg_variance8x8, aom_sad8x8x3, - aom_sad8x8x8, aom_sad8x8x4d) + aom_sub_pixel_variance8x8, aom_sub_pixel_avg_variance8x8, aom_sad8x8x4d, + aom_jnt_sad8x8_avg, aom_jnt_sub_pixel_avg_variance8x8) BFP(BLOCK_8X4, aom_sad8x4, aom_sad8x4_avg, aom_variance8x4, - aom_sub_pixel_variance8x4, aom_sub_pixel_avg_variance8x4, NULL, - aom_sad8x4x8, aom_sad8x4x4d) + aom_sub_pixel_variance8x4, aom_sub_pixel_avg_variance8x4, aom_sad8x4x4d, + aom_jnt_sad8x4_avg, aom_jnt_sub_pixel_avg_variance8x4) BFP(BLOCK_4X8, aom_sad4x8, aom_sad4x8_avg, aom_variance4x8, - aom_sub_pixel_variance4x8, aom_sub_pixel_avg_variance4x8, NULL, - aom_sad4x8x8, aom_sad4x8x4d) + aom_sub_pixel_variance4x8, aom_sub_pixel_avg_variance4x8, aom_sad4x8x4d, + aom_jnt_sad4x8_avg, aom_jnt_sub_pixel_avg_variance4x8) BFP(BLOCK_4X4, aom_sad4x4, aom_sad4x4_avg, aom_variance4x4, - aom_sub_pixel_variance4x4, aom_sub_pixel_avg_variance4x4, aom_sad4x4x3, - aom_sad4x4x8, aom_sad4x4x4d) - -#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 - BFP(BLOCK_2X2, NULL, NULL, aom_variance2x2, NULL, NULL, NULL, NULL, NULL) - BFP(BLOCK_2X4, NULL, NULL, aom_variance2x4, NULL, NULL, NULL, NULL, NULL) - BFP(BLOCK_4X2, NULL, NULL, aom_variance4x2, NULL, NULL, NULL, NULL, NULL) -#endif + aom_sub_pixel_variance4x4, aom_sub_pixel_avg_variance4x4, aom_sad4x4x4d, + aom_jnt_sad4x4_avg, aom_jnt_sub_pixel_avg_variance4x4) -#if CONFIG_MOTION_VAR #define OBFP(BT, OSDF, OVF, OSVF) \ cpi->fn_ptr[BT].osdf = OSDF; \ cpi->fn_ptr[BT].ovf = OVF; \ cpi->fn_ptr[BT].osvf = OSVF; -#if CONFIG_EXT_PARTITION OBFP(BLOCK_128X128, aom_obmc_sad128x128, aom_obmc_variance128x128, aom_obmc_sub_pixel_variance128x128) OBFP(BLOCK_128X64, aom_obmc_sad128x64, aom_obmc_variance128x64, aom_obmc_sub_pixel_variance128x64) OBFP(BLOCK_64X128, aom_obmc_sad64x128, aom_obmc_variance64x128, aom_obmc_sub_pixel_variance64x128) -#endif // CONFIG_EXT_PARTITION OBFP(BLOCK_64X64, aom_obmc_sad64x64, aom_obmc_variance64x64, aom_obmc_sub_pixel_variance64x64) OBFP(BLOCK_64X32, aom_obmc_sad64x32, aom_obmc_variance64x32, @@ -2998,46 +2715,27 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, aom_obmc_sub_pixel_variance8x4) OBFP(BLOCK_4X4, aom_obmc_sad4x4, aom_obmc_variance4x4, aom_obmc_sub_pixel_variance4x4) - -#if CONFIG_EXT_PARTITION_TYPES OBFP(BLOCK_4X16, aom_obmc_sad4x16, aom_obmc_variance4x16, aom_obmc_sub_pixel_variance4x16) - OBFP(BLOCK_16X4, aom_obmc_sad16x4, aom_obmc_variance16x4, aom_obmc_sub_pixel_variance16x4) - OBFP(BLOCK_8X32, aom_obmc_sad8x32, aom_obmc_variance8x32, aom_obmc_sub_pixel_variance8x32) - OBFP(BLOCK_32X8, aom_obmc_sad32x8, aom_obmc_variance32x8, aom_obmc_sub_pixel_variance32x8) - OBFP(BLOCK_16X64, aom_obmc_sad16x64, aom_obmc_variance16x64, aom_obmc_sub_pixel_variance16x64) - OBFP(BLOCK_64X16, aom_obmc_sad64x16, aom_obmc_variance64x16, aom_obmc_sub_pixel_variance64x16) -#if CONFIG_EXT_PARTITION - OBFP(BLOCK_32X128, aom_obmc_sad32x128, aom_obmc_variance32x128, - aom_obmc_sub_pixel_variance32x128) - - OBFP(BLOCK_128X32, aom_obmc_sad128x32, aom_obmc_variance128x32, - aom_obmc_sub_pixel_variance128x32) -#endif // CONFIG_EXT_PARTITION -#endif // CONFIG_EXT_PARTITION_TYPES -#endif // CONFIG_MOTION_VAR - #define MBFP(BT, MCSDF, MCSVF) \ cpi->fn_ptr[BT].msdf = MCSDF; \ cpi->fn_ptr[BT].msvf = MCSVF; -#if CONFIG_EXT_PARTITION MBFP(BLOCK_128X128, aom_masked_sad128x128, aom_masked_sub_pixel_variance128x128) MBFP(BLOCK_128X64, aom_masked_sad128x64, aom_masked_sub_pixel_variance128x64) MBFP(BLOCK_64X128, aom_masked_sad64x128, aom_masked_sub_pixel_variance64x128) -#endif // CONFIG_EXT_PARTITION MBFP(BLOCK_64X64, aom_masked_sad64x64, aom_masked_sub_pixel_variance64x64) MBFP(BLOCK_64X32, aom_masked_sad64x32, aom_masked_sub_pixel_variance64x32) MBFP(BLOCK_32X64, aom_masked_sad32x64, aom_masked_sub_pixel_variance32x64) @@ -3052,7 +2750,6 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, MBFP(BLOCK_8X4, aom_masked_sad8x4, aom_masked_sub_pixel_variance8x4) MBFP(BLOCK_4X4, aom_masked_sad4x4, aom_masked_sub_pixel_variance4x4) -#if CONFIG_EXT_PARTITION_TYPES MBFP(BLOCK_4X16, aom_masked_sad4x16, aom_masked_sub_pixel_variance4x16) MBFP(BLOCK_16X4, aom_masked_sad16x4, aom_masked_sub_pixel_variance16x4) @@ -3065,16 +2762,7 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, MBFP(BLOCK_64X16, aom_masked_sad64x16, aom_masked_sub_pixel_variance64x16) -#if CONFIG_EXT_PARTITION - MBFP(BLOCK_32X128, aom_masked_sad32x128, aom_masked_sub_pixel_variance32x128) - - MBFP(BLOCK_128X32, aom_masked_sad128x32, aom_masked_sub_pixel_variance128x32) -#endif // CONFIG_EXT_PARTITION -#endif // CONFIG_EXT_PARTITION_TYPES - -#if CONFIG_HIGHBITDEPTH highbd_set_var_fns(cpi); -#endif /* av1_init_quantizer() is first called here. Add check in * av1_frame_init_quantizer() so that av1_init_quantizer is only @@ -3082,29 +2770,25 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, * av1_init_quantizer() for every frame. */ av1_init_quantizer(cpi); -#if CONFIG_AOM_QM - aom_qm_init(cm); -#endif + av1_qm_init(cm); av1_loop_filter_init(cm); -#if CONFIG_FRAME_SUPERRES cm->superres_scale_denominator = SCALE_NUMERATOR; cm->superres_upscaled_width = oxcf->width; cm->superres_upscaled_height = oxcf->height; -#endif // CONFIG_FRAME_SUPERRES -#if CONFIG_LOOP_RESTORATION av1_loop_restoration_precal(); -#endif // CONFIG_LOOP_RESTORATION cm->error.setjmp = 0; return cpi; } +#if CONFIG_INTERNAL_STATS #define SNPRINT(H, T) snprintf((H) + strlen(H), sizeof(H) - strlen(H), (T)) #define SNPRINT2(H, T, V) \ snprintf((H) + strlen(H), sizeof(H) - strlen(H), (T), (V)) +#endif // CONFIG_INTERNAL_STATS void av1_remove_compressor(AV1_COMP *cpi) { AV1_COMMON *cm; @@ -3114,14 +2798,14 @@ void av1_remove_compressor(AV1_COMP *cpi) { if (!cpi) return; cm = &cpi->common; + const int num_planes = av1_num_planes(cm); + if (cm->current_video_frame > 0) { #if CONFIG_ENTROPY_STATS if (cpi->oxcf.pass != 1) { fprintf(stderr, "Writing counts.stt\n"); FILE *f = fopen("counts.stt", "wb"); fwrite(&aggregate_fc, sizeof(aggregate_fc), 1, f); - fwrite(aggregate_fc_per_type, sizeof(aggregate_fc_per_type[0]), - FRAME_CONTEXTS, f); fclose(f); } #endif // CONFIG_ENTROPY_STATS @@ -3151,16 +2835,21 @@ void av1_remove_compressor(AV1_COMP *cpi) { snprintf(headings, sizeof(headings), "Bitrate\tAVGPsnr\tGLBPsnr\tAVPsnrP\tGLPsnrP\t" "AOMSSIM\tVPSSIMP\tFASTSIM\tPSNRHVS\t" - "WstPsnr\tWstSsim\tWstFast\tWstHVS"); + "WstPsnr\tWstSsim\tWstFast\tWstHVS\t" + "AVPsrnY\tAPsnrCb\tAPsnrCr"); snprintf(results, sizeof(results), "%7.2f\t%7.3f\t%7.3f\t%7.3f\t%7.3f\t" "%7.3f\t%7.3f\t%7.3f\t%7.3f\t" - "%7.3f\t%7.3f\t%7.3f\t%7.3f", - dr, cpi->psnr.stat[ALL] / cpi->count, total_psnr, - cpi->psnr.stat[ALL] / cpi->count, total_psnr, total_ssim, - total_ssim, cpi->fastssim.stat[ALL] / cpi->count, - cpi->psnrhvs.stat[ALL] / cpi->count, cpi->psnr.worst, - cpi->worst_ssim, cpi->fastssim.worst, cpi->psnrhvs.worst); + "%7.3f\t%7.3f\t%7.3f\t%7.3f\t" + "%7.3f\t%7.3f\t%7.3f", + dr, cpi->psnr.stat[STAT_ALL] / cpi->count, total_psnr, + cpi->psnr.stat[STAT_ALL] / cpi->count, total_psnr, total_ssim, + total_ssim, cpi->fastssim.stat[STAT_ALL] / cpi->count, + cpi->psnrhvs.stat[STAT_ALL] / cpi->count, cpi->psnr.worst, + cpi->worst_ssim, cpi->fastssim.worst, cpi->psnrhvs.worst, + cpi->psnr.stat[STAT_Y] / cpi->count, + cpi->psnr.stat[STAT_U] / cpi->count, + cpi->psnr.stat[STAT_V] / cpi->count); if (cpi->b_calculate_blockiness) { SNPRINT(headings, "\t Block\tWstBlck"); @@ -3184,19 +2873,7 @@ void av1_remove_compressor(AV1_COMP *cpi) { fclose(f); } - -#endif - -#if 0 - { - printf("\n_pick_loop_filter_level:%d\n", cpi->time_pick_lpf / 1000); - printf("\n_frames recive_data encod_mb_row compress_frame Total\n"); - printf("%6d %10ld %10ld %10ld %10ld\n", cpi->common.current_video_frame, - cpi->time_receive_data / 1000, cpi->time_encode_sb_row / 1000, - cpi->time_compress_data / 1000, - (cpi->time_receive_data + cpi->time_compress_data) / 1000); - } -#endif +#endif // CONFIG_INTERNAL_STATS } for (t = 0; t < cpi->num_workers; ++t) { @@ -3209,21 +2886,22 @@ void av1_remove_compressor(AV1_COMP *cpi) { // Deallocate allocated thread data. if (t < cpi->num_workers - 1) { aom_free(thread_data->td->palette_buffer); -#if CONFIG_MOTION_VAR aom_free(thread_data->td->above_pred_buf); aom_free(thread_data->td->left_pred_buf); aom_free(thread_data->td->wsrc_buf); aom_free(thread_data->td->mask_buf); -#endif // CONFIG_MOTION_VAR aom_free(thread_data->td->counts); - av1_free_pc_tree(thread_data->td); + av1_free_pc_tree(thread_data->td, num_planes); aom_free(thread_data->td); } } aom_free(cpi->tile_thr_data); aom_free(cpi->workers); - if (cpi->num_workers > 1) av1_loop_filter_dealloc(&cpi->lf_row_sync); + if (cpi->num_workers > 1) { + av1_loop_filter_dealloc(&cpi->lf_row_sync); + av1_loop_restoration_dealloc(&cpi->lr_row_sync, cpi->num_workers); + } dealloc_compressor_data(cpi); @@ -3244,6 +2922,10 @@ void av1_remove_compressor(AV1_COMP *cpi) { #endif // CONFIG_INTERNAL_STATS av1_remove_common(cm); + for (i = 0; i < FRAME_BUFFERS; ++i) { + av1_hash_table_destroy(&cm->buffer_pool->frame_bufs[i].hash_table); + } + if (cpi->sf.use_hash_based_trellis) hbt_destroy(); av1_free_ref_frame_buffers(cm->buffer_pool); aom_free(cpi); @@ -3253,30 +2935,14 @@ void av1_remove_compressor(AV1_COMP *cpi) { #ifdef OUTPUT_YUV_REC fclose(yuv_rec_file); #endif -#if 0 - - if (keyfile) - fclose(keyfile); - - if (framepsnr) - fclose(framepsnr); - - if (kf_list) - fclose(kf_list); - -#endif } static void generate_psnr_packet(AV1_COMP *cpi) { struct aom_codec_cx_pkt pkt; int i; PSNR_STATS psnr; -#if CONFIG_HIGHBITDEPTH aom_calc_highbd_psnr(cpi->source, cpi->common.frame_to_show, &psnr, cpi->td.mb.e_mbd.bd, cpi->oxcf.input_bit_depth); -#else - aom_calc_psnr(cpi->source, cpi->common.frame_to_show, &psnr); -#endif for (i = 0; i < 4; ++i) { pkt.data.psnr.samples[i] = psnr.samples[i]; @@ -3290,22 +2956,25 @@ static void generate_psnr_packet(AV1_COMP *cpi) { int av1_use_as_reference(AV1_COMP *cpi, int ref_frame_flags) { if (ref_frame_flags > ((1 << INTER_REFS_PER_FRAME) - 1)) return -1; - cpi->ref_frame_flags = ref_frame_flags; + cpi->ext_ref_frame_flags = ref_frame_flags; return 0; } -void av1_update_reference(AV1_COMP *cpi, int ref_frame_flags) { - cpi->ext_refresh_golden_frame = (ref_frame_flags & AOM_GOLD_FLAG) != 0; - cpi->ext_refresh_alt_ref_frame = (ref_frame_flags & AOM_ALT_FLAG) != 0; - cpi->ext_refresh_last_frame = (ref_frame_flags & AOM_LAST_FLAG) != 0; +void av1_update_reference(AV1_COMP *cpi, int ref_frame_upd_flags) { + cpi->ext_refresh_last_frame = (ref_frame_upd_flags & AOM_LAST_FLAG) != 0; + cpi->ext_refresh_golden_frame = (ref_frame_upd_flags & AOM_GOLD_FLAG) != 0; + cpi->ext_refresh_alt_ref_frame = (ref_frame_upd_flags & AOM_ALT_FLAG) != 0; + cpi->ext_refresh_bwd_ref_frame = (ref_frame_upd_flags & AOM_BWD_FLAG) != 0; + cpi->ext_refresh_alt2_ref_frame = (ref_frame_upd_flags & AOM_ALT2_FLAG) != 0; cpi->ext_refresh_frame_flags_pending = 1; } int av1_copy_reference_enc(AV1_COMP *cpi, int idx, YV12_BUFFER_CONFIG *sd) { AV1_COMMON *const cm = &cpi->common; + const int num_planes = av1_num_planes(cm); YV12_BUFFER_CONFIG *cfg = get_ref_frame(cm, idx); if (cfg) { - aom_yv12_copy_frame(cfg, sd); + aom_yv12_copy_frame(cfg, sd, num_planes); return 0; } else { return -1; @@ -3314,9 +2983,10 @@ int av1_copy_reference_enc(AV1_COMP *cpi, int idx, YV12_BUFFER_CONFIG *sd) { int av1_set_reference_enc(AV1_COMP *cpi, int idx, YV12_BUFFER_CONFIG *sd) { AV1_COMMON *const cm = &cpi->common; + const int num_planes = av1_num_planes(cm); YV12_BUFFER_CONFIG *cfg = get_ref_frame(cm, idx); if (cfg) { - aom_yv12_copy_frame(sd, cfg); + aom_yv12_copy_frame(sd, cfg, num_planes); return 0; } else { return -1; @@ -3361,7 +3031,6 @@ void aom_write_yuv_frame_420(YV12_BUFFER_CONFIG *s, FILE *f) { } #endif -#if CONFIG_EXT_REFS && !CONFIG_XIPHRC #if USE_GF16_MULTI_LAYER static void check_show_existing_frame_gf16(AV1_COMP *cpi) { const GF_GROUP *const gf_group = &cpi->twopass.gf_group; @@ -3374,7 +3043,7 @@ static void check_show_existing_frame_gf16(AV1_COMP *cpi) { } else if (cpi->rc.is_last_bipred_frame) { cpi->rc.is_last_bipred_frame = 0; cm->show_existing_frame = 1; - cpi->existing_fb_idx_to_show = cpi->bwd_fb_idx; + cpi->existing_fb_idx_to_show = cpi->ref_fb_idx[BWDREF_FRAME - 1]; } else if (next_frame_update_type == OVERLAY_UPDATE || next_frame_update_type == INTNL_OVERLAY_UPDATE) { // Check the temporal filtering status for the next OVERLAY frame @@ -3392,8 +3061,8 @@ static void check_show_existing_frame_gf16(AV1_COMP *cpi) { cm->show_existing_frame = 1; cpi->rc.is_src_frame_alt_ref = 1; cpi->existing_fb_idx_to_show = (next_frame_update_type == OVERLAY_UPDATE) - ? cpi->alt_fb_idx - : cpi->bwd_fb_idx; + ? cpi->ref_fb_idx[ALTREF_FRAME - 1] + : cpi->ref_fb_idx[BWDREF_FRAME - 1]; cpi->is_arf_filter_off[which_arf] = 0; } } @@ -3423,7 +3092,7 @@ static void check_show_existing_frame(AV1_COMP *cpi) { // the last_fb_idxes[0] after reference frame buffer update cpi->rc.is_last_bipred_frame = 0; cm->show_existing_frame = 1; - cpi->existing_fb_idx_to_show = cpi->lst_fb_idxes[0]; + cpi->existing_fb_idx_to_show = cpi->ref_fb_idx[0]; } else if (cpi->is_arf_filter_off[which_arf] && (next_frame_update_type == OVERLAY_UPDATE || next_frame_update_type == INTNL_OVERLAY_UPDATE)) { @@ -3432,20 +3101,18 @@ static void check_show_existing_frame(AV1_COMP *cpi) { cm->show_existing_frame = 1; cpi->rc.is_src_frame_alt_ref = 1; cpi->existing_fb_idx_to_show = (next_frame_update_type == OVERLAY_UPDATE) - ? cpi->alt_fb_idx - : cpi->alt2_fb_idx; + ? cpi->ref_fb_idx[ALTREF_FRAME - 1] + : cpi->ref_fb_idx[ALTREF2_FRAME - 1]; cpi->is_arf_filter_off[which_arf] = 0; } cpi->rc.is_src_frame_ext_arf = 0; } -#endif // CONFIG_EXT_REFS && !CONFIG_XIPHRC #ifdef OUTPUT_YUV_REC void aom_write_one_yuv_frame(AV1_COMMON *cm, YV12_BUFFER_CONFIG *s) { uint8_t *src = s->y_buffer; int h = cm->height; if (yuv_rec_file == NULL) return; -#if CONFIG_HIGHBITDEPTH if (s->flags & YV12_FLAG_HIGHBITDEPTH) { uint16_t *src16 = CONVERT_TO_SHORTPTR(s->y_buffer); @@ -3473,7 +3140,6 @@ void aom_write_one_yuv_frame(AV1_COMMON *cm, YV12_BUFFER_CONFIG *s) { fflush(yuv_rec_file); return; } -#endif // CONFIG_HIGHBITDEPTH do { fwrite(src, s->y_width, 1, yuv_rec_file); @@ -3500,7 +3166,6 @@ void aom_write_one_yuv_frame(AV1_COMMON *cm, YV12_BUFFER_CONFIG *s) { } #endif // OUTPUT_YUV_REC -#if CONFIG_GLOBAL_MOTION #define GM_RECODE_LOOP_NUM4X4_FACTOR 192 static int recode_loop_test_global_motion(AV1_COMP *cpi) { int i; @@ -3515,12 +3180,13 @@ static int recode_loop_test_global_motion(AV1_COMP *cpi) { assert(cm->global_motion[i].wmtype == IDENTITY); cpi->gmparams_cost[i] = 0; recode = 1; - recode |= (rdc->global_motion_used[i] > 0); + // TODO(sarahparker): The earlier condition for recoding here was: + // "recode |= (rdc->global_motion_used[i] > 0);". Can we bring something + // similar to that back to speed up global motion? } } return recode; } -#endif // CONFIG_GLOBAL_MOTION // Function to test for conditions that indicate we should loop // back and recode a frame. @@ -3602,15 +3268,15 @@ static void dump_ref_frame_images(AV1_COMP *cpi) { } #endif // DUMP_REF_FRAME_IMAGES == 1 -#if CONFIG_EXT_REFS // This function is used to shift the virtual indices of last reference frames // as follows: // LAST_FRAME -> LAST2_FRAME -> LAST3_FRAME // when the LAST_FRAME is updated. static INLINE void shift_last_ref_frames(AV1_COMP *cpi) { + // TODO(isbs): shift the scaled indices as well int ref_frame; for (ref_frame = LAST_REF_FRAMES - 1; ref_frame > 0; --ref_frame) { - cpi->lst_fb_idxes[ref_frame] = cpi->lst_fb_idxes[ref_frame - 1]; + cpi->ref_fb_idx[ref_frame] = cpi->ref_fb_idx[ref_frame - 1]; // [0] is allocated to the current coded frame. The statistics for the // reference frames start at [LAST_FRAME], i.e. [1]. @@ -3621,64 +3287,18 @@ static INLINE void shift_last_ref_frames(AV1_COMP *cpi) { } } } -#endif // CONFIG_EXT_REFS - -#if CONFIG_VAR_REFS -static void enc_check_valid_ref_frames(AV1_COMP *const cpi) { - AV1_COMMON *const cm = &cpi->common; - MV_REFERENCE_FRAME ref_frame; - - // TODO(zoeliu): To handle ALTREF_FRAME the same way as do with other - // reference frames. Current encoder invalid ALTREF when ALTREF - // is the same as LAST, but invalid all the other references - // when they are the same as ALTREF. - for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) { - int ref_buf_idx = get_ref_frame_buf_idx(cpi, ref_frame); - RefBuffer *const ref_buf = &cm->frame_refs[ref_frame - LAST_FRAME]; - - if (ref_buf_idx != INVALID_IDX) { - ref_buf->is_valid = 1; - - MV_REFERENCE_FRAME ref; - for (ref = LAST_FRAME; ref < ref_frame; ++ref) { - int buf_idx = get_ref_frame_buf_idx(cpi, ref); - RefBuffer *const buf = &cm->frame_refs[ref - LAST_FRAME]; - if (buf->is_valid && buf_idx == ref_buf_idx) { - if (ref_frame != ALTREF_FRAME || ref == LAST_FRAME) { - ref_buf->is_valid = 0; - break; - } else { - buf->is_valid = 0; - } - } - } - } else { - ref_buf->is_valid = 0; - } - } -} -#endif // CONFIG_VAR_REFS -#if CONFIG_EXT_REFS #if USE_GF16_MULTI_LAYER static void update_reference_frames_gf16(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; BufferPool *const pool = cm->buffer_pool; if (cm->frame_type == KEY_FRAME) { - for (int ref_frame = 0; ref_frame < LAST_REF_FRAMES; ++ref_frame) { + for (int ref_frame = 0; ref_frame < REF_FRAMES; ++ref_frame) { ref_cnt_fb(pool->frame_bufs, - &cm->ref_frame_map[cpi->lst_fb_idxes[ref_frame]], + &cm->ref_frame_map[cpi->ref_fb_idx[ref_frame]], cm->new_fb_idx); } - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->gld_fb_idx], - cm->new_fb_idx); - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->bwd_fb_idx], - cm->new_fb_idx); - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->alt2_fb_idx], - cm->new_fb_idx); - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->alt_fb_idx], - cm->new_fb_idx); } else { if (cpi->refresh_last_frame || cpi->refresh_golden_frame || cpi->refresh_bwd_ref_frame || cpi->refresh_alt2_ref_frame || @@ -3703,7 +3323,6 @@ static void update_reference_frames_gf16(AV1_COMP *cpi) { #endif // DUMP_REF_FRAME_IMAGES } #endif // USE_GF16_MULTI_LAYER -#endif // CONFIG_EXT_REFS static void update_reference_frames(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; @@ -3712,30 +3331,28 @@ static void update_reference_frames(AV1_COMP *cpi) { // for the purpose to verify no mismatch between encoder and decoder. if (cm->show_frame) cpi->last_show_frame_buf_idx = cm->new_fb_idx; -#if CONFIG_EXT_REFS #if USE_GF16_MULTI_LAYER if (cpi->rc.baseline_gf_interval == 16) { update_reference_frames_gf16(cpi); return; } #endif // USE_GF16_MULTI_LAYER -#endif // CONFIG_EXT_REFS BufferPool *const pool = cm->buffer_pool; + // At this point the new frame has been encoded. // If any buffer copy / swapping is signaled it should be done here. - if (cm->frame_type == KEY_FRAME) { - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->gld_fb_idx], - cm->new_fb_idx); -#if CONFIG_EXT_REFS - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->bwd_fb_idx], - cm->new_fb_idx); - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->alt2_fb_idx], - cm->new_fb_idx); -#endif // CONFIG_EXT_REFS - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->alt_fb_idx], - cm->new_fb_idx); - } else if (av1_preserve_existing_gf(cpi)) { + + if (cm->frame_type == KEY_FRAME || frame_is_sframe(cm)) { + for (int ref_frame = 0; ref_frame < REF_FRAMES; ++ref_frame) { + ref_cnt_fb(pool->frame_bufs, + &cm->ref_frame_map[cpi->ref_fb_idx[ref_frame]], + cm->new_fb_idx); + } + return; + } + + if (av1_preserve_existing_gf(cpi)) { // We have decided to preserve the previously existing golden frame as our // new ARF frame. However, in the short term in function // av1_bitstream.c::get_refresh_mask() we left it in the GF slot and, if @@ -3746,19 +3363,17 @@ static void update_reference_frames(AV1_COMP *cpi) { // slot and, if we're updating the GF, the current frame becomes the new GF. int tmp; - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->alt_fb_idx], + ref_cnt_fb(pool->frame_bufs, + &cm->ref_frame_map[cpi->ref_fb_idx[ALTREF_FRAME - 1]], cm->new_fb_idx); - tmp = cpi->alt_fb_idx; - cpi->alt_fb_idx = cpi->gld_fb_idx; - cpi->gld_fb_idx = tmp; + tmp = cpi->ref_fb_idx[ALTREF_FRAME - 1]; + cpi->ref_fb_idx[ALTREF_FRAME - 1] = cpi->ref_fb_idx[GOLDEN_FRAME - 1]; + cpi->ref_fb_idx[GOLDEN_FRAME - 1] = tmp; -#if CONFIG_EXT_REFS // We need to modify the mapping accordingly - cpi->arf_map[0] = cpi->alt_fb_idx; -#endif // CONFIG_EXT_REFS -// TODO(zoeliu): Do we need to copy cpi->interp_filter_selected[0] over to -// cpi->interp_filter_selected[GOLDEN_FRAME]? -#if CONFIG_EXT_REFS + cpi->arf_map[0] = cpi->ref_fb_idx[ALTREF_FRAME - 1]; + // TODO(zoeliu): Do we need to copy cpi->interp_filter_selected[0] over to + // cpi->interp_filter_selected[GOLDEN_FRAME]? } else if (cpi->rc.is_src_frame_ext_arf && cm->show_existing_frame) { // Deal with the special case for showing existing internal ALTREF_FRAME // Refresh the LAST_FRAME with the ALTREF_FRAME and retire the LAST3_FRAME @@ -3767,29 +3382,22 @@ static void update_reference_frames(AV1_COMP *cpi) { const int which_arf = gf_group->arf_ref_idx[gf_group->index]; assert(gf_group->update_type[gf_group->index] == INTNL_OVERLAY_UPDATE); - const int tmp = cpi->lst_fb_idxes[LAST_REF_FRAMES - 1]; + const int tmp = cpi->ref_fb_idx[LAST_REF_FRAMES - 1]; shift_last_ref_frames(cpi); - cpi->lst_fb_idxes[0] = cpi->alt2_fb_idx; - cpi->alt2_fb_idx = tmp; + cpi->ref_fb_idx[LAST_FRAME - 1] = cpi->ref_fb_idx[ALTREF2_FRAME - 1]; + cpi->ref_fb_idx[ALTREF2_FRAME - 1] = tmp; // We need to modify the mapping accordingly - cpi->arf_map[which_arf] = cpi->alt2_fb_idx; + cpi->arf_map[which_arf] = cpi->ref_fb_idx[ALTREF2_FRAME - 1]; memcpy(cpi->interp_filter_selected[LAST_FRAME], cpi->interp_filter_selected[ALTREF2_FRAME], sizeof(cpi->interp_filter_selected[ALTREF2_FRAME])); -#endif // CONFIG_EXT_REFS } else { /* For non key/golden frames */ // === ALTREF_FRAME === if (cpi->refresh_alt_ref_frame) { - int arf_idx = cpi->alt_fb_idx; + int arf_idx = cpi->ref_fb_idx[ALTREF_FRAME - 1]; int which_arf = 0; -#if !CONFIG_EXT_REFS - if ((cpi->oxcf.pass == 2) && cpi->multi_arf_allowed) { - const GF_GROUP *const gf_group = &cpi->twopass.gf_group; - arf_idx = gf_group->arf_update_idx[gf_group->index]; - } -#endif // !CONFIG_EXT_REFS ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[arf_idx], cm->new_fb_idx); memcpy(cpi->interp_filter_selected[ALTREF_FRAME + which_arf], @@ -3799,21 +3407,19 @@ static void update_reference_frames(AV1_COMP *cpi) { // === GOLDEN_FRAME === if (cpi->refresh_golden_frame) { - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->gld_fb_idx], + ref_cnt_fb(pool->frame_bufs, + &cm->ref_frame_map[cpi->ref_fb_idx[GOLDEN_FRAME - 1]], cm->new_fb_idx); -#if !CONFIG_EXT_REFS - if (!cpi->rc.is_src_frame_alt_ref) -#endif // !CONFIG_EXT_REFS - memcpy(cpi->interp_filter_selected[GOLDEN_FRAME], - cpi->interp_filter_selected[0], - sizeof(cpi->interp_filter_selected[0])); + memcpy(cpi->interp_filter_selected[GOLDEN_FRAME], + cpi->interp_filter_selected[0], + sizeof(cpi->interp_filter_selected[0])); } -#if CONFIG_EXT_REFS // === BWDREF_FRAME === if (cpi->refresh_bwd_ref_frame) { - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->bwd_fb_idx], + ref_cnt_fb(pool->frame_bufs, + &cm->ref_frame_map[cpi->ref_fb_idx[BWDREF_FRAME - 1]], cm->new_fb_idx); memcpy(cpi->interp_filter_selected[BWDREF_FRAME], @@ -3823,18 +3429,17 @@ static void update_reference_frames(AV1_COMP *cpi) { // === ALTREF2_FRAME === if (cpi->refresh_alt2_ref_frame) { - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->alt2_fb_idx], + ref_cnt_fb(pool->frame_bufs, + &cm->ref_frame_map[cpi->ref_fb_idx[ALTREF2_FRAME - 1]], cm->new_fb_idx); memcpy(cpi->interp_filter_selected[ALTREF2_FRAME], cpi->interp_filter_selected[0], sizeof(cpi->interp_filter_selected[0])); } -#endif // CONFIG_EXT_REFS } if (cpi->refresh_last_frame) { -#if CONFIG_EXT_REFS // NOTE(zoeliu): We have two layers of mapping (1) from the per-frame // reference to the reference frame buffer virtual index; and then (2) from // the virtual index to the reference frame buffer physical index: @@ -3842,7 +3447,7 @@ static void update_reference_frames(AV1_COMP *cpi) { // LAST_FRAME, ..., LAST3_FRAME, ..., ALTREF_FRAME // | | | // v v v - // lst_fb_idxes[0], ..., lst_fb_idxes[2], ..., alt_fb_idx + // ref_fb_idx[0], ..., ref_fb_idx[2], ..., ref_fb_idx[ALTREF_FRAME-1] // | | | // v v v // ref_frame_map[], ..., ref_frame_map[], ..., ref_frame_map[] @@ -3864,61 +3469,42 @@ static void update_reference_frames(AV1_COMP *cpi) { // LAST_FRAME, LAST2_FRAME, LAST3_FRAME // | | | // v v v - // lst_fb_idxes[2], lst_fb_idxes[0], lst_fb_idxes[1] - int ref_frame; + // ref_fb_idx[2], ref_fb_idx[0], ref_fb_idx[1] + int tmp; - if (cm->frame_type == KEY_FRAME) { - for (ref_frame = 0; ref_frame < LAST_REF_FRAMES; ++ref_frame) { - ref_cnt_fb(pool->frame_bufs, - &cm->ref_frame_map[cpi->lst_fb_idxes[ref_frame]], - cm->new_fb_idx); - } - } else { - int tmp; + ref_cnt_fb(pool->frame_bufs, + &cm->ref_frame_map[cpi->ref_fb_idx[LAST_REF_FRAMES - 1]], + cm->new_fb_idx); - ref_cnt_fb(pool->frame_bufs, - &cm->ref_frame_map[cpi->lst_fb_idxes[LAST_REF_FRAMES - 1]], - cm->new_fb_idx); + tmp = cpi->ref_fb_idx[LAST_REF_FRAMES - 1]; - tmp = cpi->lst_fb_idxes[LAST_REF_FRAMES - 1]; + shift_last_ref_frames(cpi); + cpi->ref_fb_idx[0] = tmp; - shift_last_ref_frames(cpi); - cpi->lst_fb_idxes[0] = tmp; + assert(cm->show_existing_frame == 0); + memcpy(cpi->interp_filter_selected[LAST_FRAME], + cpi->interp_filter_selected[0], + sizeof(cpi->interp_filter_selected[0])); + + if (cpi->rc.is_last_bipred_frame) { + // Refresh the LAST_FRAME with the BWDREF_FRAME and retire the + // LAST3_FRAME by updating the virtual indices. + // + // NOTE: The source frame for BWDREF does not have a holding position as + // the OVERLAY frame for ALTREF's. Hence, to resolve the reference + // virtual index reshuffling for BWDREF, the encoder always + // specifies a LAST_BIPRED right before BWDREF and completes the + // reshuffling job accordingly. + tmp = cpi->ref_fb_idx[LAST_REF_FRAMES - 1]; - assert(cm->show_existing_frame == 0); - memcpy(cpi->interp_filter_selected[LAST_FRAME], - cpi->interp_filter_selected[0], - sizeof(cpi->interp_filter_selected[0])); + shift_last_ref_frames(cpi); + cpi->ref_fb_idx[0] = cpi->ref_fb_idx[BWDREF_FRAME - 1]; + cpi->ref_fb_idx[BWDREF_FRAME - 1] = tmp; - if (cpi->rc.is_last_bipred_frame) { - // Refresh the LAST_FRAME with the BWDREF_FRAME and retire the - // LAST3_FRAME by updating the virtual indices. - // - // NOTE: The source frame for BWDREF does not have a holding position as - // the OVERLAY frame for ALTREF's. Hence, to resolve the reference - // virtual index reshuffling for BWDREF, the encoder always - // specifies a LAST_BIPRED right before BWDREF and completes the - // reshuffling job accordingly. - tmp = cpi->lst_fb_idxes[LAST_REF_FRAMES - 1]; - - shift_last_ref_frames(cpi); - cpi->lst_fb_idxes[0] = cpi->bwd_fb_idx; - cpi->bwd_fb_idx = tmp; - - memcpy(cpi->interp_filter_selected[LAST_FRAME], - cpi->interp_filter_selected[BWDREF_FRAME], - sizeof(cpi->interp_filter_selected[BWDREF_FRAME])); - } - } -#else // !CONFIG_EXT_REFS - ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[cpi->lst_fb_idx], - cm->new_fb_idx); - if (!cpi->rc.is_src_frame_alt_ref) { memcpy(cpi->interp_filter_selected[LAST_FRAME], - cpi->interp_filter_selected[0], - sizeof(cpi->interp_filter_selected[0])); + cpi->interp_filter_selected[BWDREF_FRAME], + sizeof(cpi->interp_filter_selected[BWDREF_FRAME])); } -#endif // CONFIG_EXT_REFS } #if DUMP_REF_FRAME_IMAGES == 1 @@ -3937,19 +3523,11 @@ static INLINE void alloc_frame_mvs(AV1_COMMON *const cm, int buffer_idx) { static void scale_references(AV1_COMP *cpi) { AV1_COMMON *cm = &cpi->common; + const int num_planes = av1_num_planes(cm); MV_REFERENCE_FRAME ref_frame; const AOM_REFFRAME ref_mask[INTER_REFS_PER_FRAME] = { - AOM_LAST_FLAG, -#if CONFIG_EXT_REFS - AOM_LAST2_FLAG, - AOM_LAST3_FLAG, -#endif // CONFIG_EXT_REFS - AOM_GOLD_FLAG, -#if CONFIG_EXT_REFS - AOM_BWD_FLAG, - AOM_ALT2_FLAG, -#endif // CONFIG_EXT_REFS - AOM_ALT_FLAG + AOM_LAST_FLAG, AOM_LAST2_FLAG, AOM_LAST3_FLAG, AOM_GOLD_FLAG, + AOM_BWD_FLAG, AOM_ALT2_FLAG, AOM_ALT_FLAG }; for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) { @@ -3964,7 +3542,6 @@ static void scale_references(AV1_COMP *cpi) { continue; } -#if CONFIG_HIGHBITDEPTH if (ref->y_crop_width != cm->width || ref->y_crop_height != cm->height) { RefCntBuffer *new_fb_ptr = NULL; int force_scaling = 0; @@ -3983,35 +3560,11 @@ static void scale_references(AV1_COMP *cpi) { cm->byte_alignment, NULL, NULL, NULL)) aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, "Failed to allocate frame buffer"); - av1_resize_and_extend_frame(ref, &new_fb_ptr->buf, - (int)cm->bit_depth); + av1_resize_and_extend_frame(ref, &new_fb_ptr->buf, (int)cm->bit_depth, + num_planes); cpi->scaled_ref_idx[ref_frame - 1] = new_fb; alloc_frame_mvs(cm, new_fb); } -#else - if (ref->y_crop_width != cm->width || ref->y_crop_height != cm->height) { - RefCntBuffer *new_fb_ptr = NULL; - int force_scaling = 0; - int new_fb = cpi->scaled_ref_idx[ref_frame - 1]; - if (new_fb == INVALID_IDX) { - new_fb = get_free_fb(cm); - force_scaling = 1; - } - if (new_fb == INVALID_IDX) return; - new_fb_ptr = &pool->frame_bufs[new_fb]; - if (force_scaling || new_fb_ptr->buf.y_crop_width != cm->width || - new_fb_ptr->buf.y_crop_height != cm->height) { - if (aom_realloc_frame_buffer(&new_fb_ptr->buf, cm->width, cm->height, - cm->subsampling_x, cm->subsampling_y, - AOM_BORDER_IN_PIXELS, cm->byte_alignment, - NULL, NULL, NULL)) - aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, - "Failed to allocate frame buffer"); - av1_resize_and_extend_frame(ref, &new_fb_ptr->buf); - cpi->scaled_ref_idx[ref_frame - 1] = new_fb; - alloc_frame_mvs(cm, new_fb); - } -#endif // CONFIG_HIGHBITDEPTH } else { const int buf_idx = get_ref_frame_buf_idx(cpi, ref_frame); RefCntBuffer *const buf = &pool->frame_bufs[buf_idx]; @@ -4029,115 +3582,18 @@ static void scale_references(AV1_COMP *cpi) { static void release_scaled_references(AV1_COMP *cpi) { AV1_COMMON *cm = &cpi->common; int i; - if (cpi->oxcf.pass == 0) { - // Only release scaled references under certain conditions: - // if reference will be updated, or if scaled reference has same resolution. - int refresh[INTER_REFS_PER_FRAME]; - refresh[0] = (cpi->refresh_last_frame) ? 1 : 0; -#if CONFIG_EXT_REFS - refresh[1] = refresh[2] = 0; - refresh[3] = (cpi->refresh_golden_frame) ? 1 : 0; - refresh[4] = (cpi->refresh_bwd_ref_frame) ? 1 : 0; - refresh[5] = (cpi->refresh_alt2_ref_frame) ? 1 : 0; - refresh[6] = (cpi->refresh_alt_ref_frame) ? 1 : 0; -#else // !CONFIG_EXT_REFS - refresh[1] = (cpi->refresh_golden_frame) ? 1 : 0; - refresh[2] = (cpi->refresh_alt_ref_frame) ? 1 : 0; -#endif // CONFIG_EXT_REFS - for (i = LAST_FRAME; i <= ALTREF_FRAME; ++i) { - const int idx = cpi->scaled_ref_idx[i - 1]; - RefCntBuffer *const buf = - idx != INVALID_IDX ? &cm->buffer_pool->frame_bufs[idx] : NULL; - const YV12_BUFFER_CONFIG *const ref = get_ref_frame_buffer(cpi, i); - if (buf != NULL && - (refresh[i - 1] || (buf->buf.y_crop_width == ref->y_crop_width && - buf->buf.y_crop_height == ref->y_crop_height))) { - --buf->ref_count; - cpi->scaled_ref_idx[i - 1] = INVALID_IDX; - } - } - } else { - for (i = 0; i < TOTAL_REFS_PER_FRAME; ++i) { - const int idx = cpi->scaled_ref_idx[i]; - RefCntBuffer *const buf = - idx != INVALID_IDX ? &cm->buffer_pool->frame_bufs[idx] : NULL; - if (buf != NULL) { - --buf->ref_count; - cpi->scaled_ref_idx[i] = INVALID_IDX; - } + // TODO(isbs): only refresh the necessary frames, rather than all of them + for (i = 0; i < REF_FRAMES; ++i) { + const int idx = cpi->scaled_ref_idx[i]; + RefCntBuffer *const buf = + idx != INVALID_IDX ? &cm->buffer_pool->frame_bufs[idx] : NULL; + if (buf != NULL) { + --buf->ref_count; + cpi->scaled_ref_idx[i] = INVALID_IDX; } } } -#if 0 && CONFIG_INTERNAL_STATS -static void output_frame_level_debug_stats(AV1_COMP *cpi) { - AV1_COMMON *const cm = &cpi->common; - FILE *const f = fopen("tmp.stt", cm->current_video_frame ? "a" : "w"); - int64_t recon_err; - - aom_clear_system_state(); - - recon_err = aom_get_y_sse(cpi->source, get_frame_new_buffer(cm)); - - if (cpi->twopass.total_left_stats.coded_error != 0.0) - fprintf(f, "%10u %dx%d %d %d %10d %10d %10d %10d" - "%10"PRId64" %10"PRId64" %5d %5d %10"PRId64" " - "%10"PRId64" %10"PRId64" %10d " - "%7.2lf %7.2lf %7.2lf %7.2lf %7.2lf" - "%6d %6d %5d %5d %5d " - "%10"PRId64" %10.3lf" - "%10lf %8u %10"PRId64" %10d %10d %10d\n", - cpi->common.current_video_frame, - cm->width, cm->height, - cpi->rc.source_alt_ref_pending, - cpi->rc.source_alt_ref_active, - cpi->rc.this_frame_target, - cpi->rc.projected_frame_size, - cpi->rc.projected_frame_size / cpi->common.MBs, - (cpi->rc.projected_frame_size - cpi->rc.this_frame_target), - cpi->rc.vbr_bits_off_target, - cpi->rc.vbr_bits_off_target_fast, - cpi->twopass.extend_minq, - cpi->twopass.extend_minq_fast, - cpi->rc.total_target_vs_actual, - (cpi->rc.starting_buffer_level - cpi->rc.bits_off_target), - cpi->rc.total_actual_bits, cm->base_qindex, - av1_convert_qindex_to_q(cm->base_qindex, cm->bit_depth), - (double)av1_dc_quant(cm->base_qindex, 0, cm->bit_depth) / 4.0, - av1_convert_qindex_to_q(cpi->twopass.active_worst_quality, - cm->bit_depth), - cpi->rc.avg_q, - av1_convert_qindex_to_q(cpi->oxcf.cq_level, cm->bit_depth), - cpi->refresh_last_frame, cpi->refresh_golden_frame, - cpi->refresh_alt_ref_frame, cm->frame_type, cpi->rc.gfu_boost, - cpi->twopass.bits_left, - cpi->twopass.total_left_stats.coded_error, - cpi->twopass.bits_left / - (1 + cpi->twopass.total_left_stats.coded_error), - cpi->tot_recode_hits, recon_err, cpi->rc.kf_boost, - cpi->twopass.kf_zeromotion_pct, - cpi->twopass.fr_content_type); - - fclose(f); - - if (0) { - FILE *const fmodes = fopen("Modes.stt", "a"); - int i; - - fprintf(fmodes, "%6d:%1d:%1d:%1d ", cpi->common.current_video_frame, - cm->frame_type, cpi->refresh_golden_frame, - cpi->refresh_alt_ref_frame); - - for (i = 0; i < MAX_MODES; ++i) - fprintf(fmodes, "%5d ", cpi->mode_chosen_counts[i]); - - fprintf(fmodes, "\n"); - - fclose(fmodes); - } -} -#endif - static void set_mv_search_params(AV1_COMP *cpi) { const AV1_COMMON *const cm = &cpi->common; const unsigned int max_mv_def = AOMMIN(cm->width, cm->height); @@ -4164,18 +3620,16 @@ static void set_mv_search_params(AV1_COMP *cpi) { } static void set_size_independent_vars(AV1_COMP *cpi) { -#if CONFIG_GLOBAL_MOTION int i; for (i = LAST_FRAME; i <= ALTREF_FRAME; ++i) { cpi->common.global_motion[i] = default_warp_params; } cpi->global_motion_search_done = 0; -#endif // CONFIG_GLOBAL_MOTION av1_set_speed_features_framesize_independent(cpi); av1_set_rd_speed_thresholds(cpi); av1_set_rd_speed_thresholds_sub8x8(cpi); cpi->common.interp_filter = cpi->sf.default_interp_filter; - if (!frame_is_intra_only(&cpi->common)) set_compound_tools(&cpi->common); + cpi->common.switchable_motion_mode = 1; } static void set_size_dependent_vars(AV1_COMP *cpi, int *q, int *bottom_index, @@ -4186,24 +3640,13 @@ static void set_size_dependent_vars(AV1_COMP *cpi, int *q, int *bottom_index, // Setup variables that depend on the dimensions of the frame. av1_set_speed_features_framesize_dependent(cpi); -// Decide q and q bounds. -#if CONFIG_XIPHRC - int frame_type = cm->frame_type == KEY_FRAME ? OD_I_FRAME : OD_P_FRAME; - *q = od_enc_rc_select_quantizers_and_lambdas( - &cpi->od_rc, cpi->refresh_golden_frame, cpi->refresh_alt_ref_frame, - frame_type, bottom_index, top_index); -#else + // Decide q and q bounds. *q = av1_rc_pick_q_and_bounds(cpi, cm->width, cm->height, bottom_index, top_index); -#endif if (!frame_is_intra_only(cm)) { -#if CONFIG_AMVR set_high_precision_mv(cpi, (*q) < HIGH_PRECISION_MV_QTHRESH, - cpi->common.cur_frame_mv_precision_level); -#else - set_high_precision_mv(cpi, (*q) < HIGH_PRECISION_MV_QTHRESH); -#endif + cpi->common.cur_frame_force_integer_mv); } // Configure experimental use of segmentation for enhanced coding of @@ -4224,10 +3667,9 @@ static void init_motion_estimation(AV1_COMP *cpi) { } } -#if CONFIG_LOOP_RESTORATION #define COUPLED_CHROMA_FROM_LUMA_RESTORATION 0 -static void set_restoration_tilesize(int width, int height, int sx, int sy, - RestorationInfo *rst) { +static void set_restoration_unit_size(int width, int height, int sx, int sy, + RestorationInfo *rst) { (void)width; (void)height; (void)sx; @@ -4238,17 +3680,13 @@ static void set_restoration_tilesize(int width, int height, int sx, int sy, int s = 0; #endif // !COUPLED_CHROMA_FROM_LUMA_RESTORATION - rst[0].restoration_tilesize = (RESTORATION_TILESIZE_MAX >> 1); - rst[1].restoration_tilesize = rst[0].restoration_tilesize >> s; - rst[2].restoration_tilesize = rst[1].restoration_tilesize; - - rst[0].procunit_width = rst[0].procunit_height = RESTORATION_PROC_UNIT_SIZE; - rst[1].procunit_width = rst[2].procunit_width = - RESTORATION_PROC_UNIT_SIZE >> sx; - rst[1].procunit_height = rst[2].procunit_height = - RESTORATION_PROC_UNIT_SIZE >> sy; + if (width * height > 352 * 288) + rst[0].restoration_unit_size = RESTORATION_UNITSIZE_MAX; + else + rst[0].restoration_unit_size = (RESTORATION_UNITSIZE_MAX >> 1); + rst[1].restoration_unit_size = rst[0].restoration_unit_size >> s; + rst[2].restoration_unit_size = rst[1].restoration_unit_size; } -#endif // CONFIG_LOOP_RESTORATION static void init_ref_frame_bufs(AV1_COMMON *cm) { int i; @@ -4258,31 +3696,23 @@ static void init_ref_frame_bufs(AV1_COMMON *cm) { cm->ref_frame_map[i] = INVALID_IDX; pool->frame_bufs[i].ref_count = 0; } -#if CONFIG_HASH_ME - for (i = 0; i < FRAME_BUFFERS; ++i) { - av1_hash_table_init(&pool->frame_bufs[i].hash_table); + if (cm->seq_params.force_screen_content_tools) { + for (i = 0; i < FRAME_BUFFERS; ++i) { + av1_hash_table_init(&pool->frame_bufs[i].hash_table); + } } -#endif } -static void check_initial_width(AV1_COMP *cpi, -#if CONFIG_HIGHBITDEPTH - int use_highbitdepth, -#endif +static void check_initial_width(AV1_COMP *cpi, int use_highbitdepth, int subsampling_x, int subsampling_y) { AV1_COMMON *const cm = &cpi->common; - if (!cpi->initial_width || -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth != use_highbitdepth || -#endif + if (!cpi->initial_width || cm->use_highbitdepth != use_highbitdepth || cm->subsampling_x != subsampling_x || cm->subsampling_y != subsampling_y) { cm->subsampling_x = subsampling_x; cm->subsampling_y = subsampling_y; -#if CONFIG_HIGHBITDEPTH cm->use_highbitdepth = use_highbitdepth; -#endif alloc_raw_frame_buffers(cpi); init_ref_frame_bufs(cm); @@ -4299,12 +3729,9 @@ static void check_initial_width(AV1_COMP *cpi, // Returns 1 if the assigned width or height was <= 0. static int set_size_literal(AV1_COMP *cpi, int width, int height) { AV1_COMMON *cm = &cpi->common; -#if CONFIG_HIGHBITDEPTH + const int num_planes = av1_num_planes(cm); check_initial_width(cpi, cm->use_highbitdepth, cm->subsampling_x, cm->subsampling_y); -#else - check_initial_width(cpi, cm->subsampling_x, cm->subsampling_y); -#endif // CONFIG_HIGHBITDEPTH if (width <= 0 || height <= 0) return 1; @@ -4314,7 +3741,7 @@ static int set_size_literal(AV1_COMP *cpi, int width, int height) { if (cpi->initial_width && cpi->initial_height && (cm->width > cpi->initial_width || cm->height > cpi->initial_height)) { av1_free_context_buffers(cm); - av1_free_pc_tree(&cpi->td); + av1_free_pc_tree(&cpi->td, num_planes); alloc_compressor_data(cpi); realloc_segmentation_maps(cpi); cpi->initial_width = cpi->initial_height = 0; @@ -4326,6 +3753,7 @@ static int set_size_literal(AV1_COMP *cpi, int width, int height) { static void set_frame_size(AV1_COMP *cpi, int width, int height) { AV1_COMMON *const cm = &cpi->common; + const int num_planes = av1_num_planes(cm); MACROBLOCKD *const xd = &cpi->td.mb.e_mbd; int ref_frame; @@ -4333,52 +3761,42 @@ static void set_frame_size(AV1_COMP *cpi, int width, int height) { // There has been a change in the encoded frame size set_size_literal(cpi, width, height); set_mv_search_params(cpi); + // Recalculate 'all_lossless' in case super-resolution was (un)selected. + cm->all_lossless = cm->coded_lossless && !av1_superres_scaled(cm); } -#if !CONFIG_XIPHRC if (cpi->oxcf.pass == 2) { av1_set_target_rate(cpi, cm->width, cm->height); } -#endif alloc_frame_mvs(cm, cm->new_fb_idx); + // Allocate above context buffers + if (cm->num_allocated_above_context_planes < av1_num_planes(cm) || + cm->num_allocated_above_context_mi_col < cm->mi_cols || + cm->num_allocated_above_contexts < cm->tile_rows) { + av1_free_above_context_buffers(cm, cm->num_allocated_above_contexts); + if (av1_alloc_above_context_buffers(cm, cm->tile_rows)) + aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, + "Failed to allocate context buffers"); + } + // Reset the frame pointers to the current frame size. if (aom_realloc_frame_buffer(get_frame_new_buffer(cm), cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif - AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, - NULL, NULL)) + cm->use_highbitdepth, AOM_BORDER_IN_PIXELS, + cm->byte_alignment, NULL, NULL, NULL)) aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR, "Failed to allocate frame buffer"); -#if CONFIG_LOOP_RESTORATION - set_restoration_tilesize( -#if CONFIG_FRAME_SUPERRES - cm->superres_upscaled_width, cm->superres_upscaled_height, -#else - cm->width, cm->height, -#endif // CONFIG_FRAME_SUPERRES - cm->subsampling_x, cm->subsampling_y, cm->rst_info); - for (int i = 0; i < MAX_MB_PLANE; ++i) + const int frame_width = cm->superres_upscaled_width; + const int frame_height = cm->superres_upscaled_height; + set_restoration_unit_size(frame_width, frame_height, cm->subsampling_x, + cm->subsampling_y, cm->rst_info); + for (int i = 0; i < num_planes; ++i) cm->rst_info[i].frame_restoration_type = RESTORE_NONE; + av1_alloc_restoration_buffers(cm); - for (int i = 0; i < MAX_MB_PLANE; ++i) { - cpi->rst_search[i].restoration_tilesize = - cm->rst_info[i].restoration_tilesize; - cpi->rst_search[i].procunit_width = cm->rst_info[i].procunit_width; - cpi->rst_search[i].procunit_height = cm->rst_info[i].procunit_height; - av1_alloc_restoration_struct(cm, &cpi->rst_search[i], -#if CONFIG_FRAME_SUPERRES - cm->superres_upscaled_width, - cm->superres_upscaled_height); -#else - cm->width, cm->height); -#endif // CONFIG_FRAME_SUPERRES - } -#endif // CONFIG_LOOP_RESTORATION alloc_util_frame_buffers(cpi); // TODO(afergs): Remove? Gets called anyways. init_motion_estimation(cpi); @@ -4391,36 +3809,18 @@ static void set_frame_size(AV1_COMP *cpi, int width, int height) { if (buf_idx != INVALID_IDX) { YV12_BUFFER_CONFIG *const buf = &cm->buffer_pool->frame_bufs[buf_idx].buf; ref_buf->buf = buf; -#if CONFIG_HIGHBITDEPTH - av1_setup_scale_factors_for_frame( - &ref_buf->sf, buf->y_crop_width, buf->y_crop_height, cm->width, - cm->height, (buf->flags & YV12_FLAG_HIGHBITDEPTH) ? 1 : 0); -#else av1_setup_scale_factors_for_frame(&ref_buf->sf, buf->y_crop_width, buf->y_crop_height, cm->width, cm->height); -#endif // CONFIG_HIGHBITDEPTH - if (av1_is_scaled(&ref_buf->sf)) aom_extend_frame_borders(buf); + if (av1_is_scaled(&ref_buf->sf)) + aom_extend_frame_borders(buf, num_planes); } else { ref_buf->buf = NULL; } } -#if CONFIG_VAR_REFS - // Check duplicate reference frames - enc_check_valid_ref_frames(cpi); -#endif // CONFIG_VAR_REFS - -#if CONFIG_INTRABC -#if CONFIG_HIGHBITDEPTH - av1_setup_scale_factors_for_frame(&xd->sf_identity, cm->width, cm->height, - cm->width, cm->height, - cm->use_highbitdepth); -#else - av1_setup_scale_factors_for_frame(&xd->sf_identity, cm->width, cm->height, + av1_setup_scale_factors_for_frame(&cm->sf_identity, cm->width, cm->height, cm->width, cm->height); -#endif // CONFIG_HIGHBITDEPTH -#endif // CONFIG_INTRABC set_ref_ptrs(cm, xd, LAST_FRAME, LAST_FRAME); } @@ -4432,6 +3832,7 @@ static uint8_t calculate_next_resize_scale(const AV1_COMP *cpi) { if (oxcf->pass == 1) return SCALE_NUMERATOR; uint8_t new_denom = SCALE_NUMERATOR; + if (cpi->common.seq_params.reduced_still_picture_hdr) return SCALE_NUMERATOR; switch (oxcf->resize_mode) { case RESIZE_NONE: new_denom = SCALE_NUMERATOR; break; case RESIZE_FIXED: @@ -4446,15 +3847,19 @@ static uint8_t calculate_next_resize_scale(const AV1_COMP *cpi) { return new_denom; } -#if CONFIG_FRAME_SUPERRES - static uint8_t calculate_next_superres_scale(AV1_COMP *cpi) { // Choose an arbitrary random number static unsigned int seed = 34567; const AV1EncoderConfig *oxcf = &cpi->oxcf; if (oxcf->pass == 1) return SCALE_NUMERATOR; uint8_t new_denom = SCALE_NUMERATOR; - int bottom_index, top_index, q, qthresh; + + // Make sure that superres mode of the frame is consistent with the + // sequence-level flag. + assert(IMPLIES(oxcf->superres_mode != SUPERRES_NONE, + cpi->common.seq_params.enable_superres)); + assert(IMPLIES(!cpi->common.seq_params.enable_superres, + oxcf->superres_mode == SUPERRES_NONE)); switch (oxcf->superres_mode) { case SUPERRES_NONE: new_denom = SCALE_NUMERATOR; break; @@ -4465,21 +3870,35 @@ static uint8_t calculate_next_superres_scale(AV1_COMP *cpi) { new_denom = oxcf->superres_scale_denominator; break; case SUPERRES_RANDOM: new_denom = lcg_rand16(&seed) % 9 + 8; break; - case SUPERRES_QTHRESH: - qthresh = (cpi->common.frame_type == KEY_FRAME ? oxcf->superres_kf_qthresh - : oxcf->superres_qthresh); + case SUPERRES_QTHRESH: { + const GF_GROUP *const gf_group = &cpi->twopass.gf_group; + const RATE_FACTOR_LEVEL rf_level = gf_group->rf_level[gf_group->index]; + const double rate_factor_delta = rate_factor_deltas[rf_level]; + const int qthresh = (rate_factor_delta <= 1.0) + ? oxcf->superres_qthresh + : oxcf->superres_kf_qthresh; av1_set_target_rate(cpi, cpi->oxcf.width, cpi->oxcf.height); - q = av1_rc_pick_q_and_bounds(cpi, cpi->oxcf.width, cpi->oxcf.height, - &bottom_index, &top_index); + int bottom_index, top_index; + const int q = av1_rc_pick_q_and_bounds( + cpi, cpi->oxcf.width, cpi->oxcf.height, &bottom_index, &top_index); if (q < qthresh) { new_denom = SCALE_NUMERATOR; } else { - new_denom = SCALE_NUMERATOR + 1 + ((q - qthresh) >> 3); - new_denom = AOMMIN(SCALE_NUMERATOR << 1, new_denom); - // printf("SUPERRES: q %d, qthresh %d: denom %d\n", q, qthresh, - // new_denom); + const uint8_t min_denom = SCALE_NUMERATOR + 1; + const uint8_t denom_step = (MAXQ - qthresh + 1) >> 3; + + if (q == qthresh) { + new_denom = min_denom; + } else if (denom_step == 0) { + new_denom = SCALE_NUMERATOR << 1; + } else { + const uint8_t additional_denom = (q - qthresh) / denom_step; + new_denom = + AOMMIN(min_denom + additional_denom, SCALE_NUMERATOR << 1); + } } break; + } default: assert(0); } return new_denom; @@ -4489,15 +3908,12 @@ static int dimension_is_ok(int orig_dim, int resized_dim, int denom) { return (resized_dim * SCALE_NUMERATOR >= orig_dim * denom / 2); } -// TODO(now): Fix? static int dimensions_are_ok(int owidth, int oheight, size_params_type *rsz) { - return dimension_is_ok(owidth, rsz->resize_width, rsz->superres_denom) && - (CONFIG_HORZONLY_FRAME_SUPERRES || - dimension_is_ok(oheight, rsz->resize_height, rsz->superres_denom)); + // Only need to check the width, as scaling is horizontal only. + (void)oheight; + return dimension_is_ok(owidth, rsz->resize_width, rsz->superres_denom); } -#define DIVIDE_AND_ROUND(x, y) (((x) + ((y) >> 1)) / (y)) - static int validate_size_scales(RESIZE_MODE resize_mode, SUPERRES_MODE superres_mode, int owidth, int oheight, size_params_type *rsz) { @@ -4548,24 +3964,17 @@ static int validate_size_scales(RESIZE_MODE resize_mode, } while (!dimensions_are_ok(owidth, oheight, rsz) && (resize_denom > SCALE_NUMERATOR || rsz->superres_denom > SCALE_NUMERATOR)); - } else { // We are allowed to alter neither resize scale nor superres scale. + } else { // We are allowed to alter neither resize scale nor superres + // scale. return 0; } return dimensions_are_ok(owidth, oheight, rsz); } -#undef DIVIDE_AND_ROUND -#endif // CONFIG_FRAME_SUPERRES // Calculates resize and superres params for next frame size_params_type av1_calculate_next_size_params(AV1_COMP *cpi) { const AV1EncoderConfig *oxcf = &cpi->oxcf; - size_params_type rsz = { - oxcf->width, - oxcf->height, -#if CONFIG_FRAME_SUPERRES - SCALE_NUMERATOR -#endif // CONFIG_FRAME_SUPERRES - }; + size_params_type rsz = { oxcf->width, oxcf->height, SCALE_NUMERATOR }; int resize_denom; if (oxcf->pass == 1) return rsz; if (cpi->resize_pending_width && cpi->resize_pending_height) { @@ -4579,12 +3988,10 @@ size_params_type av1_calculate_next_size_params(AV1_COMP *cpi) { av1_calculate_scaled_size(&rsz.resize_width, &rsz.resize_height, resize_denom); } -#if CONFIG_FRAME_SUPERRES rsz.superres_denom = calculate_next_superres_scale(cpi); if (!validate_size_scales(oxcf->resize_mode, oxcf->superres_mode, oxcf->width, oxcf->height, &rsz)) assert(0 && "Invalid scale parameters"); -#endif // CONFIG_FRAME_SUPERRES return rsz; } @@ -4592,14 +3999,12 @@ static void setup_frame_size_from_params(AV1_COMP *cpi, size_params_type *rsz) { int encode_width = rsz->resize_width; int encode_height = rsz->resize_height; -#if CONFIG_FRAME_SUPERRES AV1_COMMON *cm = &cpi->common; cm->superres_upscaled_width = encode_width; cm->superres_upscaled_height = encode_height; cm->superres_scale_denominator = rsz->superres_denom; av1_calculate_scaled_superres_size(&encode_width, &encode_height, rsz->superres_denom); -#endif // CONFIG_FRAME_SUPERRES set_frame_size(cpi, encode_width, encode_height); } @@ -4608,67 +4013,63 @@ static void setup_frame_size(AV1_COMP *cpi) { setup_frame_size_from_params(cpi, &rsz); } -#if CONFIG_FRAME_SUPERRES static void superres_post_encode(AV1_COMP *cpi) { AV1_COMMON *cm = &cpi->common; + const int num_planes = av1_num_planes(cm); + + if (!av1_superres_scaled(cm)) return; - if (av1_superres_unscaled(cm)) return; + assert(cpi->oxcf.enable_superres); + assert(!is_lossless_requested(&cpi->oxcf)); + assert(!cm->all_lossless); av1_superres_upscale(cm, NULL); // If regular resizing is occurring the source will need to be downscaled to // match the upscaled superres resolution. Otherwise the original source is // used. - if (av1_resize_unscaled(cm)) { + if (!av1_resize_scaled(cm)) { cpi->source = cpi->unscaled_source; if (cpi->last_source != NULL) cpi->last_source = cpi->unscaled_last_source; } else { assert(cpi->unscaled_source->y_crop_width != cm->superres_upscaled_width); assert(cpi->unscaled_source->y_crop_height != cm->superres_upscaled_height); - // Do downscale. cm->(width|height) has been updated by av1_superres_upscale + // Do downscale. cm->(width|height) has been updated by + // av1_superres_upscale if (aom_realloc_frame_buffer( &cpi->scaled_source, cm->superres_upscaled_width, cm->superres_upscaled_height, cm->subsampling_x, cm->subsampling_y, -#if CONFIG_HIGHBITDEPTH - cm->use_highbitdepth, -#endif // CONFIG_HIGHBITDEPTH - AOM_BORDER_IN_PIXELS, cm->byte_alignment, NULL, NULL, NULL)) + cm->use_highbitdepth, AOM_BORDER_IN_PIXELS, cm->byte_alignment, + NULL, NULL, NULL)) aom_internal_error( &cm->error, AOM_CODEC_MEM_ERROR, "Failed to reallocate scaled source buffer for superres"); assert(cpi->scaled_source.y_crop_width == cm->superres_upscaled_width); assert(cpi->scaled_source.y_crop_height == cm->superres_upscaled_height); -#if CONFIG_HIGHBITDEPTH av1_resize_and_extend_frame(cpi->unscaled_source, &cpi->scaled_source, - (int)cm->bit_depth); -#else - av1_resize_and_extend_frame(cpi->unscaled_source, &cpi->scaled_source); -#endif // CONFIG_HIGHBITDEPTH + (int)cm->bit_depth, num_planes); cpi->source = &cpi->scaled_source; } } -#endif // CONFIG_FRAME_SUPERRES static void loopfilter_frame(AV1_COMP *cpi, AV1_COMMON *cm) { + const int num_planes = av1_num_planes(cm); MACROBLOCKD *xd = &cpi->td.mb.e_mbd; - struct loopfilter *lf = &cm->lf; - int no_loopfilter = 0; - if (is_lossless_requested(&cpi->oxcf)) no_loopfilter = 1; + assert(IMPLIES(is_lossless_requested(&cpi->oxcf), + cm->coded_lossless && cm->all_lossless)); -#if CONFIG_EXT_TILE - // 0 loopfilter level is only necessary if individual tile - // decoding is required. - if (cm->single_tile_decoding) no_loopfilter = 1; -#endif // CONFIG_EXT_TILE + const int no_loopfilter = cm->coded_lossless || cm->large_scale_tile; + const int no_cdef = + !cm->seq_params.enable_cdef || cm->coded_lossless || cm->large_scale_tile; + const int no_restoration = !cm->seq_params.enable_restoration || + cm->all_lossless || cm->large_scale_tile; + + struct loopfilter *lf = &cm->lf; if (no_loopfilter) { -#if CONFIG_LOOPFILTER_LEVEL lf->filter_level[0] = 0; lf->filter_level[1] = 0; -#else - lf->filter_level = 0; -#endif } else { struct aom_usec_timer timer; @@ -4682,79 +4083,60 @@ static void loopfilter_frame(AV1_COMP *cpi, AV1_COMMON *cm) { cpi->time_pick_lpf += aom_usec_timer_elapsed(&timer); } -#if !CONFIG_LPF_SB -#if CONFIG_LOOPFILTER_LEVEL - if (lf->filter_level[0] || lf->filter_level[1]) -#else - if (lf->filter_level > 0) -#endif -#endif // CONFIG_LPF_SB - { -#if CONFIG_VAR_TX || CONFIG_EXT_PARTITION || CONFIG_CB4X4 -#if CONFIG_LPF_SB - av1_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level, 0, 0, 0, - 0); -#else -#if CONFIG_LOOPFILTER_LEVEL - av1_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level[0], - lf->filter_level[1], 0, 0); - av1_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level_u, - lf->filter_level_u, 1, 0); - av1_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level_v, - lf->filter_level_v, 2, 0); - -#else - av1_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level, 0, 0); -#endif // CONFIG_LOOPFILTER_LEVEL -#endif // CONFIG_LPF_SB + if (lf->filter_level[0] || lf->filter_level[1]) { +#if LOOP_FILTER_BITMASK + av1_loop_filter_frame(cm->frame_to_show, cm, xd, 0, num_planes, 0); #else if (cpi->num_workers > 1) - av1_loop_filter_frame_mt(cm->frame_to_show, cm, xd->plane, - lf->filter_level, 0, 0, cpi->workers, - cpi->num_workers, &cpi->lf_row_sync); + av1_loop_filter_frame_mt(cm->frame_to_show, cm, xd, 0, num_planes, 0, + cpi->workers, cpi->num_workers, + &cpi->lf_row_sync); else - av1_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level, 0, 0); + av1_loop_filter_frame(cm->frame_to_show, cm, xd, 0, num_planes, 0); #endif } -#if CONFIG_STRIPED_LOOP_RESTORATION - av1_loop_restoration_save_boundary_lines(cm->frame_to_show, cm); -#endif + if (!no_restoration) + av1_loop_restoration_save_boundary_lines(cm->frame_to_show, cm, 0); -#if CONFIG_CDEF - if (is_lossless_requested(&cpi->oxcf)) { + if (no_cdef) { cm->cdef_bits = 0; cm->cdef_strengths[0] = 0; cm->nb_cdef_strengths = 1; + cm->cdef_uv_strengths[0] = 0; } else { // Find CDEF parameters av1_cdef_search(cm->frame_to_show, cpi->source, cm, xd, - cpi->oxcf.speed > 0); + cpi->sf.fast_cdef_search); // Apply the filter av1_cdef_frame(cm->frame_to_show, cm, xd); } -#endif -#if CONFIG_FRAME_SUPERRES superres_post_encode(cpi); -#endif // CONFIG_FRAME_SUPERRES -#if CONFIG_LOOP_RESTORATION - aom_extend_frame_borders(cm->frame_to_show); - av1_pick_filter_restoration(cpi->source, cpi, cpi->sf.lpf_pick); - if (cm->rst_info[0].frame_restoration_type != RESTORE_NONE || - cm->rst_info[1].frame_restoration_type != RESTORE_NONE || - cm->rst_info[2].frame_restoration_type != RESTORE_NONE) { - av1_loop_restoration_frame(cm->frame_to_show, cm, cm->rst_info, 7, 0, NULL); + if (no_restoration) { + cm->rst_info[0].frame_restoration_type = RESTORE_NONE; + cm->rst_info[1].frame_restoration_type = RESTORE_NONE; + cm->rst_info[2].frame_restoration_type = RESTORE_NONE; + } else { + av1_loop_restoration_save_boundary_lines(cm->frame_to_show, cm, 1); + av1_pick_filter_restoration(cpi->source, cpi); + if (cm->rst_info[0].frame_restoration_type != RESTORE_NONE || + cm->rst_info[1].frame_restoration_type != RESTORE_NONE || + cm->rst_info[2].frame_restoration_type != RESTORE_NONE) { + if (cpi->num_workers > 1) + av1_loop_restoration_filter_frame_mt(cm->frame_to_show, cm, 0, + cpi->workers, cpi->num_workers, + &cpi->lr_row_sync, &cpi->lr_ctxt); + else + av1_loop_restoration_filter_frame(cm->frame_to_show, cm, 0, + &cpi->lr_ctxt); + } } -#endif // CONFIG_LOOP_RESTORATION - // TODO(debargha): Fix mv search range on encoder side - // aom_extend_frame_inner_borders(cm->frame_to_show); - aom_extend_frame_borders(cm->frame_to_show); } -static void encode_without_recode_loop(AV1_COMP *cpi) { +static int encode_without_recode_loop(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; int q = 0, bottom_index = 0, top_index = 0; // Dummy variables. @@ -4774,10 +4156,7 @@ static void encode_without_recode_loop(AV1_COMP *cpi) { if (cpi->unscaled_last_source != NULL) cpi->last_source = av1_scale_if_required(cm, cpi->unscaled_last_source, &cpi->scaled_last_source); -#if CONFIG_HIGHBITDEPTH && CONFIG_GLOBAL_MOTION cpi->source->buf_8bit_valid = 0; -#endif - if (frame_is_intra_only(cm) == 0) { scale_references(cpi); } @@ -4796,6 +4175,16 @@ static void encode_without_recode_loop(AV1_COMP *cpi) { av1_cyclic_refresh_setup(cpi); } apply_active_map(cpi); + if (cm->seg.enabled) { + if (!cm->seg.update_data && cm->prev_frame) { + segfeatures_copy(&cm->seg, &cm->prev_frame->seg); + } else { + calculate_segdata(&cm->seg); + } + } else { + memset(&cm->seg, 0, sizeof(cm->seg)); + } + segfeatures_copy(&cm->cur_frame->seg, &cm->seg); // transform / motion compensation build reconstruction frame av1_encode_frame(cpi); @@ -4810,29 +4199,25 @@ static void encode_without_recode_loop(AV1_COMP *cpi) { // seen in the last encoder iteration. // update_base_skip_probs(cpi); aom_clear_system_state(); + return AOM_CODEC_OK; } -static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, - uint8_t *dest) { +static int encode_with_recode_loop(AV1_COMP *cpi, size_t *size, uint8_t *dest) { AV1_COMMON *const cm = &cpi->common; RATE_CONTROL *const rc = &cpi->rc; int bottom_index, top_index; int loop_count = 0; int loop_at_this_size = 0; int loop = 0; -#if !CONFIG_XIPHRC int overshoot_seen = 0; int undershoot_seen = 0; -#endif int frame_over_shoot_limit; int frame_under_shoot_limit; int q = 0, q_low = 0, q_high = 0; set_size_independent_vars(cpi); -#if CONFIG_HIGHBITDEPTH && CONFIG_GLOBAL_MOTION cpi->source->buf_8bit_valid = 0; -#endif aom_clear_system_state(); setup_frame_size(cpi); @@ -4845,32 +4230,27 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, // TODO(agrange) Scale cpi->max_mv_magnitude if frame-size has changed. set_mv_search_params(cpi); -#if !CONFIG_XIPHRC // Reset the loop state for new frame size. overshoot_seen = 0; undershoot_seen = 0; -#endif q_low = bottom_index; q_high = top_index; loop_at_this_size = 0; - } - // Decide frame size bounds first time through. - if (loop_count == 0) { + // Decide frame size bounds first time through. av1_rc_compute_frame_size_bounds(cpi, rc->this_frame_target, &frame_under_shoot_limit, &frame_over_shoot_limit); } -#if CONFIG_GLOBAL_MOTION - // if frame was scaled calculate global_motion_search again if already done + // if frame was scaled calculate global_motion_search again if already + // done if (loop_count > 0 && cpi->source && cpi->global_motion_search_done) if (cpi->source->y_crop_width != cm->width || cpi->source->y_crop_height != cm->height) cpi->global_motion_search_done = 0; -#endif // CONFIG_GLOBAL_MOTION cpi->source = av1_scale_if_required(cm, cpi->unscaled_source, &cpi->scaled_source); if (cpi->unscaled_last_source != NULL) @@ -4884,29 +4264,18 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, scale_references(cpi); } av1_set_quantizer(cm, q); + // printf("Frame %d/%d: q = %d, frame_type = %d\n", cm->current_video_frame, + // cm->show_frame, q, cm->frame_type); if (loop_count == 0) setup_frame(cpi); -#if CONFIG_Q_ADAPT_PROBS // Base q-index may have changed, so we need to assign proper default coef // probs before every iteration. - if (frame_is_intra_only(cm) || cm->error_resilient_mode) { - int i; + if (cm->primary_ref_frame == PRIMARY_REF_NONE || + cm->frame_refs[cm->primary_ref_frame].idx < 0) { av1_default_coef_probs(cm); - if (cm->frame_type == KEY_FRAME || cm->error_resilient_mode || - cm->reset_frame_context == RESET_FRAME_CONTEXT_ALL) { - for (i = 0; i < FRAME_CONTEXTS; ++i) cm->frame_contexts[i] = *cm->fc; - } else if (cm->reset_frame_context == RESET_FRAME_CONTEXT_CURRENT) { -#if CONFIG_NO_FRAME_CONTEXT_SIGNALING - if (cm->frame_refs[0].idx >= 0) { - cm->frame_contexts[cm->frame_refs[0].idx] = *cm->fc; - } -#else - cm->frame_contexts[cm->frame_context_idx] = *cm->fc; -#endif - } + av1_setup_frame_contexts(cm); } -#endif // CONFIG_Q_ADAPT_PROBS // Variance adaptive and in frame q adjustment experiments are mutually // exclusive. @@ -4915,6 +4284,16 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, } else if (cpi->oxcf.aq_mode == COMPLEXITY_AQ) { av1_setup_in_frame_q_adj(cpi); } + if (cm->seg.enabled) { + if (!cm->seg.update_data && cm->prev_frame) { + segfeatures_copy(&cm->seg, &cm->prev_frame->seg); + } else { + calculate_segdata(&cm->seg); + } + } else { + memset(&cm->seg, 0, sizeof(cm->seg)); + } + segfeatures_copy(&cm->cur_frame->seg, &cm->seg); // transform / motion compensation build reconstruction frame save_coding_context(cpi); @@ -4931,7 +4310,9 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, // to recode. if (cpi->sf.recode_loop >= ALLOW_RECODE_KFARFGF) { restore_coding_context(cpi); - av1_pack_bitstream(cpi, dest, size); + + if (av1_pack_bitstream(cpi, dest, size) != AOM_CODEC_OK) + return AOM_CODEC_ERROR; rc->projected_frame_size = (int)(*size) << 3; restore_coding_context(cpi); @@ -4950,16 +4331,11 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, int64_t high_err_target = cpi->ambient_err; int64_t low_err_target = cpi->ambient_err >> 1; -#if CONFIG_HIGHBITDEPTH if (cm->use_highbitdepth) { kf_err = aom_highbd_get_y_sse(cpi->source, get_frame_new_buffer(cm)); } else { kf_err = aom_get_y_sse(cpi->source, get_frame_new_buffer(cm)); } -#else - kf_err = aom_get_y_sse(cpi->source, get_frame_new_buffer(cm)); -#endif // CONFIG_HIGHBITDEPTH - // Prevent possible divide by zero error below for perfect KF kf_err += !kf_err; @@ -4996,7 +4372,6 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, // Is the projected frame size out of range and are we allowed // to attempt to recode. int last_q = q; -#if !CONFIG_XIPHRC int retries = 0; // Frame size out of permitted range: @@ -5062,7 +4437,6 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, undershoot_seen = 1; } -#endif // Clamp Q to upper and lower limits: q = clamp(q, q_low, q_high); @@ -5078,11 +4452,9 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, rc->projected_frame_size < rc->max_frame_bandwidth) loop = 0; -#if CONFIG_GLOBAL_MOTION if (recode_loop_test_global_motion(cpi)) { loop = 1; } -#endif // CONFIG_GLOBAL_MOTION if (loop) { ++loop_count; @@ -5093,86 +4465,90 @@ static void encode_with_recode_loop(AV1_COMP *cpi, size_t *size, #endif } } while (loop); + + return AOM_CODEC_OK; } static int get_ref_frame_flags(const AV1_COMP *cpi) { const int *const map = cpi->common.ref_frame_map; -#if CONFIG_EXT_REFS - const int last2_is_last = - map[cpi->lst_fb_idxes[1]] == map[cpi->lst_fb_idxes[0]]; - const int last3_is_last = - map[cpi->lst_fb_idxes[2]] == map[cpi->lst_fb_idxes[0]]; - const int gld_is_last = map[cpi->gld_fb_idx] == map[cpi->lst_fb_idxes[0]]; -#if CONFIG_ONE_SIDED_COMPOUND && !CONFIG_EXT_COMP_REFS - const int alt_is_last = map[cpi->alt_fb_idx] == map[cpi->lst_fb_idxes[0]]; - const int last3_is_last2 = - map[cpi->lst_fb_idxes[2]] == map[cpi->lst_fb_idxes[1]]; - const int gld_is_last2 = map[cpi->gld_fb_idx] == map[cpi->lst_fb_idxes[1]]; - const int gld_is_last3 = map[cpi->gld_fb_idx] == map[cpi->lst_fb_idxes[2]]; -#else // !CONFIG_ONE_SIDED_COMPOUND || CONFIG_EXT_COMP_REFS - const int bwd_is_last = map[cpi->bwd_fb_idx] == map[cpi->lst_fb_idxes[0]]; - const int alt_is_last = map[cpi->alt_fb_idx] == map[cpi->lst_fb_idxes[0]]; - - const int last3_is_last2 = - map[cpi->lst_fb_idxes[2]] == map[cpi->lst_fb_idxes[1]]; - const int gld_is_last2 = map[cpi->gld_fb_idx] == map[cpi->lst_fb_idxes[1]]; - const int bwd_is_last2 = map[cpi->bwd_fb_idx] == map[cpi->lst_fb_idxes[1]]; - - const int gld_is_last3 = map[cpi->gld_fb_idx] == map[cpi->lst_fb_idxes[2]]; - const int bwd_is_last3 = map[cpi->bwd_fb_idx] == map[cpi->lst_fb_idxes[2]]; - - const int bwd_is_gld = map[cpi->bwd_fb_idx] == map[cpi->gld_fb_idx]; -#endif // CONFIG_ONE_SIDED_COMPOUND && !CONFIG_EXT_COMP_REFS - - const int alt2_is_last = map[cpi->alt2_fb_idx] == map[cpi->lst_fb_idxes[0]]; - const int alt2_is_last2 = map[cpi->alt2_fb_idx] == map[cpi->lst_fb_idxes[1]]; - const int alt2_is_last3 = map[cpi->alt2_fb_idx] == map[cpi->lst_fb_idxes[2]]; - const int alt2_is_gld = map[cpi->alt2_fb_idx] == map[cpi->gld_fb_idx]; - const int alt2_is_bwd = map[cpi->alt2_fb_idx] == map[cpi->bwd_fb_idx]; - - const int last2_is_alt = map[cpi->lst_fb_idxes[1]] == map[cpi->alt_fb_idx]; - const int last3_is_alt = map[cpi->lst_fb_idxes[2]] == map[cpi->alt_fb_idx]; - const int gld_is_alt = map[cpi->gld_fb_idx] == map[cpi->alt_fb_idx]; - const int bwd_is_alt = map[cpi->bwd_fb_idx] == map[cpi->alt_fb_idx]; - const int alt2_is_alt = map[cpi->alt2_fb_idx] == map[cpi->alt_fb_idx]; -#else // !CONFIG_EXT_REFS - const int gld_is_last = map[cpi->gld_fb_idx] == map[cpi->lst_fb_idx]; - const int gld_is_alt = map[cpi->gld_fb_idx] == map[cpi->alt_fb_idx]; - const int alt_is_last = map[cpi->alt_fb_idx] == map[cpi->lst_fb_idx]; -#endif // CONFIG_EXT_REFS - - int flags = AOM_REFFRAME_ALL; - - if (gld_is_last || gld_is_alt) flags &= ~AOM_GOLD_FLAG; + // No.1 Priority: LAST_FRAME + const int last2_is_last = map[cpi->ref_fb_idx[1]] == map[cpi->ref_fb_idx[0]]; + const int last3_is_last = map[cpi->ref_fb_idx[2]] == map[cpi->ref_fb_idx[0]]; + const int gld_is_last = + map[cpi->ref_fb_idx[GOLDEN_FRAME - 1]] == map[cpi->ref_fb_idx[0]]; + const int bwd_is_last = + map[cpi->ref_fb_idx[BWDREF_FRAME - 1]] == map[cpi->ref_fb_idx[0]]; + const int alt2_is_last = + map[cpi->ref_fb_idx[ALTREF2_FRAME - 1]] == map[cpi->ref_fb_idx[0]]; + const int alt_is_last = + map[cpi->ref_fb_idx[ALTREF_FRAME - 1]] == map[cpi->ref_fb_idx[0]]; + + // No.2 Priority: ALTREF_FRAME + const int last2_is_alt = + map[cpi->ref_fb_idx[1]] == map[cpi->ref_fb_idx[ALTREF_FRAME - 1]]; + const int last3_is_alt = + map[cpi->ref_fb_idx[2]] == map[cpi->ref_fb_idx[ALTREF_FRAME - 1]]; + const int gld_is_alt = map[cpi->ref_fb_idx[GOLDEN_FRAME - 1]] == + map[cpi->ref_fb_idx[ALTREF_FRAME - 1]]; + const int bwd_is_alt = map[cpi->ref_fb_idx[BWDREF_FRAME - 1]] == + map[cpi->ref_fb_idx[ALTREF_FRAME - 1]]; + const int alt2_is_alt = map[cpi->ref_fb_idx[ALTREF2_FRAME - 1]] == + map[cpi->ref_fb_idx[ALTREF_FRAME - 1]]; + + // No.3 Priority: LAST2_FRAME + const int last3_is_last2 = map[cpi->ref_fb_idx[2]] == map[cpi->ref_fb_idx[1]]; + const int gld_is_last2 = + map[cpi->ref_fb_idx[GOLDEN_FRAME - 1]] == map[cpi->ref_fb_idx[1]]; + const int bwd_is_last2 = + map[cpi->ref_fb_idx[BWDREF_FRAME - 1]] == map[cpi->ref_fb_idx[1]]; + const int alt2_is_last2 = + map[cpi->ref_fb_idx[ALTREF2_FRAME - 1]] == map[cpi->ref_fb_idx[1]]; + + // No.4 Priority: LAST3_FRAME + const int gld_is_last3 = + map[cpi->ref_fb_idx[GOLDEN_FRAME - 1]] == map[cpi->ref_fb_idx[2]]; + const int bwd_is_last3 = + map[cpi->ref_fb_idx[BWDREF_FRAME - 1]] == map[cpi->ref_fb_idx[2]]; + const int alt2_is_last3 = + map[cpi->ref_fb_idx[ALTREF2_FRAME - 1]] == map[cpi->ref_fb_idx[2]]; + + // No.5 Priority: GOLDEN_FRAME + const int bwd_is_gld = map[cpi->ref_fb_idx[BWDREF_FRAME - 1]] == + map[cpi->ref_fb_idx[GOLDEN_FRAME - 1]]; + const int alt2_is_gld = map[cpi->ref_fb_idx[ALTREF2_FRAME - 1]] == + map[cpi->ref_fb_idx[GOLDEN_FRAME - 1]]; + + // No.6 Priority: BWDREF_FRAME + const int alt2_is_bwd = map[cpi->ref_fb_idx[ALTREF2_FRAME - 1]] == + map[cpi->ref_fb_idx[BWDREF_FRAME - 1]]; + + // No.7 Priority: ALTREF2_FRAME + + // After av1_apply_encoding_flags() is called, cpi->ref_frame_flags might be + // adjusted according to external encoder flags. + int flags = cpi->ext_ref_frame_flags; if (cpi->rc.frames_till_gf_update_due == INT_MAX) flags &= ~AOM_GOLD_FLAG; if (alt_is_last) flags &= ~AOM_ALT_FLAG; -#if CONFIG_EXT_REFS if (last2_is_last || last2_is_alt) flags &= ~AOM_LAST2_FLAG; - if (last3_is_last || last3_is_last2 || last3_is_alt) flags &= ~AOM_LAST3_FLAG; + if (last3_is_last || last3_is_alt || last3_is_last2) flags &= ~AOM_LAST3_FLAG; - if (gld_is_last2 || gld_is_last3) flags &= ~AOM_GOLD_FLAG; + if (gld_is_last || gld_is_alt || gld_is_last2 || gld_is_last3) + flags &= ~AOM_GOLD_FLAG; -#if CONFIG_ONE_SIDED_COMPOUND && \ - !CONFIG_EXT_COMP_REFS // Changes LL & HL bitstream - /* Allow biprediction between two identical frames (e.g. bwd_is_last = 1) */ - if (bwd_is_alt && (flags & AOM_BWD_FLAG)) flags &= ~AOM_BWD_FLAG; -#else // !CONFIG_ONE_SIDED_COMPOUND || CONFIG_EXT_COMP_REFS - if ((bwd_is_last || bwd_is_last2 || bwd_is_last3 || bwd_is_gld || - bwd_is_alt) && + if ((bwd_is_last || bwd_is_alt || bwd_is_last2 || bwd_is_last3 || + bwd_is_gld) && (flags & AOM_BWD_FLAG)) flags &= ~AOM_BWD_FLAG; -#endif // CONFIG_ONE_SIDED_COMPOUND && !CONFIG_EXT_COMP_REFS - if ((alt2_is_last || alt2_is_last2 || alt2_is_last3 || alt2_is_gld || - alt2_is_bwd || alt2_is_alt) && + if ((alt2_is_last || alt2_is_alt || alt2_is_last2 || alt2_is_last3 || + alt2_is_gld || alt2_is_bwd) && (flags & AOM_ALT2_FLAG)) flags &= ~AOM_ALT2_FLAG; -#endif // CONFIG_EXT_REFS return flags; } @@ -5182,6 +4558,9 @@ static void set_ext_overrides(AV1_COMP *cpi) { // av1_update_reference() and av1_update_entropy() calls // Note: The overrides are valid only for the next frame passed // to encode_frame_to_data_rate() function + if (cpi->ext_use_s_frame) cpi->common.frame_type = S_FRAME; + cpi->common.force_primary_ref_none = cpi->ext_use_primary_ref_none; + if (cpi->ext_refresh_frame_context_pending) { cpi->common.refresh_frame_context = cpi->ext_refresh_frame_context; cpi->ext_refresh_frame_context_pending = 0; @@ -5190,54 +4569,23 @@ static void set_ext_overrides(AV1_COMP *cpi) { cpi->refresh_last_frame = cpi->ext_refresh_last_frame; cpi->refresh_golden_frame = cpi->ext_refresh_golden_frame; cpi->refresh_alt_ref_frame = cpi->ext_refresh_alt_ref_frame; + cpi->refresh_bwd_ref_frame = cpi->ext_refresh_bwd_ref_frame; + cpi->refresh_alt2_ref_frame = cpi->ext_refresh_alt2_ref_frame; cpi->ext_refresh_frame_flags_pending = 0; } + cpi->common.allow_ref_frame_mvs = cpi->ext_use_ref_frame_mvs; + cpi->common.error_resilient_mode = cpi->ext_use_error_resilient; } -#if !CONFIG_FRAME_SIGN_BIAS -static void set_arf_sign_bias(AV1_COMP *cpi) { - AV1_COMMON *const cm = &cpi->common; - int arf_sign_bias; -#if CONFIG_EXT_REFS - const GF_GROUP *const gf_group = &cpi->twopass.gf_group; - // The arf_sign_bias will be one for internal ARFs' - arf_sign_bias = cpi->rc.source_alt_ref_active && - (!cpi->refresh_alt_ref_frame || - gf_group->update_type[gf_group->index] == INTNL_ARF_UPDATE); -#else // !CONFIG_EXT_REFS - if ((cpi->oxcf.pass == 2) && cpi->multi_arf_allowed) { - const GF_GROUP *const gf_group = &cpi->twopass.gf_group; - arf_sign_bias = cpi->rc.source_alt_ref_active && - (!cpi->refresh_alt_ref_frame || - (gf_group->rf_level[gf_group->index] == GF_ARF_LOW)); - } else { - arf_sign_bias = - (cpi->rc.source_alt_ref_active && !cpi->refresh_alt_ref_frame); - } -#endif // CONFIG_EXT_REFS - - cm->ref_frame_sign_bias[ALTREF_FRAME] = arf_sign_bias; -#if CONFIG_EXT_REFS - cm->ref_frame_sign_bias[BWDREF_FRAME] = cm->ref_frame_sign_bias[ALTREF_FRAME]; - cm->ref_frame_sign_bias[ALTREF2_FRAME] = - cm->ref_frame_sign_bias[ALTREF_FRAME]; -#endif // CONFIG_EXT_REFS -} -#endif // !CONFIG_FRAME_SIGN_BIAS - static int setup_interp_filter_search_mask(AV1_COMP *cpi) { InterpFilter ifilter; - int ref_total[TOTAL_REFS_PER_FRAME] = { 0 }; + int ref_total[REF_FRAMES] = { 0 }; MV_REFERENCE_FRAME ref; int mask = 0; int arf_idx = ALTREF_FRAME; -#if CONFIG_EXT_REFS if (cpi->common.last_frame_type == KEY_FRAME || cpi->refresh_alt_ref_frame || cpi->refresh_alt2_ref_frame) -#else // !CONFIG_EXT_REFS - if (cpi->common.last_frame_type == KEY_FRAME || cpi->refresh_alt_ref_frame) -#endif // CONFIG_EXT_REFS return mask; for (ref = LAST_FRAME; ref <= ALTREF_FRAME; ++ref) @@ -5247,25 +4595,21 @@ static int setup_interp_filter_search_mask(AV1_COMP *cpi) { for (ifilter = EIGHTTAP_REGULAR; ifilter < SWITCHABLE_FILTERS; ++ifilter) { if ((ref_total[LAST_FRAME] && cpi->interp_filter_selected[LAST_FRAME][ifilter] == 0) && -#if CONFIG_EXT_REFS (ref_total[LAST2_FRAME] == 0 || cpi->interp_filter_selected[LAST2_FRAME][ifilter] * 50 < ref_total[LAST2_FRAME]) && (ref_total[LAST3_FRAME] == 0 || cpi->interp_filter_selected[LAST3_FRAME][ifilter] * 50 < ref_total[LAST3_FRAME]) && -#endif // CONFIG_EXT_REFS (ref_total[GOLDEN_FRAME] == 0 || cpi->interp_filter_selected[GOLDEN_FRAME][ifilter] * 50 < ref_total[GOLDEN_FRAME]) && -#if CONFIG_EXT_REFS (ref_total[BWDREF_FRAME] == 0 || cpi->interp_filter_selected[BWDREF_FRAME][ifilter] * 50 < ref_total[BWDREF_FRAME]) && (ref_total[ALTREF2_FRAME] == 0 || cpi->interp_filter_selected[ALTREF2_FRAME][ifilter] * 50 < ref_total[ALTREF2_FRAME]) && -#endif // CONFIG_EXT_REFS (ref_total[ALTREF_FRAME] == 0 || cpi->interp_filter_selected[arf_idx][ifilter] * 50 < ref_total[ALTREF_FRAME])) @@ -5281,16 +4625,50 @@ static int setup_interp_filter_search_mask(AV1_COMP *cpi) { static void dump_filtered_recon_frames(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; const YV12_BUFFER_CONFIG *recon_buf = cm->frame_to_show; - int h; - char file_name[256] = "/tmp/enc_filtered_recon.yuv"; - FILE *f_recon = NULL; - if (recon_buf == NULL || !cm->show_frame) { - printf("Frame %d is not ready or no show to dump.\n", + if (recon_buf == NULL) { + printf("Frame %d is not ready.\n", cm->current_video_frame); + return; + } + + static const int flag_list[REF_FRAMES] = { 0, + AOM_LAST_FLAG, + AOM_LAST2_FLAG, + AOM_LAST3_FLAG, + AOM_GOLD_FLAG, + AOM_BWD_FLAG, + AOM_ALT2_FLAG, + AOM_ALT_FLAG }; + printf( + "\n***Frame=%d (frame_offset=%d, show_frame=%d, " + "show_existing_frame=%d) " + "[LAST LAST2 LAST3 GOLDEN BWD ALT2 ALT]=[", + cm->current_video_frame, cm->frame_offset, cm->show_frame, + cm->show_existing_frame); + for (int ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) { + const int buf_idx = cm->frame_refs[ref_frame - LAST_FRAME].idx; + const int ref_offset = + (buf_idx >= 0) + ? (int)cm->buffer_pool->frame_bufs[buf_idx].cur_frame_offset + : -1; + printf( + " %d(%c-%d-%4.2f)", ref_offset, + (cpi->ref_frame_flags & flag_list[ref_frame]) ? 'Y' : 'N', + (buf_idx >= 0) ? (int)cpi->frame_rf_level[buf_idx] : -1, + (buf_idx >= 0) ? rate_factor_deltas[cpi->frame_rf_level[buf_idx]] : -1); + } + printf(" ]\n"); + + if (!cm->show_frame) { + printf("Frame %d is a no show frame, so no image dump.\n", cm->current_video_frame); return; } + int h; + char file_name[256] = "/tmp/enc_filtered_recon.yuv"; + FILE *f_recon = NULL; + if (cm->current_video_frame == 0) { if ((f_recon = fopen(file_name, "wb")) == NULL) { printf("Unable to open file %s to write.\n", file_name); @@ -5303,13 +4681,14 @@ static void dump_filtered_recon_frames(AV1_COMP *cpi) { } } printf( - "\nFrame=%5d, encode_update_type[%5d]=%1d, show_existing_frame=%d, " - "source_alt_ref_active=%d, refresh_alt_ref_frame=%d, rf_level=%d, " - "y_stride=%4d, uv_stride=%4d, cm->width=%4d, cm->height=%4d\n", + "\nFrame=%5d, encode_update_type[%5d]=%1d, frame_offset=%d, " + "show_frame=%d, show_existing_frame=%d, source_alt_ref_active=%d, " + "refresh_alt_ref_frame=%d, rf_level=%d, " + "y_stride=%4d, uv_stride=%4d, cm->width=%4d, cm->height=%4d\n\n", cm->current_video_frame, cpi->twopass.gf_group.index, cpi->twopass.gf_group.update_type[cpi->twopass.gf_group.index], - cm->show_existing_frame, cpi->rc.source_alt_ref_active, - cpi->refresh_alt_ref_frame, + cm->frame_offset, cm->show_frame, cm->show_existing_frame, + cpi->rc.source_alt_ref_active, cpi->refresh_alt_ref_frame, cpi->twopass.gf_group.rf_level[cpi->twopass.gf_group.index], recon_buf->y_stride, recon_buf->uv_stride, cm->width, cm->height); #if 0 @@ -5346,49 +4725,44 @@ static void dump_filtered_recon_frames(AV1_COMP *cpi) { } #endif // DUMP_RECON_FRAMES -static void make_update_tile_list_enc(AV1_COMP *cpi, const int tile_rows, - const int tile_cols, - FRAME_CONTEXT *ec_ctxs[]) { - int i; - for (i = 0; i < tile_rows * tile_cols; ++i) - ec_ctxs[i] = &cpi->tile_data[i].tctx; -} - -static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, - uint8_t *dest, int skip_adapt, - unsigned int *frame_flags) { +static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, uint8_t *dest, + int skip_adapt, + unsigned int *frame_flags) { AV1_COMMON *const cm = &cpi->common; const AV1EncoderConfig *const oxcf = &cpi->oxcf; struct segmentation *const seg = &cm->seg; - FRAME_CONTEXT **tile_ctxs = aom_malloc(cm->tile_rows * cm->tile_cols * - sizeof(&cpi->tile_data[0].tctx)); - aom_cdf_prob **cdf_ptrs = - aom_malloc(cm->tile_rows * cm->tile_cols * - sizeof(&cpi->tile_data[0].tctx.partition_cdf[0][0])); -#if CONFIG_XIPHRC - int frame_type; - int drop_this_frame = 0; -#endif // CONFIG_XIPHRC + set_ext_overrides(cpi); aom_clear_system_state(); -#if !CONFIG_FRAME_SIGN_BIAS - // Set the arf sign bias for this frame. - set_arf_sign_bias(cpi); -#endif // !CONFIG_FRAME_SIGN_BIAS - -#if CONFIG_TEMPMV_SIGNALING // frame type has been decided outside of this function call - cm->cur_frame->intra_only = cm->frame_type == KEY_FRAME || cm->intra_only; - cm->use_prev_frame_mvs = - !cpi->oxcf.disable_tempmv && !cm->cur_frame->intra_only; -#endif + cm->cur_frame->intra_only = frame_is_intra_only(cm); + cm->cur_frame->frame_type = cm->frame_type; + + // S_FRAMEs are always error resilient + cm->error_resilient_mode |= frame_is_sframe(cm); + + cm->large_scale_tile = cpi->oxcf.large_scale_tile; + cm->single_tile_decoding = cpi->oxcf.single_tile_decoding; + if (cm->large_scale_tile) cm->seq_params.frame_id_numbers_present_flag = 0; + + cm->allow_ref_frame_mvs &= frame_might_allow_ref_frame_mvs(cm); + // cm->allow_ref_frame_mvs needs to be written into the frame header while + // cm->large_scale_tile is 1, therefore, "cm->large_scale_tile=1" case is + // separated from frame_might_allow_ref_frame_mvs(). + cm->allow_ref_frame_mvs &= !cm->large_scale_tile; + + cm->allow_warped_motion = + cpi->oxcf.allow_warped_motion && frame_might_allow_warped_motion(cm); + + // Reset the frame packet stamp index. + if (cm->frame_type == KEY_FRAME) cm->current_video_frame = 0; -#if CONFIG_EXT_REFS // NOTE: // (1) Move the setup of the ref_frame_flags upfront as it would be // determined by the current frame properties; - // (2) The setup of the ref_frame_flags applies to both show_existing_frame's + // (2) The setup of the ref_frame_flags applies to both + // show_existing_frame's // and the other cases. if (cm->current_video_frame > 0) cpi->ref_frame_flags = get_ref_frame_flags(cpi); @@ -5415,12 +4789,20 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, cpi->rc.is_bipred_frame = 0; restore_coding_context(cpi); + // Build the bitstream - av1_pack_bitstream(cpi, dest, size); + if (av1_pack_bitstream(cpi, dest, size) != AOM_CODEC_OK) + return AOM_CODEC_ERROR; + + cpi->seq_params_locked = 1; // Set up frame to show to get ready for stats collection. cm->frame_to_show = get_frame_new_buffer(cm); + // Update current frame offset. + cm->frame_offset = + cm->buffer_pool->frame_bufs[cm->new_fb_idx].cur_frame_offset; + #if DUMP_RECON_FRAMES == 1 // NOTE(zoeliu): For debug - Output the filtered reconstructed video. dump_filtered_recon_frames(cpi); @@ -5432,9 +4814,11 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, // update has been done previously when handling the LAST_BIPRED_FRAME // right before BWDREF_FRAME (in the display order); // (2) For INTNL_OVERLAY as the show_existing_frame, the reference frame - // update will be done when the following is called, which will exchange + // update will be done when the following is called, which will + // exchange // the virtual indexes between LAST_FRAME and ALTREF2_FRAME, so that - // LAST3 will get retired, LAST2 becomes LAST3, LAST becomes LAST2, and + // LAST3 will get retired, LAST2 becomes LAST3, LAST becomes LAST2, + // and // ALTREF2_FRAME will serve as the new LAST_FRAME. update_reference_frames(cpi); @@ -5452,23 +4836,13 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, // to do post-encoding update accordingly. if (cpi->rc.is_src_frame_alt_ref) { av1_set_target_rate(cpi, cm->width, cm->height); -#if CONFIG_XIPHRC - frame_type = cm->frame_type == INTER_FRAME ? OD_P_FRAME : OD_I_FRAME; - drop_this_frame = od_enc_rc_update_state( - &cpi->od_rc, *size << 3, cpi->refresh_golden_frame, - cpi->refresh_alt_ref_frame, frame_type, cpi->droppable); -#else av1_rc_postencode_update(cpi, *size); -#endif } ++cm->current_video_frame; - aom_free(tile_ctxs); - aom_free(cdf_ptrs); - return; + return AOM_CODEC_OK; } -#endif // CONFIG_EXT_REFS // Set default state for segment based loop filter update flags. cm->lf.mode_ref_delta_update = 0; @@ -5477,7 +4851,7 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, cpi->sf.interp_filter_search_mask = setup_interp_filter_search_mask(cpi); // Set various flags etc to special state if it is a key frame. - if (frame_is_intra_only(cm)) { + if (frame_is_intra_only(cm) || frame_is_sframe(cm)) { // Reset the loop filter deltas and segmentation map. av1_reset_segment_features(cm); @@ -5489,19 +4863,6 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, // The alternate reference frame cannot be active for a key frame. cpi->rc.source_alt_ref_active = 0; - - cm->error_resilient_mode = oxcf->error_resilient_mode; - -#if !CONFIG_NO_FRAME_CONTEXT_SIGNALING - // By default, encoder assumes decoder can use prev_mi. - if (cm->error_resilient_mode) { - cm->reset_frame_context = RESET_FRAME_CONTEXT_NONE; - cm->refresh_frame_context = REFRESH_FRAME_CONTEXT_FORWARD; - } else if (cm->intra_only) { - // Only reset the current context. - cm->reset_frame_context = RESET_FRAME_CONTEXT_CURRENT; - } -#endif } if (cpi->oxcf.mtu == 0) { cm->num_tg = cpi->oxcf.num_tile_groups; @@ -5511,33 +4872,15 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, cm->num_tg = DEFAULT_MAX_NUM_TG; } -#if CONFIG_EXT_TILE - cm->large_scale_tile = cpi->oxcf.large_scale_tile; - cm->single_tile_decoding = cpi->oxcf.single_tile_decoding; -#endif // CONFIG_EXT_TILE - -#if CONFIG_XIPHRC - if (drop_this_frame) { - av1_rc_postencode_update_drop_frame(cpi); - ++cm->current_video_frame; - aom_free(tile_ctxs); - aom_free(cdf_ptrs); - return; - } -#else // For 1 pass CBR, check if we are dropping this frame. // Never drop on key frame. if (oxcf->pass == 0 && oxcf->rc_mode == AOM_CBR && cm->frame_type != KEY_FRAME) { if (av1_rc_drop_frame(cpi)) { av1_rc_postencode_update_drop_frame(cpi); - ++cm->current_video_frame; - aom_free(tile_ctxs); - aom_free(cdf_ptrs); - return; + return AOM_CODEC_OK; } } -#endif aom_clear_system_state(); @@ -5546,46 +4889,59 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, MAX_MODES * sizeof(*cpi->mode_chosen_counts)); #endif -#if CONFIG_REFERENCE_BUFFER if (cm->seq_params.frame_id_numbers_present_flag) { /* Non-normative definition of current_frame_id ("frame counter" with - * wraparound) */ - const int frame_id_length = FRAME_ID_LENGTH_MINUS7 + 7; + * wraparound) */ + const int frame_id_length = FRAME_ID_LENGTH; if (cm->current_frame_id == -1) { int lsb, msb; -/* quasi-random initialization of current_frame_id for a key frame */ -#if CONFIG_HIGHBITDEPTH + /* quasi-random initialization of current_frame_id for a key frame */ if (cpi->source->flags & YV12_FLAG_HIGHBITDEPTH) { lsb = CONVERT_TO_SHORTPTR(cpi->source->y_buffer)[0] & 0xff; msb = CONVERT_TO_SHORTPTR(cpi->source->y_buffer)[1] & 0xff; } else { -#endif lsb = cpi->source->y_buffer[0] & 0xff; msb = cpi->source->y_buffer[1] & 0xff; -#if CONFIG_HIGHBITDEPTH } -#endif cm->current_frame_id = ((msb << 8) + lsb) % (1 << frame_id_length); + + // S_frame is meant for stitching different streams of different + // resolutions together, so current_frame_id must be the + // same across different streams of the same content current_frame_id + // should be the same and not random. 0x37 is a chosen number as start + // point + if (cpi->oxcf.sframe_enabled) cm->current_frame_id = 0x37; } else { cm->current_frame_id = (cm->current_frame_id + 1 + (1 << frame_id_length)) % (1 << frame_id_length); } } -#endif // CONFIG_REFERENCE_BUFFER -#if CONFIG_EXT_DELTA_Q - cm->delta_q_present_flag = cpi->oxcf.deltaq_mode != NO_DELTA_Q; - cm->delta_lf_present_flag = cpi->oxcf.deltaq_mode == DELTA_Q_LF; -#if CONFIG_LOOPFILTER_LEVEL - cm->delta_lf_multi = DEFAULT_DELTA_LF_MULTI; -#endif // CONFIG_LOOPFILTER_LEVEL -#endif + switch (cpi->oxcf.cdf_update_mode) { + case 0: // No CDF update for any frames(4~6% compression loss). + cm->disable_cdf_update = 1; + break; + case 1: // Enable CDF update for all frames. + cm->disable_cdf_update = 0; + break; + case 2: + // Strategically determine at which frames to do CDF update. + // Currently only enable CDF update for all-intra and no-show frames(1.5% + // compression loss). + // TODO(huisu@google.com): design schemes for various trade-offs between + // compression quality and decoding speed. + cm->disable_cdf_update = + (frame_is_intra_only(cm) || !cm->show_frame) ? 0 : 1; + break; + } + cm->timing_info_present &= !cm->seq_params.reduced_still_picture_hdr; if (cpi->sf.recode_loop == DISALLOW_RECODE) { - encode_without_recode_loop(cpi); + if (encode_without_recode_loop(cpi) != AOM_CODEC_OK) return AOM_CODEC_ERROR; } else { - encode_with_recode_loop(cpi, size, dest); + if (encode_with_recode_loop(cpi, size, dest) != AOM_CODEC_OK) + return AOM_CODEC_ERROR; } cm->last_tile_cols = cm->tile_cols; @@ -5601,72 +4957,86 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, // fixed interval. Note the reconstruction error if it is the frame before // the force key frame if (cpi->rc.next_key_frame_forced && cpi->rc.frames_to_key == 1) { -#if CONFIG_HIGHBITDEPTH if (cm->use_highbitdepth) { cpi->ambient_err = aom_highbd_get_y_sse(cpi->source, get_frame_new_buffer(cm)); } else { cpi->ambient_err = aom_get_y_sse(cpi->source, get_frame_new_buffer(cm)); } -#else - cpi->ambient_err = aom_get_y_sse(cpi->source, get_frame_new_buffer(cm)); -#endif // CONFIG_HIGHBITDEPTH } - // If the encoder forced a KEY_FRAME decision - if (cm->frame_type == KEY_FRAME) { + // If the encoder forced a KEY_FRAME decision or if frame is an S_FRAME + if (cm->frame_type == KEY_FRAME || frame_is_sframe(cm)) { cpi->refresh_last_frame = 1; } cm->frame_to_show = get_frame_new_buffer(cm); - cm->frame_to_show->color_space = cm->color_space; -#if CONFIG_COLORSPACE_HEADERS - cm->frame_to_show->transfer_function = cm->transfer_function; + cm->frame_to_show->color_primaries = cm->color_primaries; + cm->frame_to_show->transfer_characteristics = cm->transfer_characteristics; + cm->frame_to_show->matrix_coefficients = cm->matrix_coefficients; + cm->frame_to_show->monochrome = cm->seq_params.monochrome; cm->frame_to_show->chroma_sample_position = cm->chroma_sample_position; -#endif cm->frame_to_show->color_range = cm->color_range; cm->frame_to_show->render_width = cm->render_width; cm->frame_to_show->render_height = cm->render_height; -#if CONFIG_EXT_REFS -// TODO(zoeliu): For non-ref frames, loop filtering may need to be turned -// off. -#endif // CONFIG_EXT_REFS + // TODO(zoeliu): For non-ref frames, loop filtering may need to be turned + // off. // Pick the loop filter level for the frame. - loopfilter_frame(cpi, cm); + if (!cm->allow_intrabc) { + loopfilter_frame(cpi, cm); + } else { + cm->lf.filter_level[0] = 0; + cm->lf.filter_level[1] = 0; + cm->cdef_bits = 0; + cm->cdef_strengths[0] = 0; + cm->nb_cdef_strengths = 1; + cm->cdef_uv_strengths[0] = 0; + cm->rst_info[0].frame_restoration_type = RESTORE_NONE; + cm->rst_info[1].frame_restoration_type = RESTORE_NONE; + cm->rst_info[2].frame_restoration_type = RESTORE_NONE; + } + + // TODO(debargha): Fix mv search range on encoder side + // aom_extend_frame_inner_borders(cm->frame_to_show, av1_num_planes(cm)); + aom_extend_frame_borders(cm->frame_to_show, av1_num_planes(cm)); #ifdef OUTPUT_YUV_REC aom_write_one_yuv_frame(cm, cm->frame_to_show); #endif // Build the bitstream - av1_pack_bitstream(cpi, dest, size); + if (av1_pack_bitstream(cpi, dest, size) != AOM_CODEC_OK) + return AOM_CODEC_ERROR; - if (skip_adapt) { - aom_free(tile_ctxs); - aom_free(cdf_ptrs); - return; - } + cpi->seq_params_locked = 1; + + if (skip_adapt) return AOM_CODEC_OK; -#if CONFIG_REFERENCE_BUFFER if (cm->seq_params.frame_id_numbers_present_flag) { int i; - /* Update reference frame id values based on the value of refresh_mask */ + // Update reference frame id values based on the value of refresh_frame_mask for (i = 0; i < REF_FRAMES; i++) { - if ((cm->refresh_mask >> i) & 1) { + if ((cpi->refresh_frame_mask >> i) & 1) { cm->ref_frame_id[i] = cm->current_frame_id; } } } -#endif // CONFIG_REFERENCE_BUFFER #if DUMP_RECON_FRAMES == 1 // NOTE(zoeliu): For debug - Output the filtered reconstructed video. - if (cm->show_frame) dump_filtered_recon_frames(cpi); + dump_filtered_recon_frames(cpi); #endif // DUMP_RECON_FRAMES - if (cm->seg.update_map) update_reference_segmentation_map(cpi); + if (cm->seg.enabled) { + if (cm->seg.update_map) { + update_reference_segmentation_map(cpi); + } else if (cm->last_frame_seg_map) { + memcpy(cm->current_frame_seg_map, cm->last_frame_seg_map, + cm->mi_cols * cm->mi_rows * sizeof(uint8_t)); + } + } if (frame_is_intra_only(cm) == 0) { release_scaled_references(cpi); @@ -5675,39 +5045,12 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, update_reference_frames(cpi); #if CONFIG_ENTROPY_STATS - av1_accumulate_frame_counts(&aggregate_fc, &cm->counts); - assert(cm->frame_context_idx < FRAME_CONTEXTS); - av1_accumulate_frame_counts(&aggregate_fc_per_type[cm->frame_context_idx], - &cm->counts); + av1_accumulate_frame_counts(&aggregate_fc, &cpi->counts); #endif // CONFIG_ENTROPY_STATS - if (cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_BACKWARD) { -#if CONFIG_LV_MAP - av1_adapt_coef_probs(cm); -#endif // CONFIG_LV_MAP - av1_adapt_intra_frame_probs(cm); - make_update_tile_list_enc(cpi, cm->tile_rows, cm->tile_cols, tile_ctxs); - av1_average_tile_coef_cdfs(cpi->common.fc, tile_ctxs, cdf_ptrs, - cm->tile_rows * cm->tile_cols); - av1_average_tile_intra_cdfs(cpi->common.fc, tile_ctxs, cdf_ptrs, - cm->tile_rows * cm->tile_cols); -#if CONFIG_PVQ - av1_average_tile_pvq_cdfs(cpi->common.fc, tile_ctxs, - cm->tile_rows * cm->tile_cols); -#endif // CONFIG_PVQ -#if CONFIG_ADAPT_SCAN - av1_adapt_scan_order(cm); -#endif // CONFIG_ADAPT_SCAN - } - if (!frame_is_intra_only(cm)) { - if (cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_BACKWARD) { - av1_adapt_inter_frame_probs(cm); - av1_adapt_mv_probs(cm, cm->allow_high_precision_mv); - av1_average_tile_inter_cdfs(&cpi->common, cpi->common.fc, tile_ctxs, - cdf_ptrs, cm->tile_rows * cm->tile_cols); - av1_average_tile_mv_cdfs(cpi->common.fc, tile_ctxs, cdf_ptrs, - cm->tile_rows * cm->tile_cols); - } + if (cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_BACKWARD) { + *cm->fc = cpi->tile_data[cm->largest_tile_id].tctx; + av1_reset_cdf_symbol_counters(cm->fc); } if (cpi->refresh_golden_frame == 1) @@ -5720,39 +5063,14 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, else cpi->frame_flags &= ~FRAMEFLAGS_ALTREF; -#if CONFIG_EXT_REFS if (cpi->refresh_bwd_ref_frame == 1) cpi->frame_flags |= FRAMEFLAGS_BWDREF; else cpi->frame_flags &= ~FRAMEFLAGS_BWDREF; -#endif // CONFIG_EXT_REFS - -#if !CONFIG_EXT_REFS - cpi->ref_frame_flags = get_ref_frame_flags(cpi); -#endif // !CONFIG_EXT_REFS cm->last_frame_type = cm->frame_type; -#if CONFIG_XIPHRC - frame_type = cm->frame_type == KEY_FRAME ? OD_I_FRAME : OD_P_FRAME; - - drop_this_frame = - od_enc_rc_update_state(&cpi->od_rc, *size << 3, cpi->refresh_golden_frame, - cpi->refresh_alt_ref_frame, frame_type, 0); - if (drop_this_frame) { - av1_rc_postencode_update_drop_frame(cpi); - ++cm->current_video_frame; - aom_free(tile_ctxs); - aom_free(cdf_ptrs); - return; - } -#else // !CONFIG_XIPHRC av1_rc_postencode_update(cpi, *size); -#endif // CONFIG_XIPHRC - -#if 0 - output_frame_level_debug_stats(cpi); -#endif if (cm->frame_type == KEY_FRAME) { // Tell the caller that the frame was coded as a key frame @@ -5768,90 +5086,79 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, cm->lf.mode_ref_delta_update = 0; if (cm->show_frame) { -#if CONFIG_EXT_REFS -// TODO(zoeliu): We may only swamp mi and prev_mi for those frames that are -// being used as reference. -#endif // CONFIG_EXT_REFS + // TODO(zoeliu): We may only swamp mi and prev_mi for those frames that + // are + // being used as reference. swap_mi_and_prev_mi(cm); // Don't increment frame counters if this was an altref buffer // update not a real frame ++cm->current_video_frame; } -#if CONFIG_EXT_REFS // NOTE: Shall not refer to any frame not used as reference. if (cm->is_reference_frame) { -#endif // CONFIG_EXT_REFS - cm->prev_frame = cm->cur_frame; // keep track of the last coded dimensions cm->last_width = cm->width; cm->last_height = cm->height; // reset to normal state now that we are done. cm->last_show_frame = cm->show_frame; -#if CONFIG_EXT_REFS } -#endif // CONFIG_EXT_REFS - aom_free(tile_ctxs); - aom_free(cdf_ptrs); + return AOM_CODEC_OK; } -static void Pass0Encode(AV1_COMP *cpi, size_t *size, uint8_t *dest, - int skip_adapt, unsigned int *frame_flags) { -#if CONFIG_XIPHRC - int64_t ip_count; - int frame_type, is_golden, is_altref; - - /* Not updated during init so update it here */ - if (cpi->oxcf.rc_mode == AOM_Q) cpi->od_rc.quality = cpi->oxcf.cq_level; - - frame_type = od_frame_type(&cpi->od_rc, cpi->od_rc.cur_frame, &is_golden, - &is_altref, &ip_count); - - if (frame_type == OD_I_FRAME) { - frame_type = KEY_FRAME; - cpi->frame_flags &= FRAMEFLAGS_KEY; - } else if (frame_type == OD_P_FRAME) { - frame_type = INTER_FRAME; - } - - if (is_altref) { - cpi->refresh_alt_ref_frame = 1; - cpi->rc.source_alt_ref_active = 1; - } - - cpi->refresh_golden_frame = is_golden; - cpi->common.frame_type = frame_type; - if (is_golden) cpi->frame_flags &= FRAMEFLAGS_GOLDEN; -#else +static int Pass0Encode(AV1_COMP *cpi, size_t *size, uint8_t *dest, + int skip_adapt, unsigned int *frame_flags) { if (cpi->oxcf.rc_mode == AOM_CBR) { av1_rc_get_one_pass_cbr_params(cpi); } else { av1_rc_get_one_pass_vbr_params(cpi); } -#endif - encode_frame_to_data_rate(cpi, size, dest, skip_adapt, frame_flags); + if (encode_frame_to_data_rate(cpi, size, dest, skip_adapt, frame_flags) != + AOM_CODEC_OK) { + return AOM_CODEC_ERROR; + } + check_show_existing_frame(cpi); + return AOM_CODEC_OK; } -#if !CONFIG_XIPHRC -static void Pass2Encode(AV1_COMP *cpi, size_t *size, uint8_t *dest, - unsigned int *frame_flags) { - encode_frame_to_data_rate(cpi, size, dest, 0, frame_flags); +static int Pass2Encode(AV1_COMP *cpi, size_t *size, uint8_t *dest, + unsigned int *frame_flags) { +#if CONFIG_MISMATCH_DEBUG + mismatch_move_frame_idx_w(); +#endif +#if TXCOEFF_COST_TIMER + AV1_COMMON *cm = &cpi->common; + cm->txcoeff_cost_timer = 0; + cm->txcoeff_cost_count = 0; +#endif + + if (encode_frame_to_data_rate(cpi, size, dest, 0, frame_flags) != + AOM_CODEC_OK) { + return AOM_CODEC_ERROR; + } + +#if TXCOEFF_COST_TIMER + cm->cum_txcoeff_cost_timer += cm->txcoeff_cost_timer; + fprintf(stderr, + "\ntxb coeff cost block number: %ld, frame time: %ld, cum time %ld " + "in us\n", + cm->txcoeff_cost_count, cm->txcoeff_cost_timer, + cm->cum_txcoeff_cost_timer); +#endif -#if CONFIG_EXT_REFS - // Do not do post-encoding update for those frames that do not have a spot in - // a gf group, but note that an OVERLAY frame always has a spot in a gf group, + // Do not do post-encoding update for those frames that do not have a spot + // in + // a gf group, but note that an OVERLAY frame always has a spot in a gf + // group, // even when show_existing_frame is used. if (!cpi->common.show_existing_frame || cpi->rc.is_src_frame_alt_ref) { av1_twopass_postencode_update(cpi); } check_show_existing_frame(cpi); -#else - av1_twopass_postencode_update(cpi); -#endif // CONFIG_EXT_REFS + return AOM_CODEC_OK; } -#endif int av1_receive_raw_frame(AV1_COMP *cpi, aom_enc_frame_flags_t frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, @@ -5861,37 +5168,34 @@ int av1_receive_raw_frame(AV1_COMP *cpi, aom_enc_frame_flags_t frame_flags, int res = 0; const int subsampling_x = sd->subsampling_x; const int subsampling_y = sd->subsampling_y; -#if CONFIG_HIGHBITDEPTH const int use_highbitdepth = (sd->flags & YV12_FLAG_HIGHBITDEPTH) != 0; -#endif -#if CONFIG_HIGHBITDEPTH check_initial_width(cpi, use_highbitdepth, subsampling_x, subsampling_y); -#else - check_initial_width(cpi, subsampling_x, subsampling_y); -#endif // CONFIG_HIGHBITDEPTH aom_usec_timer_start(&timer); if (av1_lookahead_push(cpi->lookahead, sd, time_stamp, end_time, -#if CONFIG_HIGHBITDEPTH - use_highbitdepth, -#endif // CONFIG_HIGHBITDEPTH - frame_flags)) + use_highbitdepth, frame_flags)) res = -1; aom_usec_timer_mark(&timer); cpi->time_receive_data += aom_usec_timer_elapsed(&timer); - if ((cm->profile == PROFILE_0 || cm->profile == PROFILE_2) && + if ((cm->profile == PROFILE_0) && !cm->seq_params.monochrome && (subsampling_x != 1 || subsampling_y != 1)) { aom_internal_error(&cm->error, AOM_CODEC_INVALID_PARAM, - "Non-4:2:0 color format requires profile 1 or 3"); + "Non-4:2:0 color format requires profile 1 or 2"); res = -1; } - if ((cm->profile == PROFILE_1 || cm->profile == PROFILE_3) && - (subsampling_x == 1 && subsampling_y == 1)) { + if ((cm->profile == PROFILE_1) && + !(subsampling_x == 0 && subsampling_y == 0)) { aom_internal_error(&cm->error, AOM_CODEC_INVALID_PARAM, - "4:2:0 color format requires profile 0 or 2"); + "Profile 1 requires 4:4:4 color format"); + res = -1; + } + if ((cm->profile == PROFILE_2) && (cm->bit_depth <= AOM_BITS_10) && + !(subsampling_x == 1 && subsampling_y == 0)) { + aom_internal_error(&cm->error, AOM_CODEC_INVALID_PARAM, + "Profile 2 bit-depth < 10 requires 4:2:2 color format"); res = -1; } @@ -5902,13 +5206,10 @@ static int frame_is_reference(const AV1_COMP *cpi) { const AV1_COMMON *cm = &cpi->common; return cm->frame_type == KEY_FRAME || cpi->refresh_last_frame || - cpi->refresh_golden_frame || -#if CONFIG_EXT_REFS - cpi->refresh_bwd_ref_frame || cpi->refresh_alt2_ref_frame || -#endif // CONFIG_EXT_REFS - cpi->refresh_alt_ref_frame || !cm->error_resilient_mode || - cm->lf.mode_ref_delta_update || cm->seg.update_map || - cm->seg.update_data; + cpi->refresh_golden_frame || cpi->refresh_bwd_ref_frame || + cpi->refresh_alt2_ref_frame || cpi->refresh_alt_ref_frame || + !cm->error_resilient_mode || cm->lf.mode_ref_delta_update || + cm->seg.update_map || cm->seg.update_data; } static void adjust_frame_rate(AV1_COMP *cpi, @@ -5968,7 +5269,6 @@ static int get_arf_src_index(AV1_COMP *cpi) { return arf_src_index; } -#if CONFIG_EXT_REFS static int get_brf_src_index(AV1_COMP *cpi) { int brf_src_index = 0; const GF_GROUP *const gf_group = &cpi->twopass.gf_group; @@ -6002,7 +5302,6 @@ static int get_arf2_src_index(AV1_COMP *cpi) { } return arf2_src_index; } -#endif // CONFIG_EXT_REFS static void check_src_altref(AV1_COMP *cpi, const struct lookahead_entry *source) { @@ -6014,14 +5313,10 @@ static void check_src_altref(AV1_COMP *cpi, if (cpi->oxcf.pass == 2) { const GF_GROUP *const gf_group = &cpi->twopass.gf_group; rc->is_src_frame_alt_ref = -#if CONFIG_EXT_REFS (gf_group->update_type[gf_group->index] == INTNL_OVERLAY_UPDATE) || -#endif // CONFIG_EXT_REFS (gf_group->update_type[gf_group->index] == OVERLAY_UPDATE); -#if CONFIG_EXT_REFS rc->is_src_frame_ext_arf = gf_group->update_type[gf_group->index] == INTNL_OVERLAY_UPDATE; -#endif // CONFIG_EXT_REFS } else { rc->is_src_frame_alt_ref = cpi->alt_ref_source && (source == cpi->alt_ref_source); @@ -6031,20 +5326,16 @@ static void check_src_altref(AV1_COMP *cpi, // Current frame is an ARF overlay frame. cpi->alt_ref_source = NULL; -#if CONFIG_EXT_REFS if (rc->is_src_frame_ext_arf && !cpi->common.show_existing_frame) { // For INTNL_OVERLAY, when show_existing_frame == 0, they do need to // refresh the LAST_FRAME, i.e. LAST3 gets retired, LAST2 becomes LAST3, // LAST becomes LAST2, and INTNL_OVERLAY becomes LAST. cpi->refresh_last_frame = 1; } else { -#endif // CONFIG_EXT_REFS // Don't refresh the last buffer for an ARF overlay frame. It will // become the GF so preserve last as an alternative prediction option. cpi->refresh_last_frame = 0; -#if CONFIG_EXT_REFS } -#endif // CONFIG_EXT_REFS } } @@ -6055,10 +5346,10 @@ extern double av1_get_blockiness(const unsigned char *img1, int img1_pitch, static void adjust_image_stat(double y, double u, double v, double all, ImageStat *s) { - s->stat[Y] += y; - s->stat[U] += u; - s->stat[V] += v; - s->stat[ALL] += all; + s->stat[STAT_Y] += y; + s->stat[STAT_U] += u; + s->stat[STAT_V] += v; + s->stat[STAT_ALL] += all; s->worst = AOMMIN(s->worst, all); } @@ -6073,12 +5364,10 @@ static void compute_internal_stats(AV1_COMP *cpi, int frame_bytes) { #endif cpi->bytes += frame_bytes; -#if CONFIG_HIGHBITDEPTH if (cm->use_highbitdepth) { in_bit_depth = cpi->oxcf.input_bit_depth; bit_depth = cm->bit_depth; } -#endif if (cm->show_frame) { const YV12_BUFFER_CONFIG *orig = cpi->source; const YV12_BUFFER_CONFIG *recon = cpi->common.frame_to_show; @@ -6089,28 +5378,20 @@ static void compute_internal_stats(AV1_COMP *cpi, int frame_bytes) { PSNR_STATS psnr; double frame_ssim2 = 0.0, weight = 0.0; aom_clear_system_state(); -// TODO(yaowu): unify these two versions into one. -#if CONFIG_HIGHBITDEPTH + // TODO(yaowu): unify these two versions into one. aom_calc_highbd_psnr(orig, recon, &psnr, bit_depth, in_bit_depth); -#else - aom_calc_psnr(orig, recon, &psnr); -#endif // CONFIG_HIGHBITDEPTH adjust_image_stat(psnr.psnr[1], psnr.psnr[2], psnr.psnr[3], psnr.psnr[0], &cpi->psnr); cpi->total_sq_error += psnr.sse[0]; cpi->total_samples += psnr.samples[0]; samples = psnr.samples[0]; -// TODO(yaowu): unify these two versions into one. -#if CONFIG_HIGHBITDEPTH + // TODO(yaowu): unify these two versions into one. if (cm->use_highbitdepth) frame_ssim2 = aom_highbd_calc_ssim(orig, recon, &weight, bit_depth, in_bit_depth); else frame_ssim2 = aom_calc_ssim(orig, recon, &weight); -#else - frame_ssim2 = aom_calc_ssim(orig, recon, &weight); -#endif // CONFIG_HIGHBITDEPTH cpi->worst_ssim = AOMMIN(cpi->worst_ssim, frame_ssim2); cpi->summed_quality += frame_ssim2 * weight; @@ -6119,18 +5400,19 @@ static void compute_internal_stats(AV1_COMP *cpi, int frame_bytes) { #if 0 { FILE *f = fopen("q_used.stt", "a"); + double y2 = psnr.psnr[1]; + double u2 = psnr.psnr[2]; + double v2 = psnr.psnr[3]; + double frame_psnr2 = psnr.psnr[0]; fprintf(f, "%5d : Y%f7.3:U%f7.3:V%f7.3:F%f7.3:S%7.3f\n", - cpi->common.current_video_frame, y2, u2, v2, + cm->current_video_frame, y2, u2, v2, frame_psnr2, frame_ssim2); fclose(f); } #endif } if (cpi->b_calculate_blockiness) { -#if CONFIG_HIGHBITDEPTH - if (!cm->use_highbitdepth) -#endif - { + if (!cm->use_highbitdepth) { const double frame_blockiness = av1_get_blockiness(orig->y_buffer, orig->y_stride, recon->y_buffer, recon->y_stride, orig->y_width, orig->y_height); @@ -6139,10 +5421,7 @@ static void compute_internal_stats(AV1_COMP *cpi, int frame_bytes) { } if (cpi->b_calculate_consistency) { -#if CONFIG_HIGHBITDEPTH - if (!cm->use_highbitdepth) -#endif - { + if (!cm->use_highbitdepth) { const double this_inconsistency = aom_get_ssim_metrics( orig->y_buffer, orig->y_stride, recon->y_buffer, recon->y_stride, orig->y_width, orig->y_height, cpi->ssim_vars, &cpi->metrics, 1); @@ -6167,7 +5446,6 @@ static void compute_internal_stats(AV1_COMP *cpi, int frame_bytes) { } #endif // CONFIG_INTERNAL_STATS -#if CONFIG_AMVR static int is_integer_mv(AV1_COMP *cpi, const YV12_BUFFER_CONFIG *cur_picture, const YV12_BUFFER_CONFIG *last_picture, hash_table *last_hash_table) { @@ -6203,14 +5481,28 @@ static int is_integer_mv(AV1_COMP *cpi, const YV12_BUFFER_CONFIG *cur_picture, p_cur += (y_pos * stride_cur + x_pos); p_ref += (y_pos * stride_ref + x_pos); - for (int tmpY = 0; tmpY < block_size && match; tmpY++) { - for (int tmpX = 0; tmpX < block_size && match; tmpX++) { - if (p_cur[tmpX] != p_ref[tmpX]) { - match = 0; + if (cur_picture->flags & YV12_FLAG_HIGHBITDEPTH) { + uint16_t *p16_cur = CONVERT_TO_SHORTPTR(p_cur); + uint16_t *p16_ref = CONVERT_TO_SHORTPTR(p_ref); + for (int tmpY = 0; tmpY < block_size && match; tmpY++) { + for (int tmpX = 0; tmpX < block_size && match; tmpX++) { + if (p16_cur[tmpX] != p16_ref[tmpX]) { + match = 0; + } } + p16_cur += stride_cur; + p16_ref += stride_ref; + } + } else { + for (int tmpY = 0; tmpY < block_size && match; tmpY++) { + for (int tmpX = 0; tmpX < block_size && match; tmpX++) { + if (p_cur[tmpX] != p_ref[tmpX]) { + match = 0; + } + } + p_cur += stride_cur; + p_ref += stride_ref; } - p_cur += stride_cur; - p_ref += stride_ref; } if (match) { @@ -6227,10 +5519,14 @@ static int is_integer_mv(AV1_COMP *cpi, const YV12_BUFFER_CONFIG *cur_picture, av1_get_block_hash_value( cur_picture->y_buffer + y_pos * stride_cur + x_pos, stride_cur, - block_size, &hash_value_1, &hash_value_2); - - if (av1_has_exact_match(last_hash_table, hash_value_1, hash_value_2)) { - M++; + block_size, &hash_value_1, &hash_value_2, + (cur_picture->flags & YV12_FLAG_HIGHBITDEPTH)); + // Hashing does not work for highbitdepth currently. + // TODO(Roger): Make it work for highbitdepth. + if (av1_use_hash_me(&cpi->common)) { + if (av1_has_exact_match(last_hash_table, hash_value_1, hash_value_2)) { + M++; + } } } } @@ -6282,13 +5578,14 @@ static int is_integer_mv(AV1_COMP *cpi, const YV12_BUFFER_CONFIG *cur_picture, return 0; } -#endif int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, size_t *size, uint8_t *dest, int64_t *time_stamp, - int64_t *time_end, int flush) { + int64_t *time_end, int flush, + const aom_rational_t *timebase) { const AV1EncoderConfig *const oxcf = &cpi->oxcf; AV1_COMMON *const cm = &cpi->common; + const int num_planes = av1_num_planes(cm); BufferPool *const pool = cm->buffer_pool; RATE_CONTROL *const rc = &cpi->rc; struct aom_usec_timer cmptimer; @@ -6296,15 +5593,9 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, struct lookahead_entry *last_source = NULL; struct lookahead_entry *source = NULL; int arf_src_index; -#if CONFIG_EXT_REFS int brf_src_index; -#endif // CONFIG_EXT_REFS int i; -#if CONFIG_XIPHRC - cpi->od_rc.end_of_input = flush; -#endif - #if CONFIG_BITSTREAM_DEBUG assert(cpi->oxcf.max_threads == 0 && "bitstream debug tool does not support multithreading"); @@ -6312,13 +5603,10 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, bitstream_queue_set_frame_write(cm->current_video_frame * 2 + cm->show_frame); #endif + cm->showable_frame = 0; aom_usec_timer_start(&cmptimer); -#if CONFIG_AMVR set_high_precision_mv(cpi, ALTREF_HIGH_PRECISION_MV, 0); -#else - set_high_precision_mv(cpi, ALTREF_HIGH_PRECISION_MV); -#endif // Is multi-arf enabled. // Note that at the moment multi_arf is only configured for 2 pass VBR @@ -6327,24 +5615,36 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, else cpi->multi_arf_allowed = 0; -// Normal defaults -#if !CONFIG_NO_FRAME_CONTEXT_SIGNALING - cm->reset_frame_context = RESET_FRAME_CONTEXT_NONE; -#endif - cm->refresh_frame_context = - (oxcf->error_resilient_mode || oxcf->frame_parallel_decoding_mode) - ? REFRESH_FRAME_CONTEXT_FORWARD - : REFRESH_FRAME_CONTEXT_BACKWARD; + // Normal defaults + cm->refresh_frame_context = oxcf->frame_parallel_decoding_mode + ? REFRESH_FRAME_CONTEXT_DISABLED + : REFRESH_FRAME_CONTEXT_BACKWARD; + if (oxcf->large_scale_tile) + cm->refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED; cpi->refresh_last_frame = 1; cpi->refresh_golden_frame = 0; -#if CONFIG_EXT_REFS cpi->refresh_bwd_ref_frame = 0; cpi->refresh_alt2_ref_frame = 0; -#endif // CONFIG_EXT_REFS cpi->refresh_alt_ref_frame = 0; -#if CONFIG_EXT_REFS && !CONFIG_XIPHRC + // TODO(zoeliu@gmail.com): To support forward-KEY_FRAME and set up the + // following flag accordingly. + cm->reset_decoder_state = 0; + + // Don't allow a show_existing_frame to coincide with an error resilient or + // S-Frame + struct lookahead_entry *lookahead_src = NULL; + if (cm->current_video_frame > 0) + lookahead_src = av1_lookahead_peek(cpi->lookahead, 0); + if (lookahead_src != NULL && + ((cpi->oxcf.error_resilient_mode | + ((lookahead_src->flags & AOM_EFLAG_ERROR_RESILIENT) != 0)) || + (cpi->oxcf.s_frame_mode | + ((lookahead_src->flags & AOM_EFLAG_SET_S_FRAME) != 0)))) { + cm->show_existing_frame = 0; + } + if (oxcf->pass == 2 && cm->show_existing_frame) { // Manage the source buffer and flush out the source frame that has been // coded already; Also get prepared for PSNR calculation if needed. @@ -6352,6 +5652,7 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, *size = 0; return -1; } + av1_apply_encoding_flags(cpi, source->flags); cpi->source = &source->img; // TODO(zoeliu): To track down to determine whether it's needed to adjust // the frame rate. @@ -6361,7 +5662,8 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, // We need to adjust frame rate for an overlay frame if (cpi->rc.is_src_frame_alt_ref) adjust_frame_rate(cpi, source); - // Find a free buffer for the new frame, releasing the reference previously + // Find a free buffer for the new frame, releasing the reference + // previously // held. if (cm->new_fb_idx != INVALID_IDX) { --pool->frame_bufs[cm->new_fb_idx].ref_count; @@ -6379,7 +5681,8 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, // We need to update the gf_group for show_existing overlay frame if (cpi->rc.is_src_frame_alt_ref) av1_rc_get_second_pass_params(cpi); - Pass2Encode(cpi, size, dest, frame_flags); + if (Pass2Encode(cpi, size, dest, frame_flags) != AOM_CODEC_OK) + return AOM_CODEC_ERROR; if (cpi->b_calculate_psnr) generate_psnr_packet(cpi); @@ -6393,7 +5696,6 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, cm->show_existing_frame = 0; return 0; } -#endif // CONFIG_EXT_REFS && !CONFIG_XIPHRC // Should we encode an arf frame. arf_src_index = get_arf_src_index(cpi); @@ -6415,21 +5717,13 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, assert(arf_src_index <= rc->frames_to_key); if ((source = av1_lookahead_peek(cpi->lookahead, arf_src_index)) != NULL) { + cm->showable_frame = 1; cpi->alt_ref_source = source; if (oxcf->arnr_max_frames > 0) { -// Produce the filtered ARF frame. -#if CONFIG_BGSPRITE - int bgsprite_ret = av1_background_sprite(cpi, arf_src_index); - // Do temporal filter if bgsprite not generated. - if (bgsprite_ret != 0) -#endif // CONFIG_BGSPRITE - av1_temporal_filter(cpi, -#if CONFIG_BGSPRITE - NULL, &cpi->alt_ref_buffer, -#endif // CONFIG_BGSPRITE - arf_src_index); - aom_extend_frame_borders(&cpi->alt_ref_buffer); + // Produce the filtered ARF frame. + av1_temporal_filter(cpi, arf_src_index); + aom_extend_frame_borders(&cpi->alt_ref_buffer, num_planes); force_src_buffer = &cpi->alt_ref_buffer; } @@ -6438,16 +5732,13 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, cpi->refresh_alt_ref_frame = 1; cpi->refresh_last_frame = 0; cpi->refresh_golden_frame = 0; -#if CONFIG_EXT_REFS cpi->refresh_bwd_ref_frame = 0; cpi->refresh_alt2_ref_frame = 0; -#endif // CONFIG_EXT_REFS rc->is_src_frame_alt_ref = 0; } rc->source_alt_ref_pending = 0; } -#if CONFIG_EXT_REFS // Should we encode an arf2 frame. arf_src_index = get_arf2_src_index(cpi); if (arf_src_index) { @@ -6468,16 +5759,13 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, assert(arf_src_index <= rc->frames_to_key); if ((source = av1_lookahead_peek(cpi->lookahead, arf_src_index)) != NULL) { + cm->showable_frame = 1; cpi->alt_ref_source = source; if (oxcf->arnr_max_frames > 0) { // Produce the filtered ARF frame. - av1_temporal_filter(cpi, -#if CONFIG_BGSPRITE - NULL, NULL, -#endif // CONFIG_BGSPRITE - arf_src_index); - aom_extend_frame_borders(&cpi->alt_ref_buffer); + av1_temporal_filter(cpi, arf_src_index); + aom_extend_frame_borders(&cpi->alt_ref_buffer, num_planes); force_src_buffer = &cpi->alt_ref_buffer; } @@ -6499,6 +5787,7 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, if (brf_src_index) { assert(brf_src_index <= rc->frames_to_key); if ((source = av1_lookahead_peek(cpi->lookahead, brf_src_index)) != NULL) { + cm->showable_frame = 1; cm->show_frame = 0; cm->intra_only = 0; @@ -6511,7 +5800,6 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, rc->is_bwd_ref_frame = 1; } } -#endif // CONFIG_EXT_REFS if (!source) { // Get last frame source. @@ -6538,16 +5826,13 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, *time_stamp = source->ts_start; *time_end = source->ts_end; + av1_apply_encoding_flags(cpi, source->flags); *frame_flags = (source->flags & AOM_EFLAG_FORCE_KF) ? FRAMEFLAGS_KEY : 0; } else { *size = 0; if (flush && oxcf->pass == 1 && !cpi->twopass.first_pass_done) { -#if CONFIG_XIPHRC - od_enc_rc_2pass_out(&cpi->od_rc, cpi->output_pkt_list, 1); -#else av1_end_first_pass(cpi); /* get last stats packet */ -#endif cpi->twopass.first_pass_done = 1; } return -1; @@ -6573,20 +5858,23 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, if (cm->new_fb_idx == INVALID_IDX) return -1; + // Retain the RF_LEVEL for the current newly coded frame. + cpi->frame_rf_level[cm->new_fb_idx] = + cpi->twopass.gf_group.rf_level[cpi->twopass.gf_group.index]; + cm->cur_frame = &pool->frame_bufs[cm->new_fb_idx]; -#if CONFIG_HIGHBITDEPTH && CONFIG_GLOBAL_MOTION cm->cur_frame->buf.buf_8bit_valid = 0; -#endif -#if !CONFIG_EXT_REFS - if (cpi->multi_arf_allowed) { - if (cm->frame_type == KEY_FRAME) { - init_buffer_indices(cpi); - } else if (oxcf->pass == 2) { - const GF_GROUP *const gf_group = &cpi->twopass.gf_group; - cpi->alt_fb_idx = gf_group->arf_ref_idx[gf_group->index]; - } + + if (cm->film_grain_table) { + cm->film_grain_params_present = aom_film_grain_table_lookup( + cm->film_grain_table, *time_stamp, *time_end, 0 /* erase */, + &cm->film_grain_params); } -#endif // !CONFIG_EXT_REFS + cm->cur_frame->film_grain_params_present = cm->film_grain_params_present; + + // only one operating point supported now + cpi->common.tu_presentation_delay = + ticks_to_timebase_units(timebase, *time_stamp); // Start with a 0 size frame. *size = 0; @@ -6594,87 +5882,62 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, cpi->frame_flags = *frame_flags; if (oxcf->pass == 2) { -#if CONFIG_XIPHRC - if (od_enc_rc_2pass_in(&cpi->od_rc) < 0) return -1; - } -#else av1_rc_get_second_pass_params(cpi); } else if (oxcf->pass == 1) { setup_frame_size(cpi); } -#endif if (cpi->oxcf.pass != 0 || frame_is_intra_only(cm) == 1) { - for (i = 0; i < TOTAL_REFS_PER_FRAME; ++i) - cpi->scaled_ref_idx[i] = INVALID_IDX; + for (i = 0; i < REF_FRAMES; ++i) cpi->scaled_ref_idx[i] = INVALID_IDX; } -#if CONFIG_AOM_QM cm->using_qmatrix = cpi->oxcf.using_qm; cm->min_qmlevel = cpi->oxcf.qm_minlevel; cm->max_qmlevel = cpi->oxcf.qm_maxlevel; -#endif -#if CONFIG_REFERENCE_BUFFER if (cm->seq_params.frame_id_numbers_present_flag) { if (*time_stamp == 0) { cpi->common.current_frame_id = -1; } } -#endif // CONFIG_REFERENCE_BUFFER -#if CONFIG_AMVR + cpi->cur_poc++; - if (oxcf->pass != 1 && cpi->common.allow_screen_content_tools) { - if (cpi->common.seq_mv_precision_level == 2) { + if (oxcf->pass != 1 && cpi->common.allow_screen_content_tools && + !frame_is_intra_only(cm)) { + if (cpi->common.seq_params.force_integer_mv == 2) { struct lookahead_entry *previous_entry = - cpi->lookahead->buf + cpi->previsous_index; - cpi->common.cur_frame_mv_precision_level = is_integer_mv( - cpi, cpi->source, &previous_entry->img, cpi->previsou_hash_table); + av1_lookahead_peek(cpi->lookahead, cpi->previous_index); + if (!previous_entry) + cpi->common.cur_frame_force_integer_mv = 0; + else + cpi->common.cur_frame_force_integer_mv = is_integer_mv( + cpi, cpi->source, &previous_entry->img, cpi->previous_hash_table); } else { - cpi->common.cur_frame_mv_precision_level = - cpi->common.seq_mv_precision_level; + cpi->common.cur_frame_force_integer_mv = + cpi->common.seq_params.force_integer_mv; } } else { - cpi->common.cur_frame_mv_precision_level = 0; + cpi->common.cur_frame_force_integer_mv = 0; } -#endif -#if CONFIG_XIPHRC - if (oxcf->pass == 1) { - size_t tmp; - if (cpi->od_rc.cur_frame == 0) Pass0Encode(cpi, &tmp, dest, 1, frame_flags); - cpi->od_rc.firstpass_quant = cpi->od_rc.target_quantizer; - Pass0Encode(cpi, &tmp, dest, 0, frame_flags); - od_enc_rc_2pass_out(&cpi->od_rc, cpi->output_pkt_list, 0); - } else if (oxcf->pass == 2) { - Pass0Encode(cpi, size, dest, 0, frame_flags); - } else { - if (cpi->od_rc.cur_frame == 0) { - size_t tmp; - Pass0Encode(cpi, &tmp, dest, 1, frame_flags); - } - Pass0Encode(cpi, size, dest, 0, frame_flags); - } -#else if (oxcf->pass == 1) { cpi->td.mb.e_mbd.lossless[0] = is_lossless_requested(oxcf); av1_first_pass(cpi, source); } else if (oxcf->pass == 2) { - Pass2Encode(cpi, size, dest, frame_flags); + if (Pass2Encode(cpi, size, dest, frame_flags) != AOM_CODEC_OK) + return AOM_CODEC_ERROR; } else { // One pass encode - Pass0Encode(cpi, size, dest, 0, frame_flags); + if (Pass0Encode(cpi, size, dest, 0, frame_flags) != AOM_CODEC_OK) + return AOM_CODEC_ERROR; } -#endif -#if CONFIG_HASH_ME if (oxcf->pass != 1 && cpi->common.allow_screen_content_tools) { -#if CONFIG_AMVR - cpi->previsou_hash_table = &cm->cur_frame->hash_table; + cpi->previous_hash_table = &cm->cur_frame->hash_table; { int l; for (l = -MAX_PRE_FRAMES; l < cpi->lookahead->max_sz; l++) { if ((cpi->lookahead->buf + l) == source) { - cpi->previsous_index = l; + cpi->previous_index = l; break; } } @@ -6684,17 +5947,26 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, "Failed to find last frame original buffer"); } } -#endif } -#endif + if (!cm->large_scale_tile) { + cm->frame_contexts[cm->new_fb_idx] = *cm->fc; + } -#if CONFIG_NO_FRAME_CONTEXT_SIGNALING - cm->frame_contexts[cm->new_fb_idx] = *cm->fc; -#else - if (!cm->error_resilient_mode) - cm->frame_contexts[cm->frame_context_idx] = *cm->fc; -#endif // CONFIG_NO_FRAME_CONTEXT_SIGNALING +#define EXT_TILE_DEBUG 0 +#if EXT_TILE_DEBUG + if (cm->large_scale_tile && oxcf->pass == 2) { + char fn[20] = "./fc"; + fn[4] = cm->current_video_frame / 100 + '0'; + fn[5] = (cm->current_video_frame % 100) / 10 + '0'; + fn[6] = (cm->current_video_frame % 10) + '0'; + fn[7] = '\0'; + av1_print_frame_contexts(cm->fc, fn); + } +#endif // EXT_TILE_DEBUG +#undef EXT_TILE_DEBUG + + cm->showable_frame = !cm->show_frame && cm->showable_frame; // No frame encoded, or frame was dropped, release scaled references. if ((*size == 0) && (frame_is_intra_only(cm) == 0)) { @@ -6717,10 +5989,6 @@ int av1_get_compressed_data(AV1_COMP *cpi, unsigned int *frame_flags, } #endif // CONFIG_INTERNAL_STATS -#if CONFIG_XIPHRC - cpi->od_rc.cur_frame++; -#endif - aom_clear_system_state(); return 0; @@ -6755,6 +6023,29 @@ int av1_get_last_show_frame(AV1_COMP *cpi, YV12_BUFFER_CONFIG *frame) { return 0; } +static int equal_dimensions_and_border(const YV12_BUFFER_CONFIG *a, + const YV12_BUFFER_CONFIG *b) { + return a->y_height == b->y_height && a->y_width == b->y_width && + a->uv_height == b->uv_height && a->uv_width == b->uv_width && + a->y_stride == b->y_stride && a->uv_stride == b->uv_stride && + a->border == b->border && + (a->flags & YV12_FLAG_HIGHBITDEPTH) == + (b->flags & YV12_FLAG_HIGHBITDEPTH); +} + +aom_codec_err_t av1_copy_new_frame_enc(AV1_COMMON *cm, + YV12_BUFFER_CONFIG *new_frame, + YV12_BUFFER_CONFIG *sd) { + const int num_planes = av1_num_planes(cm); + if (!equal_dimensions_and_border(new_frame, sd)) + aom_internal_error(&cm->error, AOM_CODEC_ERROR, + "Incorrect buffer dimensions"); + else + aom_yv12_copy_frame(new_frame, sd, num_planes); + + return cm->error.error_code; +} + int av1_set_internal_size(AV1_COMP *cpi, AOM_SCALING horiz_mode, AOM_SCALING vert_mode) { int hr = 0, hs = 0, vr = 0, vs = 0; @@ -6773,47 +6064,134 @@ int av1_set_internal_size(AV1_COMP *cpi, AOM_SCALING horiz_mode, int av1_get_quantizer(AV1_COMP *cpi) { return cpi->common.base_qindex; } +int av1_convert_sect5obus_to_annexb(uint8_t *buffer, size_t *frame_size) { + size_t output_size = 0; + size_t total_bytes_read = 0; + size_t remaining_size = *frame_size; + uint8_t *buff_ptr = buffer; + + // go through each OBUs + while (total_bytes_read < *frame_size) { + uint8_t saved_obu_header[2]; + uint64_t obu_payload_size; + size_t length_of_payload_size; + size_t length_of_obu_size; + uint32_t obu_header_size = (buff_ptr[0] >> 2) & 0x1 ? 2 : 1; + size_t obu_bytes_read = obu_header_size; // bytes read for current obu + + // save the obu header (1 or 2 bytes) + memmove(saved_obu_header, buff_ptr, obu_header_size); + // clear the obu_has_size_field + saved_obu_header[0] = saved_obu_header[0] & (~0x2); + + // get the payload_size and length of payload_size + if (aom_uleb_decode(buff_ptr + obu_header_size, remaining_size, + &obu_payload_size, &length_of_payload_size) != 0) { + return AOM_CODEC_ERROR; + } + obu_bytes_read += length_of_payload_size; + + // calculate the length of size of the obu header plus payload + length_of_obu_size = + aom_uleb_size_in_bytes((uint64_t)(obu_header_size + obu_payload_size)); + + // move the rest of data to new location + memmove(buff_ptr + length_of_obu_size + obu_header_size, + buff_ptr + obu_bytes_read, remaining_size - obu_bytes_read); + obu_bytes_read += (size_t)obu_payload_size; + + // write the new obu size + const uint64_t obu_size = obu_header_size + obu_payload_size; + size_t coded_obu_size; + if (aom_uleb_encode(obu_size, sizeof(obu_size), buff_ptr, + &coded_obu_size) != 0) { + return AOM_CODEC_ERROR; + } + + // write the saved (modified) obu_header following obu size + memmove(buff_ptr + length_of_obu_size, saved_obu_header, obu_header_size); + + total_bytes_read += obu_bytes_read; + remaining_size -= obu_bytes_read; + buff_ptr += length_of_obu_size + obu_size; + output_size += length_of_obu_size + (size_t)obu_size; + } + + *frame_size = output_size; + return AOM_CODEC_OK; +} + void av1_apply_encoding_flags(AV1_COMP *cpi, aom_enc_frame_flags_t flags) { + // TODO(yunqingwang): For what references to use, external encoding flags + // should be consistent with internal reference frame selection. Need to + // ensure that there is not conflict between the two. In AV1 encoder, the + // priority rank for 7 reference frames are: LAST, ALTREF, LAST2, LAST3, + // GOLDEN, BWDREF, ALTREF2. If only one reference frame is used, it must be + // LAST. + cpi->ext_ref_frame_flags = AOM_REFFRAME_ALL; if (flags & - (AOM_EFLAG_NO_REF_LAST | AOM_EFLAG_NO_REF_GF | AOM_EFLAG_NO_REF_ARF)) { - int ref = AOM_REFFRAME_ALL; - + (AOM_EFLAG_NO_REF_LAST | AOM_EFLAG_NO_REF_LAST2 | AOM_EFLAG_NO_REF_LAST3 | + AOM_EFLAG_NO_REF_GF | AOM_EFLAG_NO_REF_ARF | AOM_EFLAG_NO_REF_BWD | + AOM_EFLAG_NO_REF_ARF2)) { if (flags & AOM_EFLAG_NO_REF_LAST) { - ref ^= AOM_LAST_FLAG; -#if CONFIG_EXT_REFS - ref ^= AOM_LAST2_FLAG; - ref ^= AOM_LAST3_FLAG; -#endif // CONFIG_EXT_REFS - } + cpi->ext_ref_frame_flags = 0; + } else { + int ref = AOM_REFFRAME_ALL; - if (flags & AOM_EFLAG_NO_REF_GF) ref ^= AOM_GOLD_FLAG; + if (flags & AOM_EFLAG_NO_REF_LAST2) ref ^= AOM_LAST2_FLAG; + if (flags & AOM_EFLAG_NO_REF_LAST3) ref ^= AOM_LAST3_FLAG; - if (flags & AOM_EFLAG_NO_REF_ARF) ref ^= AOM_ALT_FLAG; + if (flags & AOM_EFLAG_NO_REF_GF) ref ^= AOM_GOLD_FLAG; - av1_use_as_reference(cpi, ref); + if (flags & AOM_EFLAG_NO_REF_ARF) { + ref ^= AOM_ALT_FLAG; + ref ^= AOM_BWD_FLAG; + ref ^= AOM_ALT2_FLAG; + } else { + if (flags & AOM_EFLAG_NO_REF_BWD) ref ^= AOM_BWD_FLAG; + if (flags & AOM_EFLAG_NO_REF_ARF2) ref ^= AOM_ALT2_FLAG; + } + + av1_use_as_reference(cpi, ref); + } } if (flags & - (AOM_EFLAG_NO_UPD_LAST | AOM_EFLAG_NO_UPD_GF | AOM_EFLAG_NO_UPD_ARF | - AOM_EFLAG_FORCE_GF | AOM_EFLAG_FORCE_ARF)) { + (AOM_EFLAG_NO_UPD_LAST | AOM_EFLAG_NO_UPD_GF | AOM_EFLAG_NO_UPD_ARF)) { int upd = AOM_REFFRAME_ALL; - if (flags & AOM_EFLAG_NO_UPD_LAST) { - upd ^= AOM_LAST_FLAG; -#if CONFIG_EXT_REFS - upd ^= AOM_LAST2_FLAG; - upd ^= AOM_LAST3_FLAG; -#endif // CONFIG_EXT_REFS - } + // Refreshing LAST/LAST2/LAST3 is handled by 1 common flag. + if (flags & AOM_EFLAG_NO_UPD_LAST) upd ^= AOM_LAST_FLAG; if (flags & AOM_EFLAG_NO_UPD_GF) upd ^= AOM_GOLD_FLAG; - if (flags & AOM_EFLAG_NO_UPD_ARF) upd ^= AOM_ALT_FLAG; + if (flags & AOM_EFLAG_NO_UPD_ARF) { + upd ^= AOM_ALT_FLAG; + upd ^= AOM_BWD_FLAG; + upd ^= AOM_ALT2_FLAG; + } av1_update_reference(cpi, upd); } + cpi->ext_use_ref_frame_mvs = cpi->oxcf.allow_ref_frame_mvs & + ((flags & AOM_EFLAG_NO_REF_FRAME_MVS) == 0); + cpi->ext_use_error_resilient = cpi->oxcf.error_resilient_mode | + ((flags & AOM_EFLAG_ERROR_RESILIENT) != 0); + cpi->ext_use_s_frame = + cpi->oxcf.s_frame_mode | ((flags & AOM_EFLAG_SET_S_FRAME) != 0); + cpi->ext_use_primary_ref_none = (flags & AOM_EFLAG_SET_PRIMARY_REF_NONE) != 0; + if (flags & AOM_EFLAG_NO_UPD_ENTROPY) { av1_update_entropy(cpi, 0); } } + +int64_t timebase_units_to_ticks(const aom_rational_t *timebase, int64_t n) { + return n * TICKS_PER_SEC * timebase->num / timebase->den; +} + +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; +} |