shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Recompute tile params on frame resize"

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

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

@@ -685,6 +685,27 @@

   vp9_setup_pc_tree(&cpi->common, &cpi->td);

 }

+void vp9_new_framerate(VP9_COMP *cpi, double framerate) {

+  cpi->framerate = framerate < 0.1 ? 30 : framerate;

+  vp9_rc_update_framerate(cpi);

+}

+

+static void set_tile_limits(VP9_COMP *cpi) {

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

+

+  int min_log2_tile_cols, max_log2_tile_cols;

+  vp9_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols);

+

+  if (is_two_pass_svc(cpi) && cpi->svc.encode_empty_frame_state == ENCODING) {

+    cm->log2_tile_cols = 0;

+    cm->log2_tile_rows = 0;

+  } else {

+    cm->log2_tile_cols = clamp(cpi->oxcf.tile_columns,

+                               min_log2_tile_cols, max_log2_tile_cols);

+    cm->log2_tile_rows = cpi->oxcf.tile_rows;

+  }

+}

+

 static void update_frame_size(VP9_COMP *cpi) {

   VP9_COMMON *const cm = &cpi->common;

   MACROBLOCKD *const xd = &cpi->td.mb.e_mbd;

@@ -693,6 +714,8 @@

   vp9_init_context_buffers(cm);

   init_macroblockd(cm, xd);

+  set_tile_limits(cpi);

+

   if (is_two_pass_svc(cpi)) {

     if (vp9_realloc_frame_buffer(&cpi->alt_ref_buffer,

                                  cm->width, cm->height,

@@ -704,27 +727,6 @@

                                  NULL, NULL, NULL))

       vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

                          "Failed to reallocate alt_ref_buffer");

-  }

-}

-

-void vp9_new_framerate(VP9_COMP *cpi, double framerate) {

-  cpi->framerate = framerate < 0.1 ? 30 : framerate;

-  vp9_rc_update_framerate(cpi);

-}

-

-static void set_tile_limits(VP9_COMP *cpi) {

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

-

-  int min_log2_tile_cols, max_log2_tile_cols;

-  vp9_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols);

-

-  if (is_two_pass_svc(cpi) && cpi->svc.encode_empty_frame_state == ENCODING) {

-    cm->log2_tile_cols = 0;

-    cm->log2_tile_rows = 0;

-  } else {

-    cm->log2_tile_cols = clamp(cpi->oxcf.tile_columns,

-                               min_log2_tile_cols, max_log2_tile_cols);

-    cm->log2_tile_rows = cpi->oxcf.tile_rows;

   }

 }