diff options
| author | Jingning Han <jingning@google.com> | 2018-11-28 18:35:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-28 18:35:35 +0000 |
| commit | d40a5bc8a3558ba6c0eeeed11c964ed26544aabc (patch) | |
| tree | 4114efeb856316fc3740a06c50db32dfafbe6fe7 /vp9/encoder | |
| parent | 615922dfb53103aa3d1620790b97d2ba3b4c76ad (diff) | |
| parent | b3c87f7346d0b413f25b3f1ea5ff221405f27880 (diff) | |
| download | libvpx-d40a5bc8a3558ba6c0eeeed11c964ed26544aabc.tar libvpx-d40a5bc8a3558ba6c0eeeed11c964ed26544aabc.tar.gz libvpx-d40a5bc8a3558ba6c0eeeed11c964ed26544aabc.tar.bz2 libvpx-d40a5bc8a3558ba6c0eeeed11c964ed26544aabc.zip | |
Merge "Remove ineffective condition from rc_pick_q_and_bounds"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index d081f1a49..cdd824358 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -1923,10 +1923,9 @@ void vp9_rc_get_one_pass_vbr_params(VP9_COMP *cpi) { 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 @@ void vp9_rc_get_one_pass_cbr_params(VP9_COMP *cpi) { 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; |