Remove deprecated functions in gop_structure.c Remove the deprecated functions for gop structure. BUG=aomedia:2728 Change-Id: I6dbe896ff0e2b924815b7ee1c98088252318e4ea
diff --git a/av1/encoder/gop_structure.c b/av1/encoder/gop_structure.c index 1ed71a0..932281e 100644 --- a/av1/encoder/gop_structure.c +++ b/av1/encoder/gop_structure.c
@@ -159,136 +159,6 @@ } #endif // CHECK_GF_PARAMETER -#define REF_IDX(ref) ((ref)-LAST_FRAME) - -static INLINE void reset_ref_frame_idx(int *ref_idx, int reset_value) { - for (int i = 0; i < REF_FRAMES; ++i) ref_idx[i] = reset_value; -} - -static INLINE void set_ref_frame_disp_idx(GF_GROUP *const gf_group) { - for (int i = 0; i < gf_group->size; ++i) { - for (int ref = 0; ref < INTER_REFS_PER_FRAME + 1; ++ref) { - int ref_gop_idx = gf_group->ref_frame_gop_idx[i][ref]; - if (ref_gop_idx == -1) { - gf_group->ref_frame_disp_idx[i][ref] = -1; - } else { - gf_group->ref_frame_disp_idx[i][ref] = - gf_group->frame_disp_idx[ref_gop_idx]; - } - } - } -} - -static void set_gop_ref_frame_map(GF_GROUP *const gf_group) { - // Initialize the reference slots as all -1. - for (int frame_idx = 0; frame_idx < gf_group->size; ++frame_idx) - reset_ref_frame_idx(gf_group->ref_frame_gop_idx[frame_idx], -1); - - // Set the map for frames in the current gop - for (int frame_idx = 0; frame_idx < gf_group->size; ++frame_idx) { - const FRAME_UPDATE_TYPE update_type = gf_group->update_type[frame_idx]; - // TODO(yuec): need to figure out how to determine - // (1) whether a KEY_FRAME has show_frame on - // (2) whether a frame with INTNL_OVERLAY_UPDATE type has - // show_existing_frame on - const int show_frame = - update_type != ARF_UPDATE && update_type != INTNL_ARF_UPDATE; - const int show_existing_frame = - update_type == OVERLAY_UPDATE || update_type == INTNL_OVERLAY_UPDATE; - - int this_ref_map[INTER_REFS_PER_FRAME + 1]; - memcpy(this_ref_map, gf_group->ref_frame_gop_idx[frame_idx], - sizeof(this_ref_map)); - int *next_ref_map = &gf_group->ref_frame_gop_idx[frame_idx + 1][0]; - - switch (update_type) { - case KF_UPDATE: - if (show_frame) { - reset_ref_frame_idx(this_ref_map, frame_idx); - } else { - this_ref_map[REF_IDX(LAST3_FRAME)] = frame_idx; - this_ref_map[REF_IDX(EXTREF_FRAME)] = frame_idx; - this_ref_map[REF_IDX(ALTREF2_FRAME)] = frame_idx; - this_ref_map[REF_IDX(GOLDEN_FRAME)] = frame_idx; - this_ref_map[REF_IDX(ALTREF_FRAME)] = frame_idx; - } - break; - case LF_UPDATE: this_ref_map[REF_IDX(LAST3_FRAME)] = frame_idx; break; - case GF_UPDATE: - this_ref_map[REF_IDX(LAST3_FRAME)] = frame_idx; - this_ref_map[REF_IDX(GOLDEN_FRAME)] = frame_idx; - break; - case OVERLAY_UPDATE: - this_ref_map[REF_IDX(ALTREF_FRAME)] = frame_idx; - break; - case ARF_UPDATE: this_ref_map[REF_IDX(ALTREF_FRAME)] = frame_idx; break; - case INTNL_OVERLAY_UPDATE: - if (!show_existing_frame) - this_ref_map[REF_IDX(LAST3_FRAME)] = frame_idx; - break; - case INTNL_ARF_UPDATE: - this_ref_map[REF_IDX(EXTREF_FRAME)] = frame_idx; - break; - default: assert(0); break; - } - - memcpy(next_ref_map, this_ref_map, sizeof(this_ref_map)); - - switch (update_type) { - case LF_UPDATE: - case GF_UPDATE: - next_ref_map[REF_IDX(LAST3_FRAME)] = this_ref_map[REF_IDX(LAST2_FRAME)]; - next_ref_map[REF_IDX(LAST2_FRAME)] = this_ref_map[REF_IDX(LAST_FRAME)]; - next_ref_map[REF_IDX(LAST_FRAME)] = this_ref_map[REF_IDX(LAST3_FRAME)]; - break; - case INTNL_OVERLAY_UPDATE: - if (!show_existing_frame) { - next_ref_map[REF_IDX(LAST3_FRAME)] = - this_ref_map[REF_IDX(LAST2_FRAME)]; - next_ref_map[REF_IDX(LAST2_FRAME)] = - this_ref_map[REF_IDX(LAST_FRAME)]; - next_ref_map[REF_IDX(LAST_FRAME)] = - this_ref_map[REF_IDX(LAST3_FRAME)]; - } else { - next_ref_map[REF_IDX(LAST_FRAME)] = - this_ref_map[REF_IDX(BWDREF_FRAME)]; - next_ref_map[REF_IDX(LAST2_FRAME)] = - this_ref_map[REF_IDX(LAST_FRAME)]; - next_ref_map[REF_IDX(LAST3_FRAME)] = - this_ref_map[REF_IDX(LAST2_FRAME)]; - next_ref_map[REF_IDX(BWDREF_FRAME)] = - this_ref_map[REF_IDX(ALTREF2_FRAME)]; - next_ref_map[REF_IDX(ALTREF2_FRAME)] = - this_ref_map[REF_IDX(EXTREF_FRAME)]; - next_ref_map[REF_IDX(EXTREF_FRAME)] = - this_ref_map[REF_IDX(LAST3_FRAME)]; - } - break; - case INTNL_ARF_UPDATE: - if (!show_existing_frame) { - next_ref_map[REF_IDX(BWDREF_FRAME)] = - this_ref_map[REF_IDX(EXTREF_FRAME)]; - next_ref_map[REF_IDX(ALTREF2_FRAME)] = - this_ref_map[REF_IDX(BWDREF_FRAME)]; - next_ref_map[REF_IDX(EXTREF_FRAME)] = - this_ref_map[REF_IDX(ALTREF2_FRAME)]; - } - break; - case OVERLAY_UPDATE: - next_ref_map[REF_IDX(ALTREF_FRAME)] = - this_ref_map[REF_IDX(GOLDEN_FRAME)]; - next_ref_map[REF_IDX(GOLDEN_FRAME)] = - this_ref_map[REF_IDX(ALTREF_FRAME)]; - break; - default: break; - } - } - - // Set the map in display order index by converting from gop indices in the - // above map - set_ref_frame_disp_idx(gf_group); -} - void av1_gop_setup_structure(AV1_COMP *cpi, const EncodeFrameParams *const frame_params) { RATE_CONTROL *const rc = &cpi->rc; @@ -303,8 +173,6 @@ cpi, twopass, gf_group, rc, frame_info, rc->baseline_gf_interval, first_frame_update_type); - set_gop_ref_frame_map(gf_group); - #if CHECK_GF_PARAMETER check_frame_params(gf_group, rc->baseline_gf_interval); #endif