commit df802ee68d7d4913bbf4ce652071e1f18adce423
author Urvang Joshi <urvang@google.com> Mon Nov 05 16:43:26 2018 -0800
committer Urvang Joshi <urvang@google.com> Wed Nov 07 21:25:41 2018 +0000
tree ac856b58f4862a49b53ca2083bc031d534e9cf32
parent 12017783dfd23a53c3e8dc69c98df48bb285ab23

Cleanup regarding buffer pool ref counts.

Change mysterious function name 'ref_cnt_fb' to 'assign_frame_buffer'.

Also, add comments for:
- ref_count variable, including which variables it depends on
- assign_frame_buffer() function

Finally, remove unused function: uref_cnt_fb().

BUG=aomedia:2230

Change-Id: I7a086c906c2499c4876d5a7126e225d13aae187b

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index b108111..7b91720 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3519,9 +3519,9 @@
   // show_frame. This ensures a fwd keyframe does not update all of the buffers
   if ((cm->frame_type == KEY_FRAME && cm->show_frame) || frame_is_sframe(cm)) {
     for (int ref_frame = 0; ref_frame < REF_FRAMES; ++ref_frame) {
-      ref_cnt_fb(pool->frame_bufs,
-                 &cm->ref_frame_map[cpi->remapped_ref_idx[ref_frame]],
-                 cm->new_fb_idx);
+      assign_frame_buffer(pool->frame_bufs,
+                          &cm->ref_frame_map[cpi->remapped_ref_idx[ref_frame]],
+                          cm->new_fb_idx);
     }
     return;
   }
@@ -3541,9 +3541,10 @@
     // reference instead of replacing it with overlay.
 
     if (!cpi->preserve_arf_as_gld) {
-      ref_cnt_fb(pool->frame_bufs,
-                 &cm->ref_frame_map[cpi->remapped_ref_idx[ALTREF_FRAME - 1]],
-                 cm->new_fb_idx);
+      assign_frame_buffer(
+          pool->frame_bufs,
+          &cm->ref_frame_map[cpi->remapped_ref_idx[ALTREF_FRAME - 1]],
+          cm->new_fb_idx);
     }
 
     tmp = cpi->remapped_ref_idx[ALTREF_FRAME - 1];
@@ -3592,7 +3593,8 @@
     // === ALTREF_FRAME ===
     if (cpi->refresh_alt_ref_frame) {
       int arf_idx = cpi->remapped_ref_idx[ALTREF_FRAME - 1];
-      ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[arf_idx], cm->new_fb_idx);
+      assign_frame_buffer(pool->frame_bufs, &cm->ref_frame_map[arf_idx],
+                          cm->new_fb_idx);
 
       memcpy(cpi->interp_filter_selected[ALTREF_FRAME],
              cpi->interp_filter_selected[0],
@@ -3601,9 +3603,10 @@
 
     // === GOLDEN_FRAME ===
     if (cpi->refresh_golden_frame) {
-      ref_cnt_fb(pool->frame_bufs,
-                 &cm->ref_frame_map[cpi->remapped_ref_idx[GOLDEN_FRAME - 1]],
-                 cm->new_fb_idx);
+      assign_frame_buffer(
+          pool->frame_bufs,
+          &cm->ref_frame_map[cpi->remapped_ref_idx[GOLDEN_FRAME - 1]],
+          cm->new_fb_idx);
 
       memcpy(cpi->interp_filter_selected[GOLDEN_FRAME],
              cpi->interp_filter_selected[0],
@@ -3619,15 +3622,17 @@
         // and assign the newly coded frame to BWDREF so that it always
         // keeps the nearest future frame
         int tmp = cpi->remapped_ref_idx[EXTREF_FRAME - 1];
-        ref_cnt_fb(pool->frame_bufs, &cm->ref_frame_map[tmp], cm->new_fb_idx);
+        assign_frame_buffer(pool->frame_bufs, &cm->ref_frame_map[tmp],
+                            cm->new_fb_idx);
 
         rshift_bwd_ref_frames(cpi);
         cpi->remapped_ref_idx[BWDREF_FRAME - 1] = tmp;
       } else {
 #endif  // USE_SYMM_MULTI_LAYER
-        ref_cnt_fb(pool->frame_bufs,
-                   &cm->ref_frame_map[cpi->remapped_ref_idx[BWDREF_FRAME - 1]],
-                   cm->new_fb_idx);
+        assign_frame_buffer(
+            pool->frame_bufs,
+            &cm->ref_frame_map[cpi->remapped_ref_idx[BWDREF_FRAME - 1]],
+            cm->new_fb_idx);
 #if USE_SYMM_MULTI_LAYER
       }
 #endif
@@ -3638,9 +3643,10 @@
 
     // === ALTREF2_FRAME ===
     if (cpi->refresh_alt2_ref_frame) {
-      ref_cnt_fb(pool->frame_bufs,
-                 &cm->ref_frame_map[cpi->remapped_ref_idx[ALTREF2_FRAME - 1]],
-                 cm->new_fb_idx);
+      assign_frame_buffer(
+          pool->frame_bufs,
+          &cm->ref_frame_map[cpi->remapped_ref_idx[ALTREF2_FRAME - 1]],
+          cm->new_fb_idx);
 
       memcpy(cpi->interp_filter_selected[ALTREF2_FRAME],
              cpi->interp_filter_selected[0],
@@ -3681,9 +3687,10 @@
     // remapped_ref_idx[2],   remapped_ref_idx[0],     remapped_ref_idx[1]
     int tmp;
 
-    ref_cnt_fb(pool->frame_bufs,
-               &cm->ref_frame_map[cpi->remapped_ref_idx[LAST_REF_FRAMES - 1]],
-               cm->new_fb_idx);
+    assign_frame_buffer(
+        pool->frame_bufs,
+        &cm->ref_frame_map[cpi->remapped_ref_idx[LAST_REF_FRAMES - 1]],
+        cm->new_fb_idx);
 
     tmp = cpi->remapped_ref_idx[LAST_REF_FRAMES - 1];