diff options
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/postproc.c | 5 | ||||
| -rw-r--r-- | vp8/common/setupintrarecon.h | 4 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 31 | ||||
| -rw-r--r-- | vp8/encoder/ratectrl.c | 9 |
4 files changed, 18 insertions, 31 deletions
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c index dd998f16e..e3bee32c1 100644 --- a/vp8/common/postproc.c +++ b/vp8/common/postproc.c @@ -71,11 +71,6 @@ static const unsigned char MV_REFERENCE_FRAME_colors[MAX_REF_FRAMES][3] = }; #endif -static const short kernel5[] = -{ - 1, 1, 4, 1, 1 -}; - const short vp8_rv[] = { 8, 5, 2, 2, 8, 12, 4, 9, 8, 3, diff --git a/vp8/common/setupintrarecon.h b/vp8/common/setupintrarecon.h index e515c3a00..8b6c50bd3 100644 --- a/vp8/common/setupintrarecon.h +++ b/vp8/common/setupintrarecon.h @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#ifndef SETUPINTRARECON_H +#define SETUPINTRARECON_H #include "vpx_scale/yv12config.h" extern void vp8_setup_intra_recon(YV12_BUFFER_CONFIG *ybf); @@ -31,3 +33,5 @@ void setup_intra_recon_left(unsigned char *y_buffer, for (i = 0; i < 8; i++) v_buffer[uv_stride *i] = (unsigned char) 129; } + +#endif diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 881ada153..de57c327d 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4621,45 +4621,43 @@ static void encode_frame_to_data_rate vp8_clear_system_state(); if (cpi->twopass.total_left_stats.coded_error != 0.0) - fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %10d %6d %6d" - "%6d %6d %6d %5d %5d %5d %8d %8.2f %10d %10.3f" - "%10.3f %8d\n", + fprintf(f, "%10d %10d %10d %10d %10d %10"PRId64" %10"PRId64 + "%10"PRId64" %10d %6d %6d %6d %6d %5d %5d %5d %8d " + "%8.2lf %"PRId64" %10.3lf %10"PRId64" %8d\n", cpi->common.current_video_frame, cpi->this_frame_target, cpi->projected_frame_size, (cpi->projected_frame_size - cpi->this_frame_target), - (int)cpi->total_target_vs_actual, + cpi->total_target_vs_actual, cpi->buffer_level, (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->ni_av_qi, cpi->cq_target_quality, - cpi->zbin_over_quant, cm->refresh_golden_frame, cm->refresh_alt_ref_frame, cm->frame_type, cpi->gfu_boost, cpi->twopass.est_max_qcorrection_factor, - (int)cpi->twopass.bits_left, + cpi->twopass.bits_left, cpi->twopass.total_left_stats.coded_error, (double)cpi->twopass.bits_left / cpi->twopass.total_left_stats.coded_error, cpi->tot_recode_hits); else - fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %10d %6d %6d" - "%6d %6d %6d %5d %5d %5d %8d %8.2f %10d %10.3f" - "%8d\n", - cpi->common.current_video_frame, - cpi->this_frame_target, cpi->projected_frame_size, + fprintf(f, "%10d %10d %10d %10d %10d %10"PRId64" %10"PRId64 + "%10"PRId64" %10d %6d %6d %6d %6d %5d %5d %5d %8d " + "%8.2lf %"PRId64" %10.3lf %8d\n", + cpi->common.current_video_frame, cpi->this_frame_target, + cpi->projected_frame_size, (cpi->projected_frame_size - cpi->this_frame_target), - (int)cpi->total_target_vs_actual, + cpi->total_target_vs_actual, cpi->buffer_level, (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->ni_av_qi, cpi->cq_target_quality, - cpi->zbin_over_quant, cm->refresh_golden_frame, cm->refresh_alt_ref_frame, cm->frame_type, cpi->gfu_boost, cpi->twopass.est_max_qcorrection_factor, - (int)cpi->twopass.bits_left, + cpi->twopass.bits_left, cpi->twopass.total_left_stats.coded_error, cpi->tot_recode_hits); @@ -4667,7 +4665,6 @@ static void encode_frame_to_data_rate { FILE *fmodes = fopen("Modes.stt", "a"); - int i; fprintf(fmodes, "%6d:%1d:%1d:%1d ", cpi->common.current_video_frame, diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index fe4db13b3..c51650c3c 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -174,14 +174,6 @@ static const int kf_gf_boost_qlimits[QINDEX_RANGE] = 600, 600, 600, 600, 600, 600, 600, 600, }; -/* % adjustment to target kf size based on seperation from previous frame */ -static const int kf_boost_seperation_adjustment[16] = -{ - 30, 40, 50, 55, 60, 65, 70, 75, - 80, 85, 90, 95, 100, 100, 100, 100, -}; - - static const int gf_adjust_table[101] = { 100, @@ -1238,7 +1230,6 @@ int vp8_regulate_q(VP8_COMP *cpi, int target_bits_per_frame) { Q = cpi->oxcf.gold_q; } - } else { |