shithub: libvpx

Info  •  Files  •  Log

Refactor check_initial_width

1) Rename it by update_initial_width() because it's actually
changing the initial_width

2) Move alloc_raw_frame_buffers out of it.

Change-Id: I341bd6743eb0e1217bdf1bdbd7f67c4ea7d76ee2

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

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

@@ -5315,12 +5315,13 @@

 }

 #endif  // !CONFIG_REALTIME_ONLY

-static void check_initial_width(VP9_COMP *cpi,

-#if CONFIG_VP9_HIGHBITDEPTH

-                                int use_highbitdepth,

-#endif

-                                int subsampling_x, int subsampling_y) {

+static void update_initial_width(VP9_COMP *cpi, int use_highbitdepth,

+                                 int subsampling_x, int subsampling_y) {

   VP9_COMMON *const cm = &cpi->common;

+#if !CONFIG_VP9_HIGHBITDEPTH

+  (void)use_highbitdepth;

+  assert(use_highbitdepth == 0);

+#endif

   if (!cpi->initial_width ||

 #if CONFIG_VP9_HIGHBITDEPTH

@@ -5334,8 +5335,6 @@

     cm->use_highbitdepth = use_highbitdepth;

 #endif

-    alloc_raw_frame_buffers(cpi);

-

     cpi->initial_width = cm->width;

     cpi->initial_height = cm->height;

     cpi->initial_mbs = cm->MBs;

@@ -5352,17 +5351,17 @@

   const int subsampling_y = sd->subsampling_y;

 #if CONFIG_VP9_HIGHBITDEPTH

   const int use_highbitdepth = (sd->flags & YV12_FLAG_HIGHBITDEPTH) != 0;

+#else

+  const int use_highbitdepth = 0;

 #endif

-#if CONFIG_VP9_HIGHBITDEPTH

-  check_initial_width(cpi, use_highbitdepth, subsampling_x, subsampling_y);

-#else

-  check_initial_width(cpi, subsampling_x, subsampling_y);

-#endif  // CONFIG_VP9_HIGHBITDEPTH

-

+  update_initial_width(cpi, use_highbitdepth, subsampling_x, subsampling_y);

 #if CONFIG_VP9_TEMPORAL_DENOISING

   setup_denoiser_buffer(cpi);

 #endif

+

+  alloc_raw_frame_buffers(cpi);

+

   vpx_usec_timer_start(&timer);

   if (vp9_lookahead_push(cpi->lookahead, sd, time_stamp, end_time,

@@ -7605,15 +7604,15 @@

                          unsigned int height) {

   VP9_COMMON *cm = &cpi->common;

 #if CONFIG_VP9_HIGHBITDEPTH

-  check_initial_width(cpi, cm->use_highbitdepth, 1, 1);

+  update_initial_width(cpi, cm->use_highbitdepth, 1, 1);

 #else

-  check_initial_width(cpi, 1, 1);

+  update_initial_width(cpi, 0, 1, 1);

 #endif  // CONFIG_VP9_HIGHBITDEPTH

 #if CONFIG_VP9_TEMPORAL_DENOISING

   setup_denoiser_buffer(cpi);

 #endif

-

+  alloc_raw_frame_buffers(cpi);

   if (width) {

     cm->width = width;

     if (cm->width > cpi->initial_width) {