From da4d6a5e4553c2d1c2554ca895986b4bd7fc4e71 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Wed, 12 Sep 2018 22:51:19 -0700 Subject: [PATCH] Remove deprecated first_inter_index With the refactoring of logics that determines if a frame needs re-code runs to adapt to the target bit-rate, the variable first_inter_index is no longer in effect use. Hence remove it. Change-Id: I045894ad1f8b1e00fa40d5a55d762bad0d31b27d --- vp9/encoder/vp9_firstpass.c | 4 ---- vp9/encoder/vp9_firstpass.h | 1 - 2 files changed, 5 deletions(-) diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index b95e124..c7cad05 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2247,9 +2247,6 @@ static int define_gf_group_structure(VP9_COMP *cpi) { return frame_index; } - // Note index of the first normal inter frame int eh group (not gf kf arf) - gf_group->first_inter_index = frame_index; - // Define middle frame mid_frame_idx = frame_index + (rc->baseline_gf_interval >> 1) - 1; @@ -2413,7 +2410,6 @@ static void allocate_gf_group_bits(VP9_COMP *cpi, int64_t gf_group_bits, for (idx = 0; idx < gop_frames; ++idx) if (gf_group->update_type[idx] == LF_UPDATE) break; - gf_group->first_inter_index = idx; return; } diff --git a/vp9/encoder/vp9_firstpass.h b/vp9/encoder/vp9_firstpass.h index 8d0f335..620c29c 100644 --- a/vp9/encoder/vp9_firstpass.h +++ b/vp9/encoder/vp9_firstpass.h @@ -130,7 +130,6 @@ typedef enum { typedef struct { unsigned char index; - unsigned char first_inter_index; RATE_FACTOR_LEVEL rf_level[MAX_STATIC_GF_GROUP_LENGTH + 2]; FRAME_UPDATE_TYPE update_type[MAX_STATIC_GF_GROUP_LENGTH + 2]; unsigned char arf_src_offset[MAX_STATIC_GF_GROUP_LENGTH + 2]; -- 2.7.4