shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add extra resize trigger for frames above maximum allowed size."

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

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

@@ -2628,9 +2628,10 @@

   const int frame_is_kfgfarf = frame_is_kf_gf_arf(cpi);

   int force_recode = 0;

-  if ((cpi->sf.recode_loop == ALLOW_RECODE) ||

+  if ((rc->projected_frame_size >= rc->max_frame_bandwidth) ||

+      (cpi->sf.recode_loop == ALLOW_RECODE) ||

       (frame_is_kfgfarf &&

-      (cpi->sf.recode_loop == ALLOW_RECODE_KFARFGF))) {

+       (cpi->sf.recode_loop == ALLOW_RECODE_KFARFGF))) {

     if (frame_is_kfgfarf &&

         (oxcf->resize_mode == RESIZE_DYNAMIC) &&

         scale_down(cpi, q)) {