diff options
author | Paul Wilkins <paulwilkins@google.com> | 2018-09-17 15:45:57 +0100 |
---|---|---|
committer | Paul Wilkins <paulwilkins@google.com> | 2018-09-17 15:55:31 +0100 |
commit | 2945e9ebfaa1387413f61d6bdbbf2d689f4e2a10 (patch) | |
tree | 1abecf43e4d6c3515824072c02753451af9bdead /vp9 | |
parent | f0f2ba17d2b6ecef339634d4d8e245e3ab793242 (diff) | |
download | libvpx-2945e9ebfaa1387413f61d6bdbbf2d689f4e2a10.tar libvpx-2945e9ebfaa1387413f61d6bdbbf2d689f4e2a10.tar.gz libvpx-2945e9ebfaa1387413f61d6bdbbf2d689f4e2a10.tar.bz2 libvpx-2945e9ebfaa1387413f61d6bdbbf2d689f4e2a10.zip |
Remove multi_arf_last_grp_enabled flag.
Delete flag and associated code.
Change-Id: I899d258a4cd7b84de9136ccfa27cf8a50108b130
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_encoder.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_encoder.h | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_firstpass.c | 8 |
3 files changed, 1 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index aebb62525..2de85e735 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2196,8 +2196,6 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf, #endif cpi->refresh_alt_ref_frame = 0; - cpi->multi_arf_last_grp_enabled = 0; - cpi->b_calculate_psnr = CONFIG_INTERNAL_STATS; init_level_info(&cpi->level_info); diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index ab39b44ff..a25718730 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -689,8 +689,6 @@ typedef struct VP9_COMP { // Indices are: max_tx_size-1, tx_size_ctx, tx_size int tx_size_cost[TX_SIZES - 1][TX_SIZE_CONTEXTS][TX_SIZES]; - int multi_arf_last_grp_enabled; - #if CONFIG_VP9_TEMPORAL_DENOISING VP9_DENOISER denoiser; #endif diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index ba40182a2..802018482 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2215,9 +2215,7 @@ static int define_gf_group_structure(VP9_COMP *cpi) { (unsigned char)(rc->baseline_gf_interval - 1); gf_group->arf_update_idx[frame_index] = arf_buffer_indices[0]; - gf_group->arf_ref_idx[frame_index] = - arf_buffer_indices[cpi->multi_arf_last_grp_enabled && - rc->source_alt_ref_active]; + gf_group->arf_ref_idx[frame_index] = arf_buffer_indices[0]; ++frame_index; } @@ -2268,9 +2266,6 @@ static int define_gf_group_structure(VP9_COMP *cpi) { gf_group->rf_level[frame_index] = GF_ARF_STD; } - // Note whether multi-arf was enabled this group for next time. - cpi->multi_arf_last_grp_enabled = 0; - return frame_index; } @@ -2916,7 +2911,6 @@ static void find_next_key_frame(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { // Clear the alt ref active flag and last group multi arf flags as they // can never be set for a key frame. rc->source_alt_ref_active = 0; - cpi->multi_arf_last_grp_enabled = 0; // KF is always a GF so clear frames till next gf counter. rc->frames_till_gf_update_due = 0; |