shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Fix to pick_filter_level for highbitdepth build."

--- a/vp9/encoder/vp9_picklpf.c

+++ b/vp9/encoder/vp9_picklpf.c

@@ -180,11 +180,11 @@

     }

 #else

     int filt_guess = ROUND_POWER_OF_TWO(q * 20723 + 1015158, 18);

+#endif  // CONFIG_VP9_HIGHBITDEPTH

     if (cpi->oxcf.pass == 0 && cpi->oxcf.rc_mode == VPX_CBR &&

         cpi->oxcf.content != VP9E_CONTENT_SCREEN && cm->frame_type != KEY_FRAME)

       filt_guess = 5 * filt_guess >> 3;

-#endif  // CONFIG_VP9_HIGHBITDEPTH

     if (cm->frame_type == KEY_FRAME) filt_guess -= 4;

     lf->filter_level = clamp(filt_guess, min_filter_level, max_filter_level);

   } else {