generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vp9_ratectrl.c: cleanup -wextra warning"

Browse Source
This commit is contained in:
Yaowu Xu 2014-05-15 06:50:12 -07:00 committed by Gerrit Code Review
commit 9a2749fcc6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vp9/encoder/vp9_ratectrl.c
View File

@ -1147,10 +1147,6 @@ void vp9_rc_postencode_update_drop_frame(VP9_COMP *cpi) {
cpi->rc.frames_to_key--; cpi->rc.frames_to_key--;
} }
static int test_for_kf_one_pass(VP9_COMP *cpi) {
// Placeholder function for auto key frame
return 0;
}
// Use this macro to turn on/off use of alt-refs in one-pass mode. // Use this macro to turn on/off use of alt-refs in one-pass mode.
#define USE_ALTREF_FOR_ONE_PASS 1 #define USE_ALTREF_FOR_ONE_PASS 1
@ -1182,11 +1178,12 @@ void vp9_rc_get_one_pass_vbr_params(VP9_COMP *cpi) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
RATE_CONTROL *const rc = &cpi->rc; RATE_CONTROL *const rc = &cpi->rc;
int target; int target;
// TODO(yaowu): replace the "auto_key && 0" below with proper decision logic.
if (!cpi->refresh_alt_ref_frame && if (!cpi->refresh_alt_ref_frame &&
(cm->current_video_frame == 0 || (cm->current_video_frame == 0 ||
(cpi->frame_flags & FRAMEFLAGS_KEY) || (cpi->frame_flags & FRAMEFLAGS_KEY) ||
rc->frames_to_key == 0 || rc->frames_to_key == 0 ||
(cpi->oxcf.auto_key && test_for_kf_one_pass(cpi)))) { (cpi->oxcf.auto_key && 0))) {
cm->frame_type = KEY_FRAME; cm->frame_type = KEY_FRAME;
rc->this_key_frame_forced = cm->current_video_frame != 0 && rc->this_key_frame_forced = cm->current_video_frame != 0 &&
rc->frames_to_key == 0; rc->frames_to_key == 0;
@ -1313,10 +1310,11 @@ void vp9_rc_get_one_pass_cbr_params(VP9_COMP *cpi) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
RATE_CONTROL *const rc = &cpi->rc; RATE_CONTROL *const rc = &cpi->rc;
int target; int target;
// TODO(yaowu): replace the "auto_key && 0" below with proper decision logic.
if ((cm->current_video_frame == 0 || if ((cm->current_video_frame == 0 ||
(cpi->frame_flags & FRAMEFLAGS_KEY) || (cpi->frame_flags & FRAMEFLAGS_KEY) ||
rc->frames_to_key == 0 || rc->frames_to_key == 0 ||
(cpi->oxcf.auto_key && test_for_kf_one_pass(cpi)))) { (cpi->oxcf.auto_key && 0))) {
cm->frame_type = KEY_FRAME; cm->frame_type = KEY_FRAME;
rc->this_key_frame_forced = cm->current_video_frame != 0 && rc->this_key_frame_forced = cm->current_video_frame != 0 &&
rc->frames_to_key == 0; rc->frames_to_key == 0;