diff options
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/decoder/decodframe.c | 5 | ||||
| -rw-r--r-- | vp8/decoder/threading.c | 5 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 85 | ||||
| -rw-r--r-- | vp8/encoder/onyx_int.h | 3 | ||||
| -rw-r--r-- | vp8/encoder/ratectrl.c | 219 | ||||
| -rw-r--r-- | vp8/encoder/ratectrl.h | 5 |
6 files changed, 106 insertions, 216 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 95985082f..aaee91170 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -198,6 +198,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd) xd->mode_info_context->mbmi.mode == SPLITMV); if (!eobtotal) { + /* Special case: Force the loopfilter to skip when eobtotal and + * mb_skip_coeff are zero. + * */ + xd->mode_info_context->mbmi.mb_skip_coeff = 1; + skip_recon_mb(pbi, xd); return; } diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 06109e125..16afd591d 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -112,6 +112,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m xd->mode_info_context->mbmi.mode == SPLITMV); if (!eobtotal) { + /* Special case: Force the loopfilter to skip when eobtotal and + * mb_skip_coeff are zero. + * */ + xd->mode_info_context->mbmi.mb_skip_coeff = 1; + /*mt_skip_recon_mb(pbi, xd, mb_row, mb_col);*/ if (xd->frame_type == KEY_FRAME || xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME) { diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index c7579e83a..15fd4f2e8 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -56,7 +56,6 @@ extern void vp8_loop_filter_frame(VP8_COMMON *cm, MACROBLOCKD *mbd, int filt extern void vp8_loop_filter_frame_yonly(VP8_COMMON *cm, MACROBLOCKD *mbd, int filt_val, int sharpness_lvl); extern void vp8_dmachine_specific_config(VP8_COMP *cpi); extern void vp8_cmachine_specific_config(VP8_COMP *cpi); -extern void vp8_calc_auto_iframe_target_size(VP8_COMP *cpi); extern void vp8_deblock_frame(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *post, int filt_lvl, int low_var_thresh, int flag); extern void print_parms(VP8_CONFIG *ocf, char *filenam); extern unsigned int vp8_get_processor_freq(); @@ -1442,10 +1441,7 @@ static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf) cpi->auto_gold = 1; cpi->auto_adjust_gold_quantizer = 1; - cpi->goldquantizer = 1; cpi->goldfreq = 7; - cpi->auto_adjust_key_quantizer = 1; - cpi->keyquantizer = 1; cm->version = oxcf->Version; vp8_setup_version(cm); @@ -2646,78 +2642,7 @@ static void resize_key_frame(VP8_COMP *cpi) #endif } -// return of 0 means drop frame -static int pick_frame_size(VP8_COMP *cpi) -{ - VP8_COMMON *cm = &cpi->common; - - // First Frame is a special case - if (cm->current_video_frame == 0) - { -#if !(CONFIG_REALTIME_ONLY) - - if (cpi->pass == 2) - vp8_calc_auto_iframe_target_size(cpi); - - else -#endif - { - /* 1 Pass there is no information on which to base size so use - * bandwidth per second * fraction of the initial buffer - * level - */ - cpi->this_frame_target = cpi->oxcf.starting_buffer_level / 2; - - if(cpi->this_frame_target > cpi->oxcf.target_bandwidth * 3 / 2) - cpi->this_frame_target = cpi->oxcf.target_bandwidth * 3 / 2; - } - - // Key frame from VFW/auto-keyframe/first frame - cm->frame_type = KEY_FRAME; - - } - // Special case for forced key frames - // The frame sizing here is still far from ideal for 2 pass. - else if (cm->frame_flags & FRAMEFLAGS_KEY) - { - cm->frame_type = KEY_FRAME; - resize_key_frame(cpi); - vp8_calc_iframe_target_size(cpi); - } - else if (cm->frame_type == KEY_FRAME) - { - vp8_calc_auto_iframe_target_size(cpi); - } - else - { - // INTER frame: compute target frame size - cm->frame_type = INTER_FRAME; - vp8_calc_pframe_target_size(cpi); - // Check if we're dropping the frame: - if (cpi->drop_frame) - { - cpi->drop_frame = FALSE; - cpi->drop_count++; - return 0; - } - } - - /* Apply limits on keyframe target. - * - * TODO: move this after consolidating - * vp8_calc_iframe_target_size() and vp8_calc_auto_iframe_target_size() - */ - if (cm->frame_type == KEY_FRAME && cpi->oxcf.rc_max_intra_bitrate_pct) - { - unsigned int max_rate = cpi->av_per_frame_bandwidth - * cpi->oxcf.rc_max_intra_bitrate_pct / 100; - - if (cpi->this_frame_target > max_rate) - cpi->this_frame_target = max_rate; - } - return 1; -} static void set_quantizer(VP8_COMP *cpi, int Q) { @@ -3506,7 +3431,7 @@ static void encode_frame_to_data_rate } // Decide how big to make the frame - if (!pick_frame_size(cpi)) + if (!vp8_pick_frame_size(cpi)) { cm->current_video_frame++; cpi->frames_since_key++; @@ -3834,7 +3759,10 @@ static void encode_frame_to_data_rate } if (cm->frame_type == KEY_FRAME) + { + resize_key_frame(cpi); vp8_setup_key_frame(cpi); + } // transform / motion compensation build reconstruction frame vp8_encode_frame(cpi); @@ -3858,11 +3786,11 @@ static void encode_frame_to_data_rate #else if (decide_key_frame(cpi)) { - vp8_calc_auto_iframe_target_size(cpi); - // Reset all our sizing numbers and recode cm->frame_type = KEY_FRAME; + vp8_pick_frame_size(cpi); + // Clear the Alt reference frame active flag when we have a key frame cpi->source_alt_ref_active = FALSE; @@ -3891,7 +3819,6 @@ static void encode_frame_to_data_rate loop_count++; Loop = TRUE; - resize_key_frame(cpi); continue; } #endif diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index e7ad8f327..a66056dff 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -501,10 +501,7 @@ typedef struct int interquantizer; int auto_gold; int auto_adjust_gold_quantizer; - int goldquantizer; int goldfreq; - int auto_adjust_key_quantizer; - int keyquantizer; int auto_worst_q; int cpu_used; int chroma_boost; diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index 09a69bc71..d87591cb9 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -329,62 +329,96 @@ void vp8_setup_key_frame(VP8_COMP *cpi) cpi->common.refresh_alt_ref_frame = TRUE; } -void vp8_calc_auto_iframe_target_size(VP8_COMP *cpi) + +static int estimate_bits_at_q(int frame_kind, int Q, int MBs, + double correction_factor) +{ + int Bpm = (int)(.5 + correction_factor * vp8_bits_per_mb[frame_kind][Q]); + + /* Attempt to retain reasonable accuracy without overflow. The cutoff is + * chosen such that the maximum product of Bpm and MBs fits 31 bits. The + * largest Bpm takes 20 bits. + */ + if (MBs > (1 << 11)) + return (Bpm >> BPER_MB_NORMBITS) * MBs; + else + return (Bpm * MBs) >> BPER_MB_NORMBITS; +} + + +static void calc_iframe_target_size(VP8_COMP *cpi) { // boost defaults to half second int kf_boost; + int target; // Clear down mmx registers to allow floating point in what follows vp8_clear_system_state(); //__asm emms; if (cpi->oxcf.fixed_q >= 0) { - vp8_calc_iframe_target_size(cpi); - return; - } + int Q = cpi->oxcf.key_q; - if (cpi->pass == 2) + target = estimate_bits_at_q(INTRA_FRAME, Q, cpi->common.MBs, + cpi->key_frame_rate_correction_factor); + } + else if (cpi->pass == 2) { - cpi->this_frame_target = cpi->per_frame_bandwidth; // New Two pass RC + // New Two pass RC + target = cpi->per_frame_bandwidth; + } + // First Frame is a special case + else if (cpi->common.current_video_frame == 0) + { + /* 1 Pass there is no information on which to base size so use + * bandwidth per second * fraction of the initial buffer + * level + */ + target = cpi->oxcf.starting_buffer_level / 2; + + if(target > cpi->oxcf.target_bandwidth * 3 / 2) + target = cpi->oxcf.target_bandwidth * 3 / 2; } else { + // if this keyframe was forced, use a more recent Q estimate + int Q = (cpi->common.frame_flags & FRAMEFLAGS_KEY) + ? cpi->avg_frame_qindex : cpi->ni_av_qi; + // Boost depends somewhat on frame rate kf_boost = (int)(2 * cpi->output_frame_rate - 16); // adjustment up based on q - kf_boost = kf_boost * kf_boost_qadjustment[cpi->ni_av_qi] / 100; + kf_boost = kf_boost * kf_boost_qadjustment[Q] / 100; // frame separation adjustment ( down) if (cpi->frames_since_key < cpi->output_frame_rate / 2) - kf_boost = (int)(kf_boost * cpi->frames_since_key / (cpi->output_frame_rate / 2)); + kf_boost = (int)(kf_boost + * cpi->frames_since_key / (cpi->output_frame_rate / 2)); if (kf_boost < 16) kf_boost = 16; - // Reset the active worst quality to the baseline value for key frames. - cpi->active_worst_quality = cpi->worst_quality; - - cpi->this_frame_target = ((16 + kf_boost) * cpi->per_frame_bandwidth) >> 4; + target = ((16 + kf_boost) * cpi->per_frame_bandwidth) >> 4; } - // Should the next frame be an altref frame - if (cpi->pass != 2) + if (cpi->oxcf.rc_max_intra_bitrate_pct) { - // For now Alt ref is not allowed except in 2 pass modes. - cpi->source_alt_ref_pending = FALSE; + unsigned int max_rate = cpi->per_frame_bandwidth + * cpi->oxcf.rc_max_intra_bitrate_pct / 100; - /*if ( cpi->oxcf.fixed_q == -1) - { - if ( cpi->oxcf.play_alternate && ( (cpi->last_boost/2) > (100+(AF_THRESH*cpi->frames_till_gf_update_due)) ) ) - cpi->source_alt_ref_pending = TRUE; - else - cpi->source_alt_ref_pending = FALSE; - }*/ + if (target > max_rate) + target = max_rate; } - if (0) + cpi->this_frame_target = target; + + // TODO: if we separate rate targeting from Q targetting, move this. + // Reset the active worst quality to the baseline value for key frames. + cpi->active_worst_quality = cpi->worst_quality; + +#if 0 { FILE *f; @@ -397,8 +431,10 @@ void vp8_calc_auto_iframe_target_size(VP8_COMP *cpi) fclose(f); } +#endif } + // Do the best we can to define the parameteres for the next GF based on what information we have available. static void calc_gf_params(VP8_COMP *cpi) { @@ -564,100 +600,9 @@ static void calc_gf_params(VP8_COMP *cpi) }*/ } } -/* This is equvialent to estimate_bits_at_q without the rate_correction_factor. */ -static int baseline_bits_at_q(int frame_kind, int Q, int MBs) -{ - int Bpm = vp8_bits_per_mb[frame_kind][Q]; - - /* Attempt to retain reasonable accuracy without overflow. The cutoff is - * chosen such that the maximum product of Bpm and MBs fits 31 bits. The - * largest Bpm takes 20 bits. - */ - if (MBs > (1 << 11)) - return (Bpm >> BPER_MB_NORMBITS) * MBs; - else - return (Bpm * MBs) >> BPER_MB_NORMBITS; -} - -void vp8_calc_iframe_target_size(VP8_COMP *cpi) -{ - int Q; - int Boost = 100; - - Q = (cpi->oxcf.fixed_q >= 0) ? cpi->oxcf.fixed_q : cpi->avg_frame_qindex; - - if (cpi->auto_adjust_key_quantizer == 1) - { - // If (auto_adjust_key_quantizer==1) then a lower Q is selected for key-frames. - // The enhanced Q is calculated so as to boost the key frame size by a factor - // specified in kf_boost_qadjustment. Also, can adjust based on distance - // between key frames. - - // Adjust boost based upon ambient Q - Boost = kf_boost_qadjustment[Q]; - - // Make the Key frame boost less if the seperation from the previous key frame is small - if (cpi->frames_since_key < 16) - Boost = Boost * kf_boost_seperation_adjustment[cpi->frames_since_key] / 100; - else - Boost = Boost * kf_boost_seperation_adjustment[15] / 100; - - // Apply limits on boost - if (Boost > kf_gf_boost_qlimits[Q]) - Boost = kf_gf_boost_qlimits[Q]; - else if (Boost < 120) - Boost = 120; - } - - // Keep a record of the boost that was used - cpi->last_boost = Boost; - - // Should the next frame be an altref frame - if (cpi->pass != 2) - { - // For now Alt ref is not allowed except in 2 pass modes. - cpi->source_alt_ref_pending = FALSE; - - /*if ( cpi->oxcf.fixed_q == -1) - { - if ( cpi->oxcf.play_alternate && ( (cpi->last_boost/2) > (100+(AF_THRESH*cpi->frames_till_gf_update_due)) ) ) - cpi->source_alt_ref_pending = TRUE; - else - cpi->source_alt_ref_pending = FALSE; - }*/ - } - - if (cpi->oxcf.fixed_q >= 0) - { - cpi->this_frame_target = (baseline_bits_at_q(0, Q, cpi->common.MBs) * Boost) / 100; - } - else - { - - int bits_per_mb_at_this_q ; - - if (cpi->oxcf.error_resilient_mode == 1) - { - cpi->this_frame_target = 2 * cpi->av_per_frame_bandwidth; - return; - } - - // Rate targetted scenario: - // Be careful of 32-bit OVERFLOW if restructuring the caluclation of cpi->this_frame_target - bits_per_mb_at_this_q = (int)(.5 + - cpi->key_frame_rate_correction_factor * vp8_bits_per_mb[0][Q]); - - cpi->this_frame_target = (((bits_per_mb_at_this_q * cpi->common.MBs) >> BPER_MB_NORMBITS) * Boost) / 100; - - // Reset the active worst quality to the baseline value for key frames. - if (cpi->pass < 2) - cpi->active_worst_quality = cpi->worst_quality; - } -} - -void vp8_calc_pframe_target_size(VP8_COMP *cpi) +static void calc_pframe_target_size(VP8_COMP *cpi) { int min_frame_target; int Adjustment; @@ -1149,7 +1094,9 @@ void vp8_calc_pframe_target_size(VP8_COMP *cpi) } } else - cpi->this_frame_target = (baseline_bits_at_q(1, Q, cpi->common.MBs) * cpi->last_boost) / 100; + cpi->this_frame_target = + (estimate_bits_at_q(1, Q, cpi->common.MBs, 1.0) + * cpi->last_boost) / 100; } // If there is an active ARF at this location use the minimum @@ -1271,21 +1218,6 @@ void vp8_update_rate_correction_factors(VP8_COMP *cpi, int damp_var) } } -static int estimate_bits_at_q(VP8_COMP *cpi, int Q) -{ - int Bpm = (int)(.5 + cpi->rate_correction_factor * vp8_bits_per_mb[INTER_FRAME][Q]); - - /* Attempt to retain reasonable accuracy without overflow. The cutoff is - * chosen such that the maximum product of Bpm and MBs fits 31 bits. The - * largest Bpm takes 20 bits. - */ - if (cpi->common.MBs > (1 << 11)) - return (Bpm >> BPER_MB_NORMBITS) * cpi->common.MBs; - else - return (Bpm * cpi->common.MBs) >> BPER_MB_NORMBITS; - -} - int vp8_regulate_q(VP8_COMP *cpi, int target_bits_per_frame) { @@ -1569,3 +1501,26 @@ void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit, } } } + + +// return of 0 means drop frame +int vp8_pick_frame_size(VP8_COMP *cpi) +{ + VP8_COMMON *cm = &cpi->common; + + if (cm->frame_type == KEY_FRAME) + calc_iframe_target_size(cpi); + else + { + calc_pframe_target_size(cpi); + + // Check if we're dropping the frame: + if (cpi->drop_frame) + { + cpi->drop_frame = FALSE; + cpi->drop_count++; + return 0; + } + } + return 1; +} diff --git a/vp8/encoder/ratectrl.h b/vp8/encoder/ratectrl.h index 766dfdfce..d4f779677 100644 --- a/vp8/encoder/ratectrl.h +++ b/vp8/encoder/ratectrl.h @@ -17,11 +17,12 @@ extern void vp8_save_coding_context(VP8_COMP *cpi); extern void vp8_restore_coding_context(VP8_COMP *cpi); extern void vp8_setup_key_frame(VP8_COMP *cpi); -extern void vp8_calc_iframe_target_size(VP8_COMP *cpi); -extern void vp8_calc_pframe_target_size(VP8_COMP *cpi); extern void vp8_update_rate_correction_factors(VP8_COMP *cpi, int damp_var); extern int vp8_regulate_q(VP8_COMP *cpi, int target_bits_per_frame); extern void vp8_adjust_key_frame_context(VP8_COMP *cpi); extern void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_limit, int *frame_over_shoot_limit); +// return of 0 means drop frame +extern int vp8_pick_frame_size(VP8_COMP *cpi); + #endif |