shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Dual arf: Name changes."

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -2397,7 +2397,7 @@

   return arf_src_index;

 }

-static void is_src_altref(VP9_COMP *cpi) {

+static void check_src_altref(VP9_COMP *cpi) {

   RATE_CONTROL *const rc = &cpi->rc;

   if (cpi->pass == 2) {

@@ -2513,9 +2513,8 @@

       cm->show_frame = 1;

       cm->intra_only = 0;

-      // Check to see if the frame to be encoded is an overlay for a previous

-      // arf frame and if so configure it as such.

-      is_src_altref(cpi);

+      // Check to see if the frame should be encoded is an arf overlay.

+      check_src_altref(cpi);

     }

   }

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -1310,7 +1310,7 @@

   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 ||

@@ -1376,7 +1376,7 @@

   }

   // 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) {

@@ -1397,7 +1397,7 @@

       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];

@@ -1427,9 +1427,9 @@

     // 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;