diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2014-06-25 10:31:32 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2014-06-25 10:37:02 +0100 |
| commit | 9f76c1ec507e1c866c8952c6003e99af9bc9d73c (patch) | |
| tree | 703541eefe08cda1d408e2a301f0a83b2154171d /vp9/encoder/vp9_firstpass.c | |
| parent | b8c382f8e76e0ee313b15e61ac658271e2047849 (diff) | |
| download | libvpx-9f76c1ec507e1c866c8952c6003e99af9bc9d73c.tar libvpx-9f76c1ec507e1c866c8952c6003e99af9bc9d73c.tar.gz libvpx-9f76c1ec507e1c866c8952c6003e99af9bc9d73c.tar.bz2 libvpx-9f76c1ec507e1c866c8952c6003e99af9bc9d73c.zip | |
Dual arf: Name changes.
Cosmetic patch only in response to comments on
previous patches suggesting a couple of name changes
for consistency and clarity.
Change-Id: Ida3a359b0d5755345660d304a7697a3a3686b2a3
Diffstat (limited to 'vp9/encoder/vp9_firstpass.c')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 6fb263fd6..5e5a85d36 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1309,7 +1309,7 @@ static void allocate_gf_group_bits(VP9_COMP *cpi, int64_t gf_group_bits, double modified_err = 0.0; double err_fraction; int mid_boost_bits = 0; - int middle_frame_idx; + int mid_frame_idx; unsigned char arf_buffer_indices[MAX_ACTIVE_ARFS]; key_frame = cpi->common.frame_type == KEY_FRAME || @@ -1375,7 +1375,7 @@ static void allocate_gf_group_bits(VP9_COMP *cpi, int64_t gf_group_bits, } // Define middle frame - middle_frame_idx = frame_index + (rc->baseline_gf_interval >> 1) - 1; + mid_frame_idx = frame_index + (rc->baseline_gf_interval >> 1) - 1; // Allocate bits to the other frames in the group. for (i = 0; i < rc->baseline_gf_interval - 1; ++i) { @@ -1396,7 +1396,7 @@ static void allocate_gf_group_bits(VP9_COMP *cpi, int64_t gf_group_bits, mid_boost_bits += (target_frame_size >> 4); target_frame_size -= (target_frame_size >> 4); - if (frame_index <= middle_frame_idx) + if (frame_index <= mid_frame_idx) arf_idx = 1; } twopass->gf_group.arf_update_idx[frame_index] = arf_buffer_indices[arf_idx]; @@ -1426,9 +1426,9 @@ static void allocate_gf_group_bits(VP9_COMP *cpi, int64_t gf_group_bits, // Final setup for second arf and its overlay. if (cpi->multi_arf_enabled) { twopass->gf_group.bit_allocation[2] = - twopass->gf_group.bit_allocation[middle_frame_idx] + mid_boost_bits; - twopass->gf_group.update_type[middle_frame_idx] = OVERLAY_UPDATE; - twopass->gf_group.bit_allocation[middle_frame_idx] = 0; + twopass->gf_group.bit_allocation[mid_frame_idx] + mid_boost_bits; + twopass->gf_group.update_type[mid_frame_idx] = OVERLAY_UPDATE; + twopass->gf_group.bit_allocation[mid_frame_idx] = 0; } } else { twopass->gf_group.update_type[frame_index] = GF_UPDATE; |