shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove ineffective condition from rc_pick_q_and_bounds"

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -1923,10 +1923,9 @@

   VP9_COMMON *const cm = &cpi->common;

   RATE_CONTROL *const rc = &cpi->rc;

   int target;

-  // TODO(yaowu): replace the "auto_key && 0" below with proper decision logic.

   if (!cpi->refresh_alt_ref_frame &&

       (cm->current_video_frame == 0 || (cpi->frame_flags & FRAMEFLAGS_KEY) ||

-       rc->frames_to_key == 0 || (cpi->oxcf.auto_key && 0))) {

+       rc->frames_to_key == 0)) {

     cm->frame_type = KEY_FRAME;

     rc->this_key_frame_forced =

         cm->current_video_frame != 0 && rc->frames_to_key == 0;

@@ -2218,9 +2217,8 @@

   VP9_COMMON *const cm = &cpi->common;

   RATE_CONTROL *const rc = &cpi->rc;

   int target;

-  // TODO(yaowu): replace the "auto_key && 0" below with proper decision logic.

   if ((cm->current_video_frame == 0) || (cpi->frame_flags & FRAMEFLAGS_KEY) ||

-      rc->frames_to_key == 0 || (cpi->oxcf.auto_key && 0)) {

+      rc->frames_to_key == 0) {

     cm->frame_type = KEY_FRAME;

     rc->frames_to_key = cpi->oxcf.key_freq;

     rc->kf_boost = DEFAULT_KF_BOOST;