ref: 2beb5c9f91e7166c2c9d01c94bf84767815121e4
parent: dbd3b8210f0c1f6bfd11dbbe30c5f8a4a86a4782
parent: c3d330496e3fd563be444f065f5c39e1cb0a3802
author: Jingning Han <jingning@google.com>
date: Sat Sep 29 00:20:31 EDT 2018
Merge "Remove deprecated get_arf_buffer_indices()"
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -2085,18 +2085,6 @@
0);
}
-// Current limit on maximum number of active arfs in a GF/ARF group.
-#define MAX_ACTIVE_ARFS 2
-#define ARF_SLOT1 2
-#define ARF_SLOT2 3
-// This function indirects the choice of buffers for arfs.
-// At the moment the values are fixed but this may change as part of
-// the integration process with other codec features that swap buffers around.
-static void get_arf_buffer_indices(unsigned char *arf_buffer_indices) {- arf_buffer_indices[0] = ARF_SLOT1;
- arf_buffer_indices[1] = ARF_SLOT2;
-}
-
// Used in corpus vbr: Calculates the total normalized group complexity score
// for a given number of frames starting at the current position in the stats
// file.
@@ -2193,7 +2181,6 @@
int i;
int frame_index = 0;
int key_frame;
- unsigned char arf_buffer_indices[MAX_ACTIVE_ARFS];
int normal_frames;
key_frame = cpi->common.frame_type == KEY_FRAME;
@@ -2200,8 +2187,6 @@
gf_group->frame_start = cpi->common.current_video_frame;
gf_group->frame_end = gf_group->frame_start + rc->baseline_gf_interval - 1;
-
- get_arf_buffer_indices(arf_buffer_indices);
// For key frames the frame target rate is already set and it
// is also the golden frame.