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

Merge "Fix the printf format string"

Browse Source
This commit is contained in:
Adrian Grange
2013-12-11 12:50:04 -08:00
committed by Gerrit Code Review
parent 345fbfef06 8af3e6507e
commit 1f07e804f0
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
vp8/encoder/onyx_if.c
View File

@@ -4621,45 +4621,43 @@ static void encode_frame_to_data_rate
vp8_clear_system_state(); vp8_clear_system_state();
if (cpi->twopass.total_left_stats.coded_error != 0.0) if (cpi->twopass.total_left_stats.coded_error != 0.0)
fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %10d %6d %6d" fprintf(f, "%10d %10d %10d %10d %10d %10"PRId64" %10"PRId64
"%6d %6d %6d %5d %5d %5d %8d %8.2f %10d %10.3f" "%10"PRId64" %10d %6d %6d %6d %6d %5d %5d %5d %8d "
"%10.3f %8d\n", "%8.2lf %"PRId64" %10.3lf %10"PRId64" %8d\n",
cpi->common.current_video_frame, cpi->this_frame_target, cpi->common.current_video_frame, cpi->this_frame_target,
cpi->projected_frame_size, cpi->projected_frame_size,
(cpi->projected_frame_size - cpi->this_frame_target), (cpi->projected_frame_size - cpi->this_frame_target),
(int)cpi->total_target_vs_actual, cpi->total_target_vs_actual,
cpi->buffer_level, cpi->buffer_level,
(cpi->oxcf.starting_buffer_level-cpi->bits_off_target), (cpi->oxcf.starting_buffer_level-cpi->bits_off_target),
(int)cpi->total_actual_bits, cm->base_qindex, cpi->total_actual_bits, cm->base_qindex,
cpi->active_best_quality, cpi->active_worst_quality, cpi->active_best_quality, cpi->active_worst_quality,
cpi->ni_av_qi, cpi->cq_target_quality, cpi->ni_av_qi, cpi->cq_target_quality,
cpi->zbin_over_quant,
cm->refresh_golden_frame, cm->refresh_alt_ref_frame, cm->refresh_golden_frame, cm->refresh_alt_ref_frame,
cm->frame_type, cpi->gfu_boost, cm->frame_type, cpi->gfu_boost,
cpi->twopass.est_max_qcorrection_factor, cpi->twopass.est_max_qcorrection_factor,
(int)cpi->twopass.bits_left, cpi->twopass.bits_left,
cpi->twopass.total_left_stats.coded_error, cpi->twopass.total_left_stats.coded_error,
(double)cpi->twopass.bits_left / (double)cpi->twopass.bits_left /
cpi->twopass.total_left_stats.coded_error, cpi->twopass.total_left_stats.coded_error,
cpi->tot_recode_hits); cpi->tot_recode_hits);
else else
fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %10d %6d %6d" fprintf(f, "%10d %10d %10d %10d %10d %10"PRId64" %10"PRId64
"%6d %6d %6d %5d %5d %5d %8d %8.2f %10d %10.3f" "%10"PRId64" %10d %6d %6d %6d %6d %5d %5d %5d %8d "
"%8d\n", "%8.2lf %"PRId64" %10.3lf %8d\n",
cpi->common.current_video_frame, cpi->common.current_video_frame, cpi->this_frame_target,
cpi->this_frame_target, cpi->projected_frame_size, cpi->projected_frame_size,
(cpi->projected_frame_size - cpi->this_frame_target), (cpi->projected_frame_size - cpi->this_frame_target),
(int)cpi->total_target_vs_actual, cpi->total_target_vs_actual,
cpi->buffer_level, cpi->buffer_level,
(cpi->oxcf.starting_buffer_level-cpi->bits_off_target), (cpi->oxcf.starting_buffer_level-cpi->bits_off_target),
(int)cpi->total_actual_bits, cm->base_qindex, cpi->total_actual_bits, cm->base_qindex,
cpi->active_best_quality, cpi->active_worst_quality, cpi->active_best_quality, cpi->active_worst_quality,
cpi->ni_av_qi, cpi->cq_target_quality, cpi->ni_av_qi, cpi->cq_target_quality,
cpi->zbin_over_quant,
cm->refresh_golden_frame, cm->refresh_alt_ref_frame, cm->refresh_golden_frame, cm->refresh_alt_ref_frame,
cm->frame_type, cpi->gfu_boost, cm->frame_type, cpi->gfu_boost,
cpi->twopass.est_max_qcorrection_factor, cpi->twopass.est_max_qcorrection_factor,
(int)cpi->twopass.bits_left, cpi->twopass.bits_left,
cpi->twopass.total_left_stats.coded_error, cpi->twopass.total_left_stats.coded_error,
cpi->tot_recode_hits); cpi->tot_recode_hits);
@@ -4667,7 +4665,6 @@ static void encode_frame_to_data_rate
{ {
FILE *fmodes = fopen("Modes.stt", "a"); FILE *fmodes = fopen("Modes.stt", "a");
int i;
fprintf(fmodes, "%6d:%1d:%1d:%1d ", fprintf(fmodes, "%6d:%1d:%1d:%1d ",
cpi->common.current_video_frame, cpi->common.current_video_frame,

1
vp8/encoder/ratectrl.c
View File

@@ -1238,7 +1238,6 @@ int vp8_regulate_q(VP8_COMP *cpi, int target_bits_per_frame)
{ {
Q = cpi->oxcf.gold_q; Q = cpi->oxcf.gold_q;
} }
} }
else else
{ {