shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Reduce the cpi->scaled_ref_idx array size by 1."

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -37,10 +37,9 @@

 #define REF_FRAMES_LOG2 3

 #define REF_FRAMES (1 << REF_FRAMES_LOG2)

-// 1 scratch frame for the new frame, 3 for scaled references on the encoder.

-// TODO(jkoleszar): These 3 extra references could probably come from the

-// normal reference pool.

-#define FRAME_BUFFERS (REF_FRAMES + 4)

+// 1 scratch frame for the new frame, REFS_PER_FRAME for scaled references on

+// the encoder.

+#define FRAME_BUFFERS (REF_FRAMES + 1 + REFS_PER_FRAME)

 #define FRAME_CONTEXTS_LOG2 2

 #define FRAME_CONTEXTS (1 << FRAME_CONTEXTS_LOG2)

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

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

@@ -3276,7 +3276,7 @@

       }

     }

   } else {

-    for (i = 0; i < MAX_REF_FRAMES; ++i) {

+    for (i = 0; i < REFS_PER_FRAME; ++i) {

       const int idx = cpi->scaled_ref_idx[i];

       if (idx != INVALID_IDX) {

         RefCntBuffer *const buf = &cm->buffer_pool->frame_bufs[idx];

@@ -6392,7 +6392,7 @@

     level_rc_framerate(cpi, arf_src_index);

   if (cpi->oxcf.pass != 0 || cpi->use_svc || frame_is_intra_only(cm) == 1) {

-    for (i = 0; i < MAX_REF_FRAMES; ++i) cpi->scaled_ref_idx[i] = INVALID_IDX;

+    for (i = 0; i < REFS_PER_FRAME; ++i) cpi->scaled_ref_idx[i] = INVALID_IDX;

   }

   if (cpi->twopass.gf_group.index == 1 && cpi->sf.enable_tpl_model) {

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -537,7 +537,7 @@

   // For a still frame, this flag is set to 1 to skip partition search.

   int partition_search_skippable_frame;

-  int scaled_ref_idx[MAX_REF_FRAMES];

+  int scaled_ref_idx[REFS_PER_FRAME];

   int lst_fb_idx;

   int gld_fb_idx;

   int alt_fb_idx;

--- a/vp9/encoder/vp9_rd.c

+++ b/vp9/encoder/vp9_rd.c

@@ -631,6 +631,7 @@

   const VP9_COMMON *const cm = &cpi->common;

   const int scaled_idx = cpi->scaled_ref_idx[ref_frame - 1];

   const int ref_idx = get_ref_frame_buf_idx(cpi, ref_frame);

+  assert(ref_frame >= LAST_FRAME && ref_frame <= ALTREF_FRAME);

   return (scaled_idx != ref_idx && scaled_idx != INVALID_IDX)

              ? &cm->buffer_pool->frame_bufs[scaled_idx].buf

              : NULL;