diff options
| author | Jingning Han <jingning@google.com> | 2018-09-29 04:20:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-29 04:20:31 +0000 |
| commit | 2beb5c9f91e7166c2c9d01c94bf84767815121e4 (patch) | |
| tree | ff92d481d5f468d5b050e4420107b5f8640dccb2 /vp9 | |
| parent | dbd3b8210f0c1f6bfd11dbbe30c5f8a4a86a4782 (diff) | |
| parent | c3d330496e3fd563be444f065f5c39e1cb0a3802 (diff) | |
| download | libvpx-2beb5c9f91e7166c2c9d01c94bf84767815121e4.tar libvpx-2beb5c9f91e7166c2c9d01c94bf84767815121e4.tar.gz libvpx-2beb5c9f91e7166c2c9d01c94bf84767815121e4.tar.bz2 libvpx-2beb5c9f91e7166c2c9d01c94bf84767815121e4.zip | |
Merge "Remove deprecated get_arf_buffer_indices()"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 799faf99d..0bf1a728b 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2085,18 +2085,6 @@ static int calculate_boost_bits(int frame_count, int boost, 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 @@ static int define_gf_group_structure(VP9_COMP *cpi) { 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; @@ -2201,8 +2188,6 @@ static int define_gf_group_structure(VP9_COMP *cpi) { 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. // === [frame_index == 0] === |