shithub: libvpx

Info  •  Files  •  Log

Move init_ref_frame_bufs to vp9_create_compressor

Change-Id: I2e36e07c273692a08a9c3ebba814882d32d32f8c

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

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

@@ -2159,6 +2159,18 @@

   } while (++i <= MV_MAX);

 }

+static void init_ref_frame_bufs(VP9_COMMON *cm) {

+  int i;

+  BufferPool *const pool = cm->buffer_pool;

+  cm->new_fb_idx = INVALID_IDX;

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

+    cm->ref_frame_map[i] = INVALID_IDX;

+  }

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

+    pool->frame_bufs[i].ref_count = 0;

+  }

+}

+

 VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf,

                                 BufferPool *const pool) {

   unsigned int i;

@@ -2192,6 +2204,7 @@

   cpi->resize_buffer_underflow = 0;

   cpi->use_skin_detection = 0;

   cpi->common.buffer_pool = pool;

+  init_ref_frame_bufs(cm);

   cpi->force_update_segmentation = 0;

@@ -5302,18 +5315,6 @@

 }

 #endif  // !CONFIG_REALTIME_ONLY

-static void init_ref_frame_bufs(VP9_COMMON *cm) {

-  int i;

-  BufferPool *const pool = cm->buffer_pool;

-  cm->new_fb_idx = INVALID_IDX;

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

-    cm->ref_frame_map[i] = INVALID_IDX;

-  }

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

-    pool->frame_bufs[i].ref_count = 0;

-  }

-}

-

 static void check_initial_width(VP9_COMP *cpi,

 #if CONFIG_VP9_HIGHBITDEPTH

                                 int use_highbitdepth,

@@ -5334,7 +5335,6 @@

 #endif

     alloc_raw_frame_buffers(cpi);

-    init_ref_frame_bufs(cm);

     alloc_util_frame_buffers(cpi);

     init_motion_estimation(cpi);  // TODO(agrange) This can be removed.