ref: 4d240d1eae9fc88278a358a075735b84f8da89e2
parent: 54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80
parent: ad6fe4a88c9d051a34c85d3f422cde5819f2bbdf
author: John Koleszar <jkoleszar@google.com>
date: Fri May 20 20:05:14 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I90a1d0095712e0474b0c03773b57376911027fc6
--- a/vp8/common/arm/neon/iwalsh_neon.asm
+++ b/vp8/common/arm/neon/iwalsh_neon.asm
@@ -20,19 +20,16 @@
|vp8_short_inv_walsh4x4_neon| PROC
; read in all four lines of values: d0->d3
- vldm.64 r0, {q0, q1}+ vld1.i16 {q0-q1}, [r0@128]; first for loop
-
vadd.s16 d4, d0, d3 ;a = [0] + [12]
- vadd.s16 d5, d1, d2 ;b = [4] + [8]
- vsub.s16 d6, d1, d2 ;c = [4] - [8]
- vsub.s16 d7, d0, d3 ;d = [0] - [12]
+ vadd.s16 d6, d1, d2 ;b = [4] + [8]
+ vsub.s16 d5, d0, d3 ;d = [0] - [12]
+ vsub.s16 d7, d1, d2 ;c = [4] - [8]
- vadd.s16 d0, d4, d5 ;a + b
- vadd.s16 d1, d6, d7 ;c + d
- vsub.s16 d2, d4, d5 ;a - b
- vsub.s16 d3, d7, d6 ;d - c
+ vadd.s16 q0, q2, q3 ; a+b d+c
+ vsub.s16 q1, q2, q3 ; a-b d-c
vtrn.32 d0, d2 ;d0: 0 1 8 9
;d2: 2 3 10 11
@@ -47,30 +44,23 @@
; second for loop
vadd.s16 d4, d0, d3 ;a = [0] + [3]
- vadd.s16 d5, d1, d2 ;b = [1] + [2]
- vsub.s16 d6, d1, d2 ;c = [1] - [2]
- vsub.s16 d7, d0, d3 ;d = [0] - [3]
+ vadd.s16 d6, d1, d2 ;b = [1] + [2]
+ vsub.s16 d5, d0, d3 ;d = [0] - [3]
+ vsub.s16 d7, d1, d2 ;c = [1] - [2]
- vadd.s16 d0, d4, d5 ;e = a + b
- vadd.s16 d1, d6, d7 ;f = c + d
- vsub.s16 d2, d4, d5 ;g = a - b
- vsub.s16 d3, d7, d6 ;h = d - c
+ vmov.i16 q8, #3
- vmov.i16 q2, #3
- vadd.i16 q0, q0, q2 ;e/f += 3
- vadd.i16 q1, q1, q2 ;g/h += 3
+ vadd.s16 q0, q2, q3 ; a+b d+c
+ vsub.s16 q1, q2, q3 ; a-b d-c
+ vadd.i16 q0, q0, q8 ;e/f += 3
+ vadd.i16 q1, q1, q8 ;g/h += 3
+
vshr.s16 q0, q0, #3 ;e/f >> 3
vshr.s16 q1, q1, #3 ;g/h >> 3
- vtrn.32 d0, d2
- vtrn.32 d1, d3
- vtrn.16 d0, d1
- vtrn.16 d2, d3
+ vst4.i16 {d0,d1,d2,d3}, [r1@128]- vstmia.16 r1!, {q0}- vstmia.16 r1!, {q1}-
bx lr
ENDP ; |vp8_short_inv_walsh4x4_neon|
@@ -77,19 +67,13 @@
;short vp8_short_inv_walsh4x4_1_neon(short *input, short *output)
|vp8_short_inv_walsh4x4_1_neon| PROC
- ; load a full line into a neon register
- vld1.16 {q0}, [r0]- ; extract first element and replicate
- vdup.16 q1, d0[0]
- ; add 3 to all values
- vmov.i16 q2, #3
- vadd.i16 q3, q1, q2
- ; right shift
- vshr.s16 q3, q3, #3
- ; write it back
- vstmia.16 r1!, {q3}- vstmia.16 r1!, {q3}-
+ ldrsh r2, [r0] ; load input[0]
+ add r3, r2, #3 ; add 3
+ add r2, r1, #16 ; base for last 8 output
+ asr r0, r3, #3 ; right shift 3
+ vdup.16 q0, r0 ; load and duplicate
+ vst1.16 {q0}, [r1@128] ; write back 8+ vst1.16 {q0}, [r2@128] ; write back last 8bx lr
ENDP ; |vp8_short_inv_walsh4x4_1_neon|
--- a/vp8/encoder/block.h
+++ b/vp8/encoder/block.h
@@ -79,7 +79,6 @@
int errorperbit;
int sadperbit16;
int sadperbit4;
- int errthresh;
int rddiv;
int rdmult;
unsigned int * mb_activity_ptr;
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -562,9 +562,6 @@
x->vector_range = 32;
- // Count of MBs using the alternate Q if any
- cpi->alt_qcount = 0;
-
// Reset frame count of inter 0,0 motion vector useage.
cpi->inter_zz_count = 0;
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -27,10 +27,16 @@
#else
#define IF_RTCD(x) NULL
#endif
-void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode)
+
+
+void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
+ MACROBLOCK *x, int ib)
{+ BLOCKD *b = &x->e_mbd.block[ib];
+ BLOCK *be = &x->block[ib];
+
RECON_INVOKE(&rtcd->common->recon, intra4x4_predict)
- (b, best_mode, b->predictor);
+ (b, b->bmi.mode, b->predictor);
ENCODEMB_INVOKE(&rtcd->encodemb, subb)(be, b, 16);
@@ -51,13 +57,7 @@
vp8_intra_prediction_down_copy(x);
for (i = 0; i < 16; i++)
- {- BLOCK *be = &mb->block[i];
- BLOCKD *b = &x->block[i];
-
- vp8_encode_intra4x4block(rtcd, mb, be, b, b->bmi.mode);
- }
-
+ vp8_encode_intra4x4block(rtcd, mb, i);
return;
}
--- a/vp8/encoder/encodeintra.h
+++ b/vp8/encoder/encodeintra.h
@@ -16,6 +16,6 @@
void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *, MACROBLOCK *mb);
-void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *, MACROBLOCK *x, BLOCK *be, BLOCKD *b, int best_mode);
-
+void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd,
+ MACROBLOCK *x, int ib);
#endif
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -302,7 +302,6 @@
z->sadperbit16 = x->sadperbit16;
z->sadperbit4 = x->sadperbit4;
- z->errthresh = x->errthresh;
/*
z->mv_col_min = x->mv_col_min;
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -100,10 +100,8 @@
{for (i = 0; i < 16; i++)
{- BLOCKD *b = &x->e_mbd.block[i];
- BLOCK *be = &x->block[i];
-
- vp8_encode_intra4x4block(IF_RTCD(&cpi->rtcd), x, be, b, B_DC_PRED);
+ x->e_mbd.block[i].bmi.mode = B_DC_PRED;
+ vp8_encode_intra4x4block(IF_RTCD(&cpi->rtcd), x, i);
}
}
@@ -115,15 +113,15 @@
// Resets the first pass file to the given position using a relative seek from the current position
static void reset_fpf_position(VP8_COMP *cpi, FIRSTPASS_STATS *Position)
{- cpi->stats_in = Position;
+ cpi->twopass.stats_in = Position;
}
static int lookup_next_frame_stats(VP8_COMP *cpi, FIRSTPASS_STATS *next_frame)
{- if (cpi->stats_in >= cpi->stats_in_end)
+ if (cpi->twopass.stats_in >= cpi->twopass.stats_in_end)
return EOF;
- *next_frame = *cpi->stats_in;
+ *next_frame = *cpi->twopass.stats_in;
return 1;
}
@@ -130,7 +128,7 @@
// Calculate a modified Error used in distributing bits between easier and harder frames
static double calculate_modified_err(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
{- double av_err = cpi->total_stats->ssim_weighted_pred_err;
+ double av_err = cpi->twopass.total_stats->ssim_weighted_pred_err;
double this_err = this_frame->ssim_weighted_pred_err;
double modified_err;
@@ -142,7 +140,7 @@
//FIRSTPASS_STATS next_frame;
//FIRSTPASS_STATS *start_pos;
- /*start_pos = cpi->stats_in;
+ /*start_pos = cpi->twopass.stats_in;
sum_iiratio = 0.0;
i = 0;
while ( (i < 1) && input_stats(cpi,&next_frame) != EOF )
@@ -155,7 +153,7 @@
}
if ( i > 0 )
{- relative_next_iiratio = sum_iiratio / DOUBLE_DIVIDE_CHECK(cpi->avg_iiratio * (double)i);
+ relative_next_iiratio = sum_iiratio / DOUBLE_DIVIDE_CHECK(cpi->twopass.avg_iiratio * (double)i);
}
else
{@@ -269,7 +267,7 @@
else
{// For VBR base this on the bits and frames left plus the two_pass_vbrmax_section rate passed in by the user
- max_bits = (int)(((double)cpi->bits_left / (cpi->total_stats->count - (double)cpi->common.current_video_frame)) * ((double)cpi->oxcf.two_pass_vbrmax_section / 100.0));
+ max_bits = (int)(((double)cpi->twopass.bits_left / (cpi->twopass.total_stats->count - (double)cpi->common.current_video_frame)) * ((double)cpi->oxcf.two_pass_vbrmax_section / 100.0));
}
// Trap case where we are out of bits
@@ -324,11 +322,12 @@
static int input_stats(VP8_COMP *cpi, FIRSTPASS_STATS *fps)
{- if (cpi->stats_in >= cpi->stats_in_end)
+ if (cpi->twopass.stats_in >= cpi->twopass.stats_in_end)
return EOF;
- *fps = *cpi->stats_in;
- cpi->stats_in = (void*)((char *)cpi->stats_in + sizeof(FIRSTPASS_STATS));
+ *fps = *cpi->twopass.stats_in;
+ cpi->twopass.stats_in =
+ (void*)((char *)cpi->twopass.stats_in + sizeof(FIRSTPASS_STATS));
return 1;
}
@@ -396,12 +395,12 @@
void vp8_init_first_pass(VP8_COMP *cpi)
{- zero_stats(cpi->total_stats);
+ zero_stats(cpi->twopass.total_stats);
}
void vp8_end_first_pass(VP8_COMP *cpi)
{- output_stats(cpi, cpi->output_pkt_list, cpi->total_stats);
+ output_stats(cpi, cpi->output_pkt_list, cpi->twopass.total_stats);
}
static void zz_motion_search( VP8_COMP *cpi, MACROBLOCK * x, YV12_BUFFER_CONFIG * recon_buffer, int * best_motion_err, int recon_yoffset )
@@ -796,17 +795,17 @@
- cpi->source->ts_start;
// don't want to do output stats with a stack variable!
- memcpy(cpi->this_frame_stats,
+ memcpy(cpi->twopass.this_frame_stats,
&fps,
sizeof(FIRSTPASS_STATS));
- output_stats(cpi, cpi->output_pkt_list, cpi->this_frame_stats);
- accumulate_stats(cpi->total_stats, &fps);
+ output_stats(cpi, cpi->output_pkt_list, cpi->twopass.this_frame_stats);
+ accumulate_stats(cpi->twopass.total_stats, &fps);
}
// Copy the previous Last Frame into the GF buffer if specific conditions for doing so are met
if ((cm->current_video_frame > 0) &&
- (cpi->this_frame_stats->pcnt_inter > 0.20) &&
- ((cpi->this_frame_stats->intra_error / cpi->this_frame_stats->coded_error) > 2.0))
+ (cpi->twopass.this_frame_stats->pcnt_inter > 0.20) &&
+ ((cpi->twopass.this_frame_stats->intra_error / cpi->twopass.this_frame_stats->coded_error) > 2.0))
{vp8_yv12_copy_frame_ptr(lst_yv12, gld_yv12);
}
@@ -860,7 +859,7 @@
double pow_lowq = 0.40;
if (section_target_bandwitdh <= 0)
- return cpi->maxq_max_limit; // Highest value allowed
+ return cpi->twopass.maxq_max_limit; // Highest value allowed
target_norm_bits_per_mb = (section_target_bandwitdh < (1 << 20)) ? (512 * section_target_bandwitdh) / num_mbs : 512 * (section_target_bandwitdh / num_mbs);
@@ -869,17 +868,17 @@
{rolling_ratio = (double)cpi->rolling_actual_bits / (double)cpi->rolling_target_bits;
- //if ( cpi->est_max_qcorrection_factor > rolling_ratio )
+ //if ( cpi->twopass.est_max_qcorrection_factor > rolling_ratio )
if (rolling_ratio < 0.95)
- //cpi->est_max_qcorrection_factor *= adjustment_rate;
- cpi->est_max_qcorrection_factor -= 0.005;
- //else if ( cpi->est_max_qcorrection_factor < rolling_ratio )
+ //cpi->twopass.est_max_qcorrection_factor *= adjustment_rate;
+ cpi->twopass.est_max_qcorrection_factor -= 0.005;
+ //else if ( cpi->twopass.est_max_qcorrection_factor < rolling_ratio )
else if (rolling_ratio > 1.05)
- cpi->est_max_qcorrection_factor += 0.005;
+ cpi->twopass.est_max_qcorrection_factor += 0.005;
- //cpi->est_max_qcorrection_factor /= adjustment_rate;
+ //cpi->twopass.est_max_qcorrection_factor /= adjustment_rate;
- cpi->est_max_qcorrection_factor = (cpi->est_max_qcorrection_factor < 0.1) ? 0.1 : (cpi->est_max_qcorrection_factor > 10.0) ? 10.0 : cpi->est_max_qcorrection_factor;
+ cpi->twopass.est_max_qcorrection_factor = (cpi->twopass.est_max_qcorrection_factor < 0.1) ? 0.1 : (cpi->twopass.est_max_qcorrection_factor > 10.0) ? 10.0 : cpi->twopass.est_max_qcorrection_factor;
}
// Corrections for higher compression speed settings (reduced compression expected)
@@ -898,7 +897,7 @@
// Try and pick a max Q that will be high enough to encode the
// content at the given rate.
- for (Q = cpi->maxq_min_limit; Q < cpi->maxq_max_limit; Q++)
+ for (Q = cpi->twopass.maxq_min_limit; Q < cpi->twopass.maxq_max_limit; Q++)
{int bits_per_mb_at_this_q;
@@ -910,8 +909,11 @@
else
correction_factor = corr_high;
- bits_per_mb_at_this_q = (int)(.5 + correction_factor * speed_correction * cpi->est_max_qcorrection_factor * cpi->section_max_qfactor * (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
- //bits_per_mb_at_this_q = (int)(.5 + correction_factor * speed_correction * cpi->est_max_qcorrection_factor * (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
+ bits_per_mb_at_this_q = (int)(.5 + correction_factor
+ * speed_correction * cpi->twopass.est_max_qcorrection_factor
+ * cpi->twopass.section_max_qfactor
+ * (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
+ //bits_per_mb_at_this_q = (int)(.5 + correction_factor * speed_correction * cpi->twopass.est_max_qcorrection_factor * (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
if (bits_per_mb_at_this_q <= target_norm_bits_per_mb)
break;
@@ -930,12 +932,12 @@
// averaga q observed in clip for non kf/gf.arf frames
// Give average a chance to settle though.
if ( (cpi->ni_frames >
- ((unsigned int)cpi->total_stats->count >> 8)) &&
+ ((unsigned int)cpi->twopass.total_stats->count >> 8)) &&
(cpi->ni_frames > 150) )
{- cpi->maxq_max_limit = ((cpi->ni_av_qi + 32) < cpi->worst_quality)
+ cpi->twopass.maxq_max_limit = ((cpi->ni_av_qi + 32) < cpi->worst_quality)
? (cpi->ni_av_qi + 32) : cpi->worst_quality;
- cpi->maxq_min_limit = ((cpi->ni_av_qi - 32) > cpi->best_quality)
+ cpi->twopass.maxq_min_limit = ((cpi->ni_av_qi - 32) > cpi->best_quality)
? (cpi->ni_av_qi - 32) : cpi->best_quality;
}
@@ -982,7 +984,7 @@
else
correction_factor = corr_high;
- bits_per_mb_at_this_q = (int)(.5 + correction_factor * speed_correction * cpi->est_max_qcorrection_factor * (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
+ bits_per_mb_at_this_q = (int)(.5 + correction_factor * speed_correction * cpi->twopass.est_max_qcorrection_factor * (double)vp8_bits_per_mb[INTER_FRAME][Q] / 1.0);
if (bits_per_mb_at_this_q <= target_norm_bits_per_mb)
break;
@@ -1119,8 +1121,8 @@
speed_correction = 1.25;
}
// II ratio correction factor for clip as a whole
- clip_iiratio = cpi->total_stats->intra_error /
- DOUBLE_DIVIDE_CHECK(cpi->total_stats->coded_error);
+ clip_iiratio = cpi->twopass.total_stats->intra_error /
+ DOUBLE_DIVIDE_CHECK(cpi->twopass.total_stats->coded_error);
clip_iifactor = 1.0 - ((clip_iiratio - 10.0) * 0.025);
if (clip_iifactor < 0.80)
clip_iifactor = 0.80;
@@ -1168,20 +1170,20 @@
double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth * cpi->oxcf.two_pass_vbrmin_section / 100);
- zero_stats(cpi->total_stats);
+ zero_stats(cpi->twopass.total_stats);
- if (!cpi->stats_in_end)
+ if (!cpi->twopass.stats_in_end)
return;
- *cpi->total_stats = *cpi->stats_in_end;
+ *cpi->twopass.total_stats = *cpi->twopass.stats_in_end;
- cpi->total_error_left = cpi->total_stats->ssim_weighted_pred_err;
- cpi->total_intra_error_left = cpi->total_stats->intra_error;
- cpi->total_coded_error_left = cpi->total_stats->coded_error;
- cpi->start_tot_err_left = cpi->total_error_left;
+ cpi->twopass.total_error_left = cpi->twopass.total_stats->ssim_weighted_pred_err;
+ cpi->twopass.total_intra_error_left = cpi->twopass.total_stats->intra_error;
+ cpi->twopass.total_coded_error_left = cpi->twopass.total_stats->coded_error;
+ cpi->twopass.start_tot_err_left = cpi->twopass.total_error_left;
- //cpi->bits_left = (long long)(cpi->total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
- //cpi->bits_left -= (long long)(cpi->total_stats->count * two_pass_min_rate / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
+ //cpi->twopass.bits_left = (long long)(cpi->twopass.total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
+ //cpi->twopass.bits_left -= (long long)(cpi->twopass.total_stats->count * two_pass_min_rate / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
// each frame can have a different duration, as the frame rate in the source
// isn't guaranteed to be constant. The frame rate prior to the first frame
@@ -1188,21 +1190,21 @@
// encoded in the second pass is a guess. However the sum duration is not.
// Its calculated based on the actual durations of all frames from the first
// pass.
- vp8_new_frame_rate(cpi, 10000000.0 * cpi->total_stats->count / cpi->total_stats->duration);
+ vp8_new_frame_rate(cpi, 10000000.0 * cpi->twopass.total_stats->count / cpi->twopass.total_stats->duration);
cpi->output_frame_rate = cpi->oxcf.frame_rate;
- cpi->bits_left = (long long)(cpi->total_stats->duration * cpi->oxcf.target_bandwidth / 10000000.0) ;
- cpi->bits_left -= (long long)(cpi->total_stats->duration * two_pass_min_rate / 10000000.0);
- cpi->clip_bits_total = cpi->bits_left;
+ cpi->twopass.bits_left = (long long)(cpi->twopass.total_stats->duration * cpi->oxcf.target_bandwidth / 10000000.0) ;
+ cpi->twopass.bits_left -= (long long)(cpi->twopass.total_stats->duration * two_pass_min_rate / 10000000.0);
+ cpi->twopass.clip_bits_total = cpi->twopass.bits_left;
// Calculate a minimum intra value to be used in determining the IIratio
// scores used in the second pass. We have this minimum to make sure
// that clips that are static but "low complexity" in the intra domain
// are still boosted appropriately for KF/GF/ARF
- cpi->kf_intra_err_min = KF_MB_INTRA_MIN * cpi->common.MBs;
- cpi->gf_intra_err_min = GF_MB_INTRA_MIN * cpi->common.MBs;
+ cpi->twopass.kf_intra_err_min = KF_MB_INTRA_MIN * cpi->common.MBs;
+ cpi->twopass.gf_intra_err_min = GF_MB_INTRA_MIN * cpi->common.MBs;
- avg_stats(cpi->total_stats);
+ avg_stats(cpi->twopass.total_stats);
// Scan the first pass file and calculate an average Intra / Inter error score ratio for the sequence
{@@ -1209,7 +1211,7 @@
double sum_iiratio = 0.0;
double IIRatio;
- start_pos = cpi->stats_in; // Note starting "file" position
+ start_pos = cpi->twopass.stats_in; // Note starting "file" position
while (input_stats(cpi, &this_frame) != EOF)
{@@ -1218,7 +1220,7 @@
sum_iiratio += IIRatio;
}
- cpi->avg_iiratio = sum_iiratio / DOUBLE_DIVIDE_CHECK((double)cpi->total_stats->count);
+ cpi->twopass.avg_iiratio = sum_iiratio / DOUBLE_DIVIDE_CHECK((double)cpi->twopass.total_stats->count);
// Reset file position
reset_fpf_position(cpi, start_pos);
@@ -1227,26 +1229,20 @@
// Scan the first pass file and calculate a modified total error based upon the bias/power function
// used to allocate bits
{- start_pos = cpi->stats_in; // Note starting "file" position
+ start_pos = cpi->twopass.stats_in; // Note starting "file" position
- cpi->modified_error_total = 0.0;
- cpi->modified_error_used = 0.0;
+ cpi->twopass.modified_error_total = 0.0;
+ cpi->twopass.modified_error_used = 0.0;
while (input_stats(cpi, &this_frame) != EOF)
{- cpi->modified_error_total += calculate_modified_err(cpi, &this_frame);
+ cpi->twopass.modified_error_total += calculate_modified_err(cpi, &this_frame);
}
- cpi->modified_error_left = cpi->modified_error_total;
+ cpi->twopass.modified_error_left = cpi->twopass.modified_error_total;
reset_fpf_position(cpi, start_pos); // Reset file position
}
-
- // Calculate the clip target modified bits per error
- // The observed bpe starts as the same number.
- cpi->clip_bpe = cpi->bits_left /
- DOUBLE_DIVIDE_CHECK(cpi->modified_error_total);
- cpi->observed_bpe = cpi->clip_bpe;
}
void vp8_end_second_pass(VP8_COMP *cpi)
@@ -1310,7 +1306,7 @@
(decay_accumulator < 0.9) )
{int j;
- FIRSTPASS_STATS * position = cpi->stats_in;
+ FIRSTPASS_STATS * position = cpi->twopass.stats_in;
FIRSTPASS_STATS tmp_next_frame;
double decay_rate;
@@ -1366,12 +1362,12 @@
unsigned int allow_alt_ref =
cpi->oxcf.play_alternate && cpi->oxcf.lag_in_frames;
- cpi->gf_group_bits = 0;
- cpi->gf_decay_rate = 0;
+ cpi->twopass.gf_group_bits = 0;
+ cpi->twopass.gf_decay_rate = 0;
vp8_clear_system_state(); //__asm emms;
- start_pos = cpi->stats_in;
+ start_pos = cpi->twopass.stats_in;
vpx_memset(&next_frame, 0, sizeof(next_frame)); // assure clean
@@ -1393,9 +1389,9 @@
// or ARF that will be coded with the group
i = 0;
- while (((i < cpi->static_scene_max_gf_interval) ||
- ((cpi->frames_to_key - i) < MIN_GF_INTERVAL)) &&
- (i < cpi->frames_to_key))
+ while (((i < cpi->twopass.static_scene_max_gf_interval) ||
+ ((cpi->twopass.frames_to_key - i) < MIN_GF_INTERVAL)) &&
+ (i < cpi->twopass.frames_to_key))
{double r;
double this_frame_mvr_ratio;
@@ -1460,11 +1456,11 @@
( next_frame.intra_error /
DOUBLE_DIVIDE_CHECK(next_frame.coded_error)));
- if (next_frame.intra_error > cpi->gf_intra_err_min)
+ if (next_frame.intra_error > cpi->twopass.gf_intra_err_min)
r = (IIKFACTOR2 * next_frame.intra_error /
DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
else
- r = (IIKFACTOR2 * cpi->gf_intra_err_min /
+ r = (IIKFACTOR2 * cpi->twopass.gf_intra_err_min /
DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
// Increase boost for frames where new data coming into frame
@@ -1506,7 +1502,7 @@
// Dont break out with a very short interval
(i > MIN_GF_INTERVAL) &&
// Dont break out very close to a key frame
- ((cpi->frames_to_key - i) >= MIN_GF_INTERVAL) &&
+ ((cpi->twopass.frames_to_key - i) >= MIN_GF_INTERVAL) &&
((boost_score > 20.0) || (next_frame.pcnt_inter < 0.75)) &&
((mv_ratio_accumulator > 100.0) ||
(abs_mv_in_out_accumulator > 3.0) ||
@@ -1523,7 +1519,7 @@
old_boost_score = boost_score;
}
- cpi->gf_decay_rate =
+ cpi->twopass.gf_decay_rate =
(i > 0) ? (int)(100.0 * (1.0 - decay_accumulator)) / i : 0;
// When using CBR apply additional buffer related upper limits
@@ -1561,7 +1557,7 @@
if (allow_alt_ref &&
(i >= MIN_GF_INTERVAL) &&
// dont use ARF very near next kf
- (i <= (cpi->frames_to_key - MIN_GF_INTERVAL)) &&
+ (i <= (cpi->twopass.frames_to_key - MIN_GF_INTERVAL)) &&
(((next_frame.pcnt_inter > 0.75) &&
((mv_in_out_accumulator / (double)i > -0.2) || (mv_in_out_accumulator > -2.0)) &&
//(cpi->gfu_boost>150) &&
@@ -1569,7 +1565,7 @@
//(cpi->gfu_boost>AF_THRESH2) &&
//((cpi->gfu_boost/i)>AF_THRESH) &&
//(decay_accumulator > 0.5) &&
- (cpi->gf_decay_rate <= (ARF_DECAY_THRESH + (cpi->gfu_boost / 200)))
+ (cpi->twopass.gf_decay_rate <= (ARF_DECAY_THRESH + (cpi->gfu_boost / 200)))
)
)
)
@@ -1582,8 +1578,8 @@
int group_bits;
// Estimate the bits to be allocated to the group as a whole
- if ((cpi->kf_group_bits > 0) && (cpi->kf_group_error_left > 0))
- group_bits = (int)((double)cpi->kf_group_bits * (gf_group_err / (double)cpi->kf_group_error_left));
+ if ((cpi->twopass.kf_group_bits > 0) && (cpi->twopass.kf_group_error_left > 0))
+ group_bits = (int)((double)cpi->twopass.kf_group_bits * (gf_group_err / (double)cpi->twopass.kf_group_error_left));
else
group_bits = 0;
@@ -1630,7 +1626,7 @@
// Note: this_frame->frame has been updated in the loop
// so it now points at the ARF frame.
half_gf_int = cpi->baseline_gf_interval >> 1;
- frames_after_arf = cpi->total_stats->count - this_frame->frame - 1;
+ frames_after_arf = cpi->twopass.total_stats->count - this_frame->frame - 1;
switch (cpi->oxcf.arnr_type)
{@@ -1683,9 +1679,9 @@
if (!cpi->source_alt_ref_pending)
{// Dont allow conventional gf too near the next kf
- if ((cpi->frames_to_key - cpi->baseline_gf_interval) < MIN_GF_INTERVAL)
+ if ((cpi->twopass.frames_to_key - cpi->baseline_gf_interval) < MIN_GF_INTERVAL)
{- while (cpi->baseline_gf_interval < cpi->frames_to_key)
+ while (cpi->baseline_gf_interval < cpi->twopass.frames_to_key)
{if (EOF == input_stats(cpi, this_frame))
break;
@@ -1692,7 +1688,7 @@
cpi->baseline_gf_interval++;
- if (cpi->baseline_gf_interval < cpi->frames_to_key)
+ if (cpi->baseline_gf_interval < cpi->twopass.frames_to_key)
gf_group_err += calculate_modified_err(cpi, this_frame);
}
}
@@ -1699,30 +1695,30 @@
}
// Now decide how many bits should be allocated to the GF group as a proportion of those remaining in the kf group.
- // The final key frame group in the clip is treated as a special case where cpi->kf_group_bits is tied to cpi->bits_left.
+ // The final key frame group in the clip is treated as a special case where cpi->twopass.kf_group_bits is tied to cpi->twopass.bits_left.
// This is also important for short clips where there may only be one key frame.
- if (cpi->frames_to_key >= (int)(cpi->total_stats->count - cpi->common.current_video_frame))
+ if (cpi->twopass.frames_to_key >= (int)(cpi->twopass.total_stats->count - cpi->common.current_video_frame))
{- cpi->kf_group_bits = (cpi->bits_left > 0) ? cpi->bits_left : 0;
+ cpi->twopass.kf_group_bits = (cpi->twopass.bits_left > 0) ? cpi->twopass.bits_left : 0;
}
// Calculate the bits to be allocated to the group as a whole
- if ((cpi->kf_group_bits > 0) && (cpi->kf_group_error_left > 0))
- cpi->gf_group_bits = (int)((double)cpi->kf_group_bits * (gf_group_err / (double)cpi->kf_group_error_left));
+ if ((cpi->twopass.kf_group_bits > 0) && (cpi->twopass.kf_group_error_left > 0))
+ cpi->twopass.gf_group_bits = (int)((double)cpi->twopass.kf_group_bits * (gf_group_err / (double)cpi->twopass.kf_group_error_left));
else
- cpi->gf_group_bits = 0;
+ cpi->twopass.gf_group_bits = 0;
- cpi->gf_group_bits = (cpi->gf_group_bits < 0) ? 0 : (cpi->gf_group_bits > cpi->kf_group_bits) ? cpi->kf_group_bits : cpi->gf_group_bits;
+ cpi->twopass.gf_group_bits = (cpi->twopass.gf_group_bits < 0) ? 0 : (cpi->twopass.gf_group_bits > cpi->twopass.kf_group_bits) ? cpi->twopass.kf_group_bits : cpi->twopass.gf_group_bits;
- // Clip cpi->gf_group_bits based on user supplied data rate variability limit (cpi->oxcf.two_pass_vbrmax_section)
- if (cpi->gf_group_bits > max_bits * cpi->baseline_gf_interval)
- cpi->gf_group_bits = max_bits * cpi->baseline_gf_interval;
+ // Clip cpi->twopass.gf_group_bits based on user supplied data rate variability limit (cpi->oxcf.two_pass_vbrmax_section)
+ if (cpi->twopass.gf_group_bits > max_bits * cpi->baseline_gf_interval)
+ cpi->twopass.gf_group_bits = max_bits * cpi->baseline_gf_interval;
// Reset the file position
reset_fpf_position(cpi, start_pos);
// Update the record of error used so far (only done once per gf group)
- cpi->modified_error_used += gf_group_err;
+ cpi->twopass.modified_error_used += gf_group_err;
// Assign bits to the arf or gf.
{@@ -1771,7 +1767,7 @@
}
// Calculate the number of bits to be spent on the gf or arf based on the boost number
- cpi->gf_bits = (int)((double)Boost * (cpi->gf_group_bits / (double)allocation_chunks));
+ cpi->twopass.gf_bits = (int)((double)Boost * (cpi->twopass.gf_group_bits / (double)allocation_chunks));
// If the frame that is to be boosted is simpler than the average for
// the gf/arf group then use an alternative calculation
@@ -1782,16 +1778,16 @@
int alt_gf_bits;
alt_gf_grp_bits =
- (double)cpi->kf_group_bits *
+ (double)cpi->twopass.kf_group_bits *
(mod_frame_err * (double)cpi->baseline_gf_interval) /
- DOUBLE_DIVIDE_CHECK((double)cpi->kf_group_error_left);
+ DOUBLE_DIVIDE_CHECK((double)cpi->twopass.kf_group_error_left);
alt_gf_bits = (int)((double)Boost * (alt_gf_grp_bits /
(double)allocation_chunks));
- if (cpi->gf_bits > alt_gf_bits)
+ if (cpi->twopass.gf_bits > alt_gf_bits)
{- cpi->gf_bits = alt_gf_bits;
+ cpi->twopass.gf_bits = alt_gf_bits;
}
}
// Else if it is harder than other frames in the group make sure it at
@@ -1800,13 +1796,13 @@
else
{int alt_gf_bits =
- (int)((double)cpi->kf_group_bits *
+ (int)((double)cpi->twopass.kf_group_bits *
mod_frame_err /
- DOUBLE_DIVIDE_CHECK((double)cpi->kf_group_error_left));
+ DOUBLE_DIVIDE_CHECK((double)cpi->twopass.kf_group_error_left));
- if (alt_gf_bits > cpi->gf_bits)
+ if (alt_gf_bits > cpi->twopass.gf_bits)
{- cpi->gf_bits = alt_gf_bits;
+ cpi->twopass.gf_bits = alt_gf_bits;
}
}
@@ -1813,32 +1809,32 @@
// Apply an additional limit for CBR
if (cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER)
{- if (cpi->gf_bits > (cpi->buffer_level >> 1))
- cpi->gf_bits = cpi->buffer_level >> 1;
+ if (cpi->twopass.gf_bits > (cpi->buffer_level >> 1))
+ cpi->twopass.gf_bits = cpi->buffer_level >> 1;
}
// Dont allow a negative value for gf_bits
- if (cpi->gf_bits < 0)
- cpi->gf_bits = 0;
+ if (cpi->twopass.gf_bits < 0)
+ cpi->twopass.gf_bits = 0;
// Adjust KF group bits and error remainin
- cpi->kf_group_error_left -= gf_group_err;
- cpi->kf_group_bits -= cpi->gf_group_bits;
+ cpi->twopass.kf_group_error_left -= gf_group_err;
+ cpi->twopass.kf_group_bits -= cpi->twopass.gf_group_bits;
- if (cpi->kf_group_bits < 0)
- cpi->kf_group_bits = 0;
+ if (cpi->twopass.kf_group_bits < 0)
+ cpi->twopass.kf_group_bits = 0;
// Note the error score left in the remaining frames of the group.
// For normal GFs we want to remove the error score for the first frame of the group (except in Key frame case where this has already happened)
if (!cpi->source_alt_ref_pending && cpi->common.frame_type != KEY_FRAME)
- cpi->gf_group_error_left = gf_group_err - gf_first_frame_err;
+ cpi->twopass.gf_group_error_left = gf_group_err - gf_first_frame_err;
else
- cpi->gf_group_error_left = gf_group_err;
+ cpi->twopass.gf_group_error_left = gf_group_err;
- cpi->gf_group_bits -= cpi->gf_bits;
+ cpi->twopass.gf_group_bits -= cpi->twopass.gf_bits;
- if (cpi->gf_group_bits < 0)
- cpi->gf_group_bits = 0;
+ if (cpi->twopass.gf_group_bits < 0)
+ cpi->twopass.gf_group_bits = 0;
// Set aside some bits for a mid gf sequence boost
if ((cpi->gfu_boost > 150) && (cpi->baseline_gf_interval > 5))
@@ -1846,18 +1842,18 @@
int pct_extra = (cpi->gfu_boost - 100) / 50;
pct_extra = (pct_extra > 10) ? 10 : pct_extra;
- cpi->mid_gf_extra_bits = (cpi->gf_group_bits * pct_extra) / 100;
- cpi->gf_group_bits -= cpi->mid_gf_extra_bits;
+ cpi->twopass.mid_gf_extra_bits = (cpi->twopass.gf_group_bits * pct_extra) / 100;
+ cpi->twopass.gf_group_bits -= cpi->twopass.mid_gf_extra_bits;
}
else
- cpi->mid_gf_extra_bits = 0;
+ cpi->twopass.mid_gf_extra_bits = 0;
- cpi->gf_bits += cpi->min_frame_bandwidth; // Add in minimum for a frame
+ cpi->twopass.gf_bits += cpi->min_frame_bandwidth; // Add in minimum for a frame
}
if (!cpi->source_alt_ref_pending && (cpi->common.frame_type != KEY_FRAME)) // Normal GF and not a KF
{- cpi->per_frame_bandwidth = cpi->gf_bits; // Per frame bit target for this frame
+ cpi->per_frame_bandwidth = cpi->twopass.gf_bits; // Per frame bit target for this frame
}
// Adjustment to estimate_max_q based on a measure of complexity of the section
@@ -1877,7 +1873,7 @@
avg_stats(§ionstats);
- cpi->section_intra_rating =
+ cpi->twopass.section_intra_rating =
sectionstats.intra_error /
DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
@@ -1884,14 +1880,14 @@
Ratio = sectionstats.intra_error / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
//if( (Ratio > 11) ) //&& (sectionstats.pcnt_second_ref < .20) )
//{- cpi->section_max_qfactor = 1.0 - ((Ratio - 10.0) * 0.025);
+ cpi->twopass.section_max_qfactor = 1.0 - ((Ratio - 10.0) * 0.025);
- if (cpi->section_max_qfactor < 0.80)
- cpi->section_max_qfactor = 0.80;
+ if (cpi->twopass.section_max_qfactor < 0.80)
+ cpi->twopass.section_max_qfactor = 0.80;
//}
//else
- // cpi->section_max_qfactor = 1.0;
+ // cpi->twopass.section_max_qfactor = 1.0;
reset_fpf_position(cpi, start_pos);
}
@@ -1908,22 +1904,22 @@
int max_bits = frame_max_bits(cpi); // Max for a single frame
// The final few frames have special treatment
- if (cpi->frames_till_gf_update_due >= (int)(cpi->total_stats->count - cpi->common.current_video_frame))
+ if (cpi->frames_till_gf_update_due >= (int)(cpi->twopass.total_stats->count - cpi->common.current_video_frame))
{- cpi->gf_group_bits = (cpi->bits_left > 0) ? cpi->bits_left : 0;;
+ cpi->twopass.gf_group_bits = (cpi->twopass.bits_left > 0) ? cpi->twopass.bits_left : 0;;
}
// Calculate modified prediction error used in bit allocation
modified_err = calculate_modified_err(cpi, this_frame);
- if (cpi->gf_group_error_left > 0)
- err_fraction = modified_err / cpi->gf_group_error_left; // What portion of the remaining GF group error is used by this frame
+ if (cpi->twopass.gf_group_error_left > 0)
+ err_fraction = modified_err / cpi->twopass.gf_group_error_left; // What portion of the remaining GF group error is used by this frame
else
err_fraction = 0.0;
- target_frame_size = (int)((double)cpi->gf_group_bits * err_fraction); // How many of those bits available for allocation should we give it?
+ target_frame_size = (int)((double)cpi->twopass.gf_group_bits * err_fraction); // How many of those bits available for allocation should we give it?
- // Clip to target size to 0 - max_bits (or cpi->gf_group_bits) at the top end.
+ // Clip to target size to 0 - max_bits (or cpi->twopass.gf_group_bits) at the top end.
if (target_frame_size < 0)
target_frame_size = 0;
else
@@ -1931,21 +1927,21 @@
if (target_frame_size > max_bits)
target_frame_size = max_bits;
- if (target_frame_size > cpi->gf_group_bits)
- target_frame_size = cpi->gf_group_bits;
+ if (target_frame_size > cpi->twopass.gf_group_bits)
+ target_frame_size = cpi->twopass.gf_group_bits;
}
- cpi->gf_group_error_left -= modified_err; // Adjust error remaining
- cpi->gf_group_bits -= target_frame_size; // Adjust bits remaining
+ cpi->twopass.gf_group_error_left -= modified_err; // Adjust error remaining
+ cpi->twopass.gf_group_bits -= target_frame_size; // Adjust bits remaining
- if (cpi->gf_group_bits < 0)
- cpi->gf_group_bits = 0;
+ if (cpi->twopass.gf_group_bits < 0)
+ cpi->twopass.gf_group_bits = 0;
target_frame_size += cpi->min_frame_bandwidth; // Add in the minimum number of bits that is set aside for every frame.
// Special case for the frame that lies half way between two gfs
if (cpi->common.frames_since_golden == cpi->baseline_gf_interval / 2)
- target_frame_size += cpi->mid_gf_extra_bits;
+ target_frame_size += cpi->twopass.mid_gf_extra_bits;
cpi->per_frame_bandwidth = target_frame_size; // Per frame bit target for this frame
}
@@ -1953,7 +1949,7 @@
void vp8_second_pass(VP8_COMP *cpi)
{int tmp_q;
- int frames_left = (int)(cpi->total_stats->count - cpi->common.current_video_frame);
+ int frames_left = (int)(cpi->twopass.total_stats->count - cpi->common.current_video_frame);
FIRSTPASS_STATS this_frame;
FIRSTPASS_STATS this_frame_copy;
@@ -1964,7 +1960,7 @@
FIRSTPASS_STATS *start_pos;
- if (!cpi->stats_in)
+ if (!cpi->twopass.stats_in)
{return ;
}
@@ -1978,17 +1974,10 @@
this_frame_intra_error = this_frame.intra_error;
this_frame_coded_error = this_frame.coded_error;
- // Store information regarding level of motion etc for use mode decisions.
- cpi->motion_speed = (int)(fabs(this_frame.MVr) + fabs(this_frame.MVc));
- cpi->motion_var = (int)(fabs(this_frame.MVrv) + fabs(this_frame.MVcv));
- cpi->inter_lvl = (int)(this_frame.pcnt_inter * 100);
- cpi->intra_lvl = (int)((1.0 - this_frame.pcnt_inter) * 100);
- cpi->motion_lvl = (int)(this_frame.pcnt_motion * 100);
+ start_pos = cpi->twopass.stats_in;
- start_pos = cpi->stats_in;
-
// keyframe and section processing !
- if (cpi->frames_to_key == 0)
+ if (cpi->twopass.frames_to_key == 0)
{// Define next KF group and assign bits to it
vpx_memcpy(&this_frame_copy, &this_frame, sizeof(this_frame));
@@ -1999,9 +1988,9 @@
// This is temporary code till we decide what should really happen in this case.
if (cpi->oxcf.error_resilient_mode)
{- cpi->gf_group_bits = cpi->kf_group_bits;
- cpi->gf_group_error_left = cpi->kf_group_error_left;
- cpi->baseline_gf_interval = cpi->frames_to_key;
+ cpi->twopass.gf_group_bits = cpi->twopass.kf_group_bits;
+ cpi->twopass.gf_group_error_left = cpi->twopass.kf_group_error_left;
+ cpi->baseline_gf_interval = cpi->twopass.frames_to_key;
cpi->frames_till_gf_update_due = cpi->baseline_gf_interval;
cpi->source_alt_ref_pending = FALSE;
}
@@ -2011,16 +2000,6 @@
// Is this a GF / ARF (Note that a KF is always also a GF)
if (cpi->frames_till_gf_update_due == 0)
{- // Update monitor of the bits per error observed so far.
- // Done once per gf group based on what has gone before
- // so do nothing if this is the first frame.
- if (cpi->common.current_video_frame > 0)
- {- cpi->observed_bpe =
- (double)(cpi->clip_bits_total - cpi->bits_left) /
- cpi->modified_error_used;
- }
-
// Define next gf group and assign bits to it
vpx_memcpy(&this_frame_copy, &this_frame, sizeof(this_frame));
define_gf_group(cpi, &this_frame_copy);
@@ -2043,8 +2022,8 @@
pct_extra = (pct_extra > 20) ? 20 : pct_extra;
- extra_bits = (cpi->gf_group_bits * pct_extra) / 100;
- cpi->gf_group_bits -= extra_bits;
+ extra_bits = (cpi->twopass.gf_group_bits * pct_extra) / 100;
+ cpi->twopass.gf_group_bits -= extra_bits;
cpi->per_frame_bandwidth += extra_bits;
}
}
@@ -2058,7 +2037,7 @@
// This is temporary code till we decide what should really happen in this case.
if (cpi->oxcf.error_resilient_mode)
{- cpi->frames_till_gf_update_due = cpi->frames_to_key;
+ cpi->frames_till_gf_update_due = cpi->twopass.frames_to_key;
if (cpi->common.frame_type != KEY_FRAME)
{@@ -2076,13 +2055,13 @@
}
// Keep a globally available copy of this and the next frame's iiratio.
- cpi->this_iiratio = this_frame_intra_error /
+ cpi->twopass.this_iiratio = this_frame_intra_error /
DOUBLE_DIVIDE_CHECK(this_frame_coded_error);
{FIRSTPASS_STATS next_frame;
if ( lookup_next_frame_stats(cpi, &next_frame) != EOF )
{- cpi->next_iiratio = next_frame.intra_error /
+ cpi->twopass.next_iiratio = next_frame.intra_error /
DOUBLE_DIVIDE_CHECK(next_frame.coded_error);
}
}
@@ -2094,7 +2073,7 @@
if (cpi->common.current_video_frame == 0)
{- cpi->est_max_qcorrection_factor = 1.0;
+ cpi->twopass.est_max_qcorrection_factor = 1.0;
// Experimental code to try and set a cq_level in constrained
// quality mode.
@@ -2104,8 +2083,8 @@
est_cq =
estimate_cq( cpi,
- (cpi->total_coded_error_left / frames_left),
- (int)(cpi->bits_left / frames_left));
+ (cpi->twopass.total_coded_error_left / frames_left),
+ (int)(cpi->twopass.bits_left / frames_left));
cpi->cq_target_quality = cpi->oxcf.cq_level;
if ( est_cq > cpi->cq_target_quality )
@@ -2113,11 +2092,11 @@
}
// guess at maxq needed in 2nd pass
- cpi->maxq_max_limit = cpi->worst_quality;
- cpi->maxq_min_limit = cpi->best_quality;
+ cpi->twopass.maxq_max_limit = cpi->worst_quality;
+ cpi->twopass.maxq_min_limit = cpi->best_quality;
tmp_q = estimate_max_q( cpi,
- (cpi->total_coded_error_left / frames_left),
- (int)(cpi->bits_left / frames_left));
+ (cpi->twopass.total_coded_error_left / frames_left),
+ (int)(cpi->twopass.bits_left / frames_left));
// Limit the maxq value returned subsequently.
// This increases the risk of overspend or underspend if the initial
@@ -2124,9 +2103,9 @@
// estimate for the clip is bad, but helps prevent excessive
// variation in Q, especially near the end of a clip
// where for example a small overspend may cause Q to crash
- cpi->maxq_max_limit = ((tmp_q + 32) < cpi->worst_quality)
+ cpi->twopass.maxq_max_limit = ((tmp_q + 32) < cpi->worst_quality)
? (tmp_q + 32) : cpi->worst_quality;
- cpi->maxq_min_limit = ((tmp_q - 32) > cpi->best_quality)
+ cpi->twopass.maxq_min_limit = ((tmp_q - 32) > cpi->best_quality)
? (tmp_q - 32) : cpi->best_quality;
cpi->active_worst_quality = tmp_q;
@@ -2138,14 +2117,14 @@
// radical adjustments to the allowed quantizer range just to use up a
// few surplus bits or get beneath the target rate.
else if ( (cpi->common.current_video_frame <
- (((unsigned int)cpi->total_stats->count * 255)>>8)) &&
+ (((unsigned int)cpi->twopass.total_stats->count * 255)>>8)) &&
((cpi->common.current_video_frame + cpi->baseline_gf_interval) <
- (unsigned int)cpi->total_stats->count) )
+ (unsigned int)cpi->twopass.total_stats->count) )
{if (frames_left < 1)
frames_left = 1;
- tmp_q = estimate_max_q(cpi, (cpi->total_coded_error_left / frames_left), (int)(cpi->bits_left / frames_left));
+ tmp_q = estimate_max_q(cpi, (cpi->twopass.total_coded_error_left / frames_left), (int)(cpi->twopass.bits_left / frames_left));
// Move active_worst_quality but in a damped way
if (tmp_q > cpi->active_worst_quality)
@@ -2156,10 +2135,10 @@
cpi->active_worst_quality = ((cpi->active_worst_quality * 3) + tmp_q + 2) / 4;
}
- cpi->frames_to_key --;
- cpi->total_error_left -= this_frame_error;
- cpi->total_intra_error_left -= this_frame_intra_error;
- cpi->total_coded_error_left -= this_frame_coded_error;
+ cpi->twopass.frames_to_key --;
+ cpi->twopass.total_error_left -= this_frame_error;
+ cpi->twopass.total_intra_error_left -= this_frame_intra_error;
+ cpi->twopass.total_coded_error_left -= this_frame_coded_error;
}
@@ -2196,7 +2175,7 @@
vpx_memcpy(&local_next_frame, next_frame, sizeof(*next_frame));
// Note the starting file position so we can reset to it
- start_pos = cpi->stats_in;
+ start_pos = cpi->twopass.stats_in;
// Examine how well the key frame predicts subsequent frames
for (i = 0 ; i < 16; i++)
@@ -2273,7 +2252,7 @@
vpx_memset(&next_frame, 0, sizeof(next_frame)); // assure clean
vp8_clear_system_state(); //__asm emms;
- start_position = cpi->stats_in;
+ start_position = cpi->twopass.stats_in;
cpi->common.frame_type = KEY_FRAME;
@@ -2286,19 +2265,19 @@
// Kf is always a gf so clear frames till next gf counter
cpi->frames_till_gf_update_due = 0;
- cpi->frames_to_key = 1;
+ cpi->twopass.frames_to_key = 1;
// Take a copy of the initial frame details
vpx_memcpy(&first_frame, this_frame, sizeof(*this_frame));
- cpi->kf_group_bits = 0; // Total bits avaialable to kf group
- cpi->kf_group_error_left = 0; // Group modified error score.
+ cpi->twopass.kf_group_bits = 0; // Total bits avaialable to kf group
+ cpi->twopass.kf_group_error_left = 0; // Group modified error score.
kf_mod_err = calculate_modified_err(cpi, this_frame);
// find the next keyframe
i = 0;
- while (cpi->stats_in < cpi->stats_in_end)
+ while (cpi->twopass.stats_in < cpi->twopass.stats_in_end)
{// Accumulate kf group error
kf_group_err += calculate_modified_err(cpi, this_frame);
@@ -2345,14 +2324,14 @@
// Step on to the next frame
- cpi->frames_to_key ++;
+ cpi->twopass.frames_to_key ++;
// If we don't have a real key frame within the next two
// forcekeyframeevery intervals then break out of the loop.
- if (cpi->frames_to_key >= 2 *(int)cpi->key_frame_frequency)
+ if (cpi->twopass.frames_to_key >= 2 *(int)cpi->key_frame_frequency)
break;
} else
- cpi->frames_to_key ++;
+ cpi->twopass.frames_to_key ++;
i++;
}
@@ -2362,12 +2341,12 @@
// This code centers the extra kf if the actual natural
// interval is between 1x and 2x
if (cpi->oxcf.auto_key
- && cpi->frames_to_key > (int)cpi->key_frame_frequency )
+ && cpi->twopass.frames_to_key > (int)cpi->key_frame_frequency )
{- FIRSTPASS_STATS *current_pos = cpi->stats_in;
+ FIRSTPASS_STATS *current_pos = cpi->twopass.stats_in;
FIRSTPASS_STATS tmp_frame;
- cpi->frames_to_key /= 2;
+ cpi->twopass.frames_to_key /= 2;
// Copy first frame details
vpx_memcpy(&tmp_frame, &first_frame, sizeof(first_frame));
@@ -2380,7 +2359,7 @@
kf_group_coded_err = 0;
// Rescan to get the correct error data for the forced kf group
- for( i = 0; i < cpi->frames_to_key; i++ )
+ for( i = 0; i < cpi->twopass.frames_to_key; i++ )
{// Accumulate kf group errors
kf_group_err += calculate_modified_err(cpi, &tmp_frame);
@@ -2400,7 +2379,7 @@
cpi->next_key_frame_forced = FALSE;
// Special case for the last frame of the file
- if (cpi->stats_in >= cpi->stats_in_end)
+ if (cpi->twopass.stats_in >= cpi->twopass.stats_in_end)
{// Accumulate kf group error
kf_group_err += calculate_modified_err(cpi, this_frame);
@@ -2412,7 +2391,7 @@
}
// Calculate the number of bits that should be assigned to the kf group.
- if ((cpi->bits_left > 0) && (cpi->modified_error_left > 0.0))
+ if ((cpi->twopass.bits_left > 0) && (cpi->twopass.modified_error_left > 0.0))
{// Max for a single normal frame (not key frame)
int max_bits = frame_max_bits(cpi);
@@ -2422,14 +2401,14 @@
// Default allocation based on bits left and relative
// complexity of the section
- cpi->kf_group_bits = (long long)( cpi->bits_left *
+ cpi->twopass.kf_group_bits = (long long)( cpi->twopass.bits_left *
( kf_group_err /
- cpi->modified_error_left ));
+ cpi->twopass.modified_error_left ));
// Clip based on maximum per frame rate defined by the user.
- max_grp_bits = (long long)max_bits * (long long)cpi->frames_to_key;
- if (cpi->kf_group_bits > max_grp_bits)
- cpi->kf_group_bits = max_grp_bits;
+ max_grp_bits = (long long)max_bits * (long long)cpi->twopass.frames_to_key;
+ if (cpi->twopass.kf_group_bits > max_grp_bits)
+ cpi->twopass.kf_group_bits = max_grp_bits;
// Additional special case for CBR if buffer is getting full.
if (cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER)
@@ -2448,7 +2427,7 @@
// Av bits per frame * number of frames
av_group_bits = (long long)cpi->av_per_frame_bandwidth *
- (long long)cpi->frames_to_key;
+ (long long)cpi->twopass.frames_to_key;
// We are at or above the maximum.
if (cpi->buffer_level >= high_water_mark)
@@ -2459,16 +2438,16 @@
(long long)(buffer_lvl -
high_water_mark);
- if (cpi->kf_group_bits < min_group_bits)
- cpi->kf_group_bits = min_group_bits;
+ if (cpi->twopass.kf_group_bits < min_group_bits)
+ cpi->twopass.kf_group_bits = min_group_bits;
}
// We are above optimal but below the maximum
- else if (cpi->kf_group_bits < av_group_bits)
+ else if (cpi->twopass.kf_group_bits < av_group_bits)
{long long bits_below_av = av_group_bits -
- cpi->kf_group_bits;
+ cpi->twopass.kf_group_bits;
- cpi->kf_group_bits +=
+ cpi->twopass.kf_group_bits +=
(long long)((double)bits_below_av *
(double)(buffer_lvl - opt_buffer_lvl) /
(double)(high_water_mark - opt_buffer_lvl));
@@ -2477,7 +2456,7 @@
}
}
else
- cpi->kf_group_bits = 0;
+ cpi->twopass.kf_group_bits = 0;
// Reset the first pass file position
reset_fpf_position(cpi, start_position);
@@ -2487,7 +2466,7 @@
boost_score = 0.0;
loop_decay_rate = 1.00; // Starting decay rate
- for (i = 0 ; i < cpi->frames_to_key ; i++)
+ for (i = 0 ; i < cpi->twopass.frames_to_key ; i++)
{double r;
@@ -2494,11 +2473,11 @@
if (EOF == input_stats(cpi, &next_frame))
break;
- if (next_frame.intra_error > cpi->kf_intra_err_min)
+ if (next_frame.intra_error > cpi->twopass.kf_intra_err_min)
r = (IIKFACTOR2 * next_frame.intra_error /
DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
else
- r = (IIKFACTOR2 * cpi->kf_intra_err_min /
+ r = (IIKFACTOR2 * cpi->twopass.kf_intra_err_min /
DOUBLE_DIVIDE_CHECK(next_frame.coded_error));
if (r > RMAX)
@@ -2529,7 +2508,7 @@
zero_stats(§ionstats);
reset_fpf_position(cpi, start_position);
- for (i = 0 ; i < cpi->frames_to_key ; i++)
+ for (i = 0 ; i < cpi->twopass.frames_to_key ; i++)
{input_stats(cpi, &next_frame);
accumulate_stats(§ionstats, &next_frame);
@@ -2537,19 +2516,21 @@
avg_stats(§ionstats);
- cpi->section_intra_rating = sectionstats.intra_error / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
+ cpi->twopass.section_intra_rating =
+ sectionstats.intra_error
+ / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
Ratio = sectionstats.intra_error / DOUBLE_DIVIDE_CHECK(sectionstats.coded_error);
// if( (Ratio > 11) ) //&& (sectionstats.pcnt_second_ref < .20) )
//{- cpi->section_max_qfactor = 1.0 - ((Ratio - 10.0) * 0.025);
+ cpi->twopass.section_max_qfactor = 1.0 - ((Ratio - 10.0) * 0.025);
- if (cpi->section_max_qfactor < 0.80)
- cpi->section_max_qfactor = 0.80;
+ if (cpi->twopass.section_max_qfactor < 0.80)
+ cpi->twopass.section_max_qfactor = 0.80;
//}
//else
- // cpi->section_max_qfactor = 1.0;
+ // cpi->twopass.section_max_qfactor = 1.0;
}
// When using CBR apply additional buffer fullness related upper limits
@@ -2587,7 +2568,7 @@
{int kf_boost = boost_score;
int allocation_chunks;
- int Counter = cpi->frames_to_key;
+ int Counter = cpi->twopass.frames_to_key;
int alt_kf_bits;
YV12_BUFFER_CONFIG *lst_yv12 = &cpi->common.yv12_fb[cpi->common.lst_fb_idx];
// Min boost based on kf interval
@@ -2627,7 +2608,7 @@
// The second (optionaly) on the key frames own error if this is smaller than the average for the group.
// The final one insures that the frame receives at least the allocation it would have received based on its own error score vs the error score remaining
- allocation_chunks = ((cpi->frames_to_key - 1) * 100) + kf_boost; // cpi->frames_to_key-1 because key frame itself is taken care of by kf_boost
+ allocation_chunks = ((cpi->twopass.frames_to_key - 1) * 100) + kf_boost; // cpi->twopass.frames_to_key-1 because key frame itself is taken care of by kf_boost
// Normalize Altboost and allocations chunck down to prevent overflow
while (kf_boost > 1000)
@@ -2636,16 +2617,16 @@
allocation_chunks /= 2;
}
- cpi->kf_group_bits = (cpi->kf_group_bits < 0) ? 0 : cpi->kf_group_bits;
+ cpi->twopass.kf_group_bits = (cpi->twopass.kf_group_bits < 0) ? 0 : cpi->twopass.kf_group_bits;
// Calculate the number of bits to be spent on the key frame
- cpi->kf_bits = (int)((double)kf_boost * ((double)cpi->kf_group_bits / (double)allocation_chunks));
+ cpi->twopass.kf_bits = (int)((double)kf_boost * ((double)cpi->twopass.kf_group_bits / (double)allocation_chunks));
// Apply an additional limit for CBR
if (cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER)
{- if (cpi->kf_bits > ((3 * cpi->buffer_level) >> 2))
- cpi->kf_bits = (3 * cpi->buffer_level) >> 2;
+ if (cpi->twopass.kf_bits > ((3 * cpi->buffer_level) >> 2))
+ cpi->twopass.kf_bits = (3 * cpi->buffer_level) >> 2;
}
// If the key frame is actually easier than the average for the
@@ -2652,19 +2633,19 @@
// kf group (which does sometimes happen... eg a blank intro frame)
// Then use an alternate calculation based on the kf error score
// which should give a smaller key frame.
- if (kf_mod_err < kf_group_err / cpi->frames_to_key)
+ if (kf_mod_err < kf_group_err / cpi->twopass.frames_to_key)
{double alt_kf_grp_bits =
- ((double)cpi->bits_left *
- (kf_mod_err * (double)cpi->frames_to_key) /
- DOUBLE_DIVIDE_CHECK(cpi->modified_error_left));
+ ((double)cpi->twopass.bits_left *
+ (kf_mod_err * (double)cpi->twopass.frames_to_key) /
+ DOUBLE_DIVIDE_CHECK(cpi->twopass.modified_error_left));
alt_kf_bits = (int)((double)kf_boost *
(alt_kf_grp_bits / (double)allocation_chunks));
- if (cpi->kf_bits > alt_kf_bits)
+ if (cpi->twopass.kf_bits > alt_kf_bits)
{- cpi->kf_bits = alt_kf_bits;
+ cpi->twopass.kf_bits = alt_kf_bits;
}
}
// Else if it is much harder than other frames in the group make sure
@@ -2673,29 +2654,29 @@
else
{alt_kf_bits =
- (int)((double)cpi->bits_left *
+ (int)((double)cpi->twopass.bits_left *
(kf_mod_err /
- DOUBLE_DIVIDE_CHECK(cpi->modified_error_left)));
+ DOUBLE_DIVIDE_CHECK(cpi->twopass.modified_error_left)));
- if (alt_kf_bits > cpi->kf_bits)
+ if (alt_kf_bits > cpi->twopass.kf_bits)
{- cpi->kf_bits = alt_kf_bits;
+ cpi->twopass.kf_bits = alt_kf_bits;
}
}
- cpi->kf_group_bits -= cpi->kf_bits;
- cpi->kf_bits += cpi->min_frame_bandwidth; // Add in the minimum frame allowance
+ cpi->twopass.kf_group_bits -= cpi->twopass.kf_bits;
+ cpi->twopass.kf_bits += cpi->min_frame_bandwidth; // Add in the minimum frame allowance
- cpi->per_frame_bandwidth = cpi->kf_bits; // Peer frame bit target for this frame
- cpi->target_bandwidth = cpi->kf_bits * cpi->output_frame_rate; // Convert to a per second bitrate
+ cpi->per_frame_bandwidth = cpi->twopass.kf_bits; // Peer frame bit target for this frame
+ cpi->target_bandwidth = cpi->twopass.kf_bits * cpi->output_frame_rate; // Convert to a per second bitrate
}
// Note the total error score of the kf group minus the key frame itself
- cpi->kf_group_error_left = (int)(kf_group_err - kf_mod_err);
+ cpi->twopass.kf_group_error_left = (int)(kf_group_err - kf_mod_err);
// Adjust the count of total modified error left.
// The count of bits left is adjusted elsewhere based on real coded frame sizes
- cpi->modified_error_left -= kf_group_err;
+ cpi->twopass.modified_error_left -= kf_group_err;
if (cpi->oxcf.allow_spatial_resampling)
{@@ -2712,7 +2693,7 @@
double projected_bits_perframe;
double group_iiratio = (kf_group_intra_err - first_frame.intra_error) / (kf_group_coded_err - first_frame.coded_error);
- double err_per_frame = kf_group_err / cpi->frames_to_key;
+ double err_per_frame = kf_group_err / cpi->twopass.frames_to_key;
double bits_per_frame;
double av_bits_per_frame;
double effective_size_ratio;
@@ -2725,7 +2706,7 @@
cpi->common.vert_scale = NORMAL;
// Calculate Average bits per frame.
- //av_bits_per_frame = cpi->bits_left/(double)(cpi->total_stats->count - cpi->common.current_video_frame);
+ //av_bits_per_frame = cpi->twopass.bits_left/(double)(cpi->twopass.total_stats->count - cpi->common.current_video_frame);
av_bits_per_frame = cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate);
//if ( av_bits_per_frame < 0.0 )
// av_bits_per_frame = 0.0
@@ -2740,7 +2721,7 @@
// So use the larger of target bitrate for this sectoion or average bitrate for sequence
else
{- bits_per_frame = cpi->kf_group_bits / cpi->frames_to_key; // This accounts for how hard the section is...
+ bits_per_frame = cpi->twopass.kf_group_bits / cpi->twopass.frames_to_key; // This accounts for how hard the section is...
if (bits_per_frame < av_bits_per_frame) // Dont turn to resampling in easy sections just because they have been assigned a small number of bits
bits_per_frame = av_bits_per_frame;
@@ -2764,12 +2745,12 @@
}
// Guess at buffer level at the end of the section
- projected_buffer_level = cpi->buffer_level - (int)((projected_bits_perframe - av_bits_per_frame) * cpi->frames_to_key);
+ projected_buffer_level = cpi->buffer_level - (int)((projected_bits_perframe - av_bits_per_frame) * cpi->twopass.frames_to_key);
if (0)
{ FILE *f = fopen("Subsamle.stt", "a");- fprintf(f, " %8d %8d %8d %8d %12.0f %8d %8d %8d\n", cpi->common.current_video_frame, kf_q, cpi->common.horiz_scale, cpi->common.vert_scale, kf_group_err / cpi->frames_to_key, (int)(cpi->kf_group_bits / cpi->frames_to_key), new_height, new_width);
+ fprintf(f, " %8d %8d %8d %8d %12.0f %8d %8d %8d\n", cpi->common.current_video_frame, kf_q, cpi->common.horiz_scale, cpi->common.vert_scale, kf_group_err / cpi->twopass.frames_to_key, (int)(cpi->twopass.kf_group_bits / cpi->twopass.frames_to_key), new_height, new_width);
fclose(f);
}
@@ -2788,7 +2769,7 @@
}
else
{- long long clip_bits = (long long)(cpi->total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
+ long long clip_bits = (long long)(cpi->twopass.total_stats->count * cpi->oxcf.target_bandwidth / DOUBLE_DIVIDE_CHECK((double)cpi->oxcf.frame_rate));
long long over_spend = cpi->oxcf.starting_buffer_level - cpi->buffer_level;
if ((last_kf_resampled && (kf_q > cpi->worst_quality)) || // If triggered last time the threshold for triggering again is reduced
@@ -2826,7 +2807,7 @@
if (0)
{ FILE *f = fopen("Subsamle.stt", "a");- fprintf(f, "******** %8d %8d %8d %12.0f %8d %8d %8d\n", kf_q, cpi->common.horiz_scale, cpi->common.vert_scale, kf_group_err / cpi->frames_to_key, (int)(cpi->kf_group_bits / cpi->frames_to_key), new_height, new_width);
+ fprintf(f, "******** %8d %8d %8d %12.0f %8d %8d %8d\n", kf_q, cpi->common.horiz_scale, cpi->common.vert_scale, kf_group_err / cpi->twopass.frames_to_key, (int)(cpi->twopass.kf_group_bits / cpi->twopass.frames_to_key), new_height, new_width);
fclose(f);
}
}
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -375,11 +375,11 @@
cpi->mb.pip = 0;
#if !(CONFIG_REALTIME_ONLY)
- vpx_free(cpi->total_stats);
- cpi->total_stats = 0;
+ vpx_free(cpi->twopass.total_stats);
+ cpi->twopass.total_stats = 0;
- vpx_free(cpi->this_frame_stats);
- cpi->this_frame_stats = 0;
+ vpx_free(cpi->twopass.this_frame_stats);
+ cpi->twopass.this_frame_stats = 0;
#endif
}
@@ -1413,15 +1413,15 @@
cm->mb_rows * cm->mb_cols));
#if !(CONFIG_REALTIME_ONLY)
- vpx_free(cpi->total_stats);
+ vpx_free(cpi->twopass.total_stats);
- cpi->total_stats = vpx_calloc(1, sizeof(FIRSTPASS_STATS));
+ cpi->twopass.total_stats = vpx_calloc(1, sizeof(FIRSTPASS_STATS));
- vpx_free(cpi->this_frame_stats);
+ vpx_free(cpi->twopass.this_frame_stats);
- cpi->this_frame_stats = vpx_calloc(1, sizeof(FIRSTPASS_STATS));
+ cpi->twopass.this_frame_stats = vpx_calloc(1, sizeof(FIRSTPASS_STATS));
- if(!cpi->total_stats || !cpi->this_frame_stats)
+ if(!cpi->twopass.total_stats || !cpi->twopass.this_frame_stats)
vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
"Failed to allocate firstpass stats");
#endif
@@ -1484,7 +1484,7 @@
cpi->max_gf_interval = 12;
// Extended interval for genuinely static scenes
- cpi->static_scene_max_gf_interval = cpi->key_frame_frequency >> 1;
+ cpi->twopass.static_scene_max_gf_interval = cpi->key_frame_frequency >> 1;
// Special conditions when altr ref frame enabled in lagged compress mode
if (cpi->oxcf.play_alternate && cpi->oxcf.lag_in_frames)
@@ -1492,12 +1492,12 @@
if (cpi->max_gf_interval > cpi->oxcf.lag_in_frames - 1)
cpi->max_gf_interval = cpi->oxcf.lag_in_frames - 1;
- if (cpi->static_scene_max_gf_interval > cpi->oxcf.lag_in_frames - 1)
- cpi->static_scene_max_gf_interval = cpi->oxcf.lag_in_frames - 1;
+ if (cpi->twopass.static_scene_max_gf_interval > cpi->oxcf.lag_in_frames - 1)
+ cpi->twopass.static_scene_max_gf_interval = cpi->oxcf.lag_in_frames - 1;
}
- if ( cpi->max_gf_interval > cpi->static_scene_max_gf_interval )
- cpi->max_gf_interval = cpi->static_scene_max_gf_interval;
+ if ( cpi->max_gf_interval > cpi->twopass.static_scene_max_gf_interval )
+ cpi->max_gf_interval = cpi->twopass.static_scene_max_gf_interval;
}
@@ -1912,7 +1912,7 @@
// Set reference frame sign bias for ALTREF frame to 1 (for now)
cpi->common.ref_frame_sign_bias[ALTREF_FRAME] = 1;
- cpi->gf_decay_rate = 0;
+ cpi->twopass.gf_decay_rate = 0;
cpi->baseline_gf_interval = DEFAULT_GF_INTERVAL;
cpi->gold_is_last = 0 ;
@@ -2041,7 +2041,7 @@
cpi->rate_correction_factor = 1.0;
cpi->key_frame_rate_correction_factor = 1.0;
cpi->gf_rate_correction_factor = 1.0;
- cpi->est_max_qcorrection_factor = 1.0;
+ cpi->twopass.est_max_qcorrection_factor = 1.0;
cpi->mb.mvcost[0] = &cpi->mb.mvcosts[0][mv_max+1];
cpi->mb.mvcost[1] = &cpi->mb.mvcosts[1][mv_max+1];
@@ -2077,8 +2077,8 @@
size_t packet_sz = sizeof(FIRSTPASS_STATS);
int packets = oxcf->two_pass_stats_in.sz / packet_sz;
- cpi->stats_in = oxcf->two_pass_stats_in.buf;
- cpi->stats_in_end = (void*)((char *)cpi->stats_in
+ cpi->twopass.stats_in = oxcf->two_pass_stats_in.buf;
+ cpi->twopass.stats_in_end = (void*)((char *)cpi->twopass.stats_in
+ (packets - 1) * packet_sz);
vp8_init_second_pass(cpi);
}
@@ -2162,8 +2162,6 @@
cpi->diamond_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, diamond_search);
cpi->refining_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, refining_search);
- cpi->ready_for_new_frame = 1;
-
// make sure frame 1 is okay
cpi->error_bins[0] = cpi->common.MBs;
@@ -3301,8 +3299,8 @@
{if (cpi->common.refresh_alt_ref_frame)
{- cpi->per_frame_bandwidth = cpi->gf_bits; // Per frame bit target for the alt ref frame
- cpi->target_bandwidth = cpi->gf_bits * cpi->output_frame_rate; // per second target bitrate
+ cpi->per_frame_bandwidth = cpi->twopass.gf_bits; // Per frame bit target for the alt ref frame
+ cpi->target_bandwidth = cpi->twopass.gf_bits * cpi->output_frame_rate; // per second target bitrate
}
}
else
@@ -3502,15 +3500,15 @@
buff_lvl_step = (cpi->oxcf.maximum_buffer_size - cpi->oxcf.optimal_buffer_level) / Adjustment;
if (buff_lvl_step)
- {Adjustment = (cpi->buffer_level - cpi->oxcf.optimal_buffer_level) / buff_lvl_step;
- cpi->active_worst_quality -= Adjustment;
- }
+ else
+ Adjustment = 0;
}
- else
- {- cpi->active_worst_quality -= Adjustment;
- }
+
+ cpi->active_worst_quality -= Adjustment;
+
+ if(cpi->active_worst_quality < cpi->active_best_quality)
+ cpi->active_worst_quality = cpi->active_best_quality;
}
}
@@ -4107,7 +4105,7 @@
// Special case code to reduce pulsing when key frames are forced at a
// fixed interval. Note the reconstruction error if it is the frame before
// the force key frame
- if ( cpi->next_key_frame_forced && (cpi->frames_to_key == 0) )
+ if ( cpi->next_key_frame_forced && (cpi->twopass.frames_to_key == 0) )
{cpi->ambient_err = vp8_calc_ss_err(cpi->Source,
&cm->yv12_fb[cm->new_fb_idx],
@@ -4313,17 +4311,17 @@
// Update bits left to the kf and gf groups to account for overshoot or undershoot on these frames
if (cm->frame_type == KEY_FRAME)
{- cpi->kf_group_bits += cpi->this_frame_target - cpi->projected_frame_size;
+ cpi->twopass.kf_group_bits += cpi->this_frame_target - cpi->projected_frame_size;
- if (cpi->kf_group_bits < 0)
- cpi->kf_group_bits = 0 ;
+ if (cpi->twopass.kf_group_bits < 0)
+ cpi->twopass.kf_group_bits = 0 ;
}
else if (cm->refresh_golden_frame || cm->refresh_alt_ref_frame)
{- cpi->gf_group_bits += cpi->this_frame_target - cpi->projected_frame_size;
+ cpi->twopass.gf_group_bits += cpi->this_frame_target - cpi->projected_frame_size;
- if (cpi->gf_group_bits < 0)
- cpi->gf_group_bits = 0 ;
+ if (cpi->twopass.gf_group_bits < 0)
+ cpi->twopass.gf_group_bits = 0 ;
}
if (cm->frame_type != KEY_FRAME)
@@ -4370,7 +4368,7 @@
//cpi->avg_frame_qindex, cpi->zbin_over_quant,
cm->refresh_golden_frame, cm->refresh_alt_ref_frame,
cm->frame_type, cpi->gfu_boost,
- cpi->est_max_qcorrection_factor, (int)cpi->bits_left,
+ cpi->twopass.est_max_qcorrection_factor, (int)cpi->bits_left,
cpi->total_coded_error_left,
(double)cpi->bits_left / cpi->total_coded_error_left,
cpi->tot_recode_hits);
@@ -4389,7 +4387,7 @@
//cpi->avg_frame_qindex, cpi->zbin_over_quant,
cm->refresh_golden_frame, cm->refresh_alt_ref_frame,
cm->frame_type, cpi->gfu_boost,
- cpi->est_max_qcorrection_factor, (int)cpi->bits_left,
+ cpi->twopass.est_max_qcorrection_factor, (int)cpi->bits_left,
cpi->total_coded_error_left, cpi->tot_recode_hits);
fclose(f);
@@ -4598,13 +4596,13 @@
vp8_second_pass(cpi);
encode_frame_to_data_rate(cpi, size, dest, frame_flags);
- cpi->bits_left -= 8 * *size;
+ cpi->twopass.bits_left -= 8 * *size;
if (!cpi->common.refresh_alt_ref_frame)
{double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth
*cpi->oxcf.two_pass_vbrmin_section / 100);
- cpi->bits_left += (long long)(two_pass_min_rate / cpi->oxcf.frame_rate);
+ cpi->twopass.bits_left += (long long)(two_pass_min_rate / cpi->oxcf.frame_rate);
}
}
#endif
@@ -4738,10 +4736,10 @@
*size = 0;
#if !(CONFIG_REALTIME_ONLY)
- if (flush && cpi->pass == 1 && !cpi->first_pass_done)
+ if (flush && cpi->pass == 1 && !cpi->twopass.first_pass_done)
{vp8_end_first_pass(cpi); /* get last stats packet */
- cpi->first_pass_done = 1;
+ cpi->twopass.first_pass_done = 1;
}
#endif
@@ -4908,8 +4906,6 @@
cm->frame_type = INTER_FRAME;
}
-
- cpi->ready_for_new_frame = 1;
vpx_usec_timer_mark(&cmptimer);
cpi->time_compress_data += vpx_usec_timer_elapsed(&cmptimer);
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -313,10 +313,6 @@
int rd_thresh_mult[MAX_MODES];
int rd_baseline_thresh[MAX_MODES];
int rd_threshes[MAX_MODES];
- int mvcostbase;
- int mvcostmultiplier;
- int subseqblockweight;
- int errthresh;
int RDMULT;
int RDDIV ;
@@ -329,16 +325,6 @@
long long intra_error;
long long last_intra_error;
-#if 0
- // Experimental RD code
- long long frame_distortion;
- long long last_frame_distortion;
-#endif
-
- int last_mb_distortion;
-
- int frames_since_auto_filter;
-
int this_frame_target;
int projected_frame_size;
int last_q[2]; // Separate values for Intra/Inter
@@ -346,7 +332,6 @@
double rate_correction_factor;
double key_frame_rate_correction_factor;
double gf_rate_correction_factor;
- double est_max_qcorrection_factor;
int frames_till_gf_update_due; // Count down till next GF
int current_gf_interval; // GF interval chosen when we coded the last GF
@@ -353,30 +338,12 @@
int gf_overspend_bits; // Total bits overspent becasue of GF boost (cumulative)
- int gf_group_bits; // Projected Bits available for a group of frames including 1 GF or ARF
- int gf_bits; // Bits for the golden frame or ARF - 2 pass only
- int mid_gf_extra_bits; // A few extra bits for the frame half way between two gfs.
-
- // Projected total bits available for a key frame group of frames
- long long kf_group_bits;
-
- // Error score of frames still to be coded in kf group
- long long kf_group_error_left;
-
- // Bits for the key frame in a key frame group - 2 pass only
- int kf_bits;
-
int non_gf_bitrate_adjustment; // Used in the few frames following a GF to recover the extra bits spent in that GF
- int initial_gf_use; // percentage use of gf 2 frames after gf
- int gf_group_error_left; // Remaining error from uncoded frames in a gf group. Two pass use only
-
int kf_overspend_bits; // Extra bits spent on key frames that need to be recovered on inter frames
int kf_bitrate_adjustment; // Current number of bit s to try and recover on each inter frame.
int max_gf_interval;
- int static_scene_max_gf_interval;
int baseline_gf_interval;
- int gf_decay_rate;
int active_arnr_frames; // <= cpi->oxcf.arnr_max_frames
INT64 key_frame_count;
@@ -384,7 +351,6 @@
int per_frame_bandwidth; // Current section per frame bandwidth target
int av_per_frame_bandwidth; // Average frame size target for clip
int min_frame_bandwidth; // Minimum allocation that should be used for any frame
- int last_key_frame_size;
int inter_frame_target;
double output_frame_rate;
long long last_time_stamp_seen;
@@ -422,8 +388,6 @@
int active_best_quality;
int cq_target_quality;
- int maxq_max_limit;
- int maxq_min_limit;
int drop_frames_allowed; // Are we permitted to drop frames?
int drop_frame; // Drop this frame?
@@ -443,39 +407,12 @@
vp8_prob frame_coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [vp8_coef_tokens-1];
unsigned int frame_branch_ct [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [vp8_coef_tokens-1][2];
- /* Second compressed data partition contains coefficient data. */
-
- unsigned char *output_partition2;
- size_t output_partition2size;
-
- int frames_to_key;
int gfu_boost;
int kf_boost;
int last_boost;
- double total_error_left;
- double total_intra_error_left;
- double total_coded_error_left;
- double start_tot_err_left;
- double min_error;
- double kf_intra_err_min;
- double gf_intra_err_min;
- double modified_error_total;
- double modified_error_used;
- double modified_error_left;
- double clip_bpe;
- double observed_bpe;
-
- double avg_iiratio;
-
int target_bandwidth;
- long long bits_left;
- long long clip_bits_total;
- FIRSTPASS_STATS *total_stats;
- FIRSTPASS_STATS *this_frame_stats;
- FIRSTPASS_STATS *stats_in, *stats_in_end;
struct vpx_codec_pkt_list *output_pkt_list;
- int first_pass_done;
#if 0
// Experimental code for lagged and one pass
@@ -499,7 +436,6 @@
int goldfreq;
int auto_worst_q;
int cpu_used;
- int chroma_boost;
int horiz_scale;
int vert_scale;
int pass;
@@ -517,31 +453,11 @@
int this_frame_percent_intra;
int last_frame_percent_intra;
- int last_key_frame_q;
- int last_kffilt_lvl;
-
int ref_frame_flags;
SPEED_FEATURES sf;
int error_bins[1024];
- int inter_lvl;
- int intra_lvl;
- int motion_lvl;
- int motion_speed;
- int motion_var;
- unsigned int next_iiratio;
- unsigned int this_iiratio;
- int this_frame_modified_error;
-
- double norm_intra_err_per_mb;
- double norm_inter_err_per_mb;
- double norm_iidiff_per_mb;
-
- int last_best_mode_index; // Record of mode index chosen for previous macro block.
- int last_auto_filt_val;
- int last_auto_filt_q;
-
// Data used for real time conferencing mode to help determine if it would be good to update the gf
int inter_zz_count;
int gf_bad_count;
@@ -549,10 +465,6 @@
int skip_true_count;
int skip_false_count;
- int alt_qcount;
-
- int ready_for_new_frame;
-
unsigned char *segmentation_map;
signed char segment_feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS]; // Segment data (can be deltas or absolute values)
int segment_encode_breakout[MAX_MB_SEGMENTS]; // segment threashold for encode breakout
@@ -602,14 +514,49 @@
unsigned int time_pick_lpf;
unsigned int time_encode_mb_row;
- unsigned int tempdata1;
- unsigned int tempdata2;
-
int base_skip_false_prob[128];
- unsigned int section_intra_rating;
- double section_max_qfactor;
+ struct twopass_rc
+ {+ unsigned int section_intra_rating;
+ double section_max_qfactor;
+ unsigned int next_iiratio;
+ unsigned int this_iiratio;
+ FIRSTPASS_STATS *total_stats;
+ FIRSTPASS_STATS *this_frame_stats;
+ FIRSTPASS_STATS *stats_in, *stats_in_end;
+ int first_pass_done;
+ long long bits_left;
+ long long clip_bits_total;
+ double avg_iiratio;
+ double modified_error_total;
+ double modified_error_used;
+ double modified_error_left;
+ double total_error_left;
+ double total_intra_error_left;
+ double total_coded_error_left;
+ double start_tot_err_left;
+ double kf_intra_err_min;
+ double gf_intra_err_min;
+ int frames_to_key;
+ int maxq_max_limit;
+ int maxq_min_limit;
+ int gf_decay_rate;
+ int static_scene_max_gf_interval;
+ int kf_bits;
+ int gf_group_error_left; // Remaining error from uncoded frames in a gf group. Two pass use only
+ // Projected total bits available for a key frame group of frames
+ long long kf_group_bits;
+
+ // Error score of frames still to be coded in kf group
+ long long kf_group_error_left;
+
+ int gf_group_bits; // Projected Bits available for a group of frames including 1 GF or ARF
+ int gf_bits; // Bits for the golden frame or ARF - 2 pass only
+ int mid_gf_extra_bits; // A few extra bits for the frame half way between two gfs.
+ double est_max_qcorrection_factor;
+ } twopass;
#if CONFIG_RUNTIME_CPU_DETECT
VP8_ENCODER_RTCD rtcd;
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -170,8 +170,7 @@
static int pick_intra4x4block(
const VP8_ENCODER_RTCD *rtcd,
MACROBLOCK *x,
- BLOCK *be,
- BLOCKD *b,
+ int ib,
B_PREDICTION_MODE *best_mode,
B_PREDICTION_MODE above,
B_PREDICTION_MODE left,
@@ -179,6 +178,9 @@
int *bestrate,
int *bestdistortion)
{+
+ BLOCKD *b = &x->e_mbd.block[ib];
+ BLOCK *be = &x->block[ib];
B_PREDICTION_MODE mode;
int best_rd = INT_MAX; // 1<<30
int rate;
@@ -214,8 +216,7 @@
}
b->bmi.mode = (B_PREDICTION_MODE)(*best_mode);
- vp8_encode_intra4x4block(rtcd, x, be, b, b->bmi.mode);
-
+ vp8_encode_intra4x4block(rtcd, x, ib);
return best_rd;
}
@@ -245,8 +246,7 @@
B_PREDICTION_MODE UNINITIALIZED_IS_SAFE(best_mode);
int UNINITIALIZED_IS_SAFE(r), UNINITIALIZED_IS_SAFE(d);
- pick_intra4x4block(rtcd, mb, mb->block + i, xd->block + i,
- &best_mode, A, L, &r, &d);
+ pick_intra4x4block(rtcd, mb, i, &best_mode, A, L, &r, &d);
cost += r;
distortion += d;
@@ -922,9 +922,6 @@
cpi->rd_thresh_mult[best_mode_index] = (cpi->rd_thresh_mult[best_mode_index] >= (MIN_THRESHMULT + best_adjustment)) ? cpi->rd_thresh_mult[best_mode_index] - best_adjustment : MIN_THRESHMULT;
cpi->rd_threshes[best_mode_index] = (cpi->rd_baseline_thresh[best_mode_index] >> 7) * cpi->rd_thresh_mult[best_mode_index];
}
-
- // Keep a record of best mode index for use in next loop
- cpi->last_best_mode_index = best_mode_index;
if (best_mbmode.mode <= B_PRED)
{--- a/vp8/encoder/picklpf.c
+++ b/vp8/encoder/picklpf.c
@@ -142,7 +142,7 @@
// with lots of intra coming in.
int max_filter_level = MAX_LOOP_FILTER ;//* 3 / 4;
- if (cpi->section_intra_rating > 8)
+ if (cpi->twopass.section_intra_rating > 8)
max_filter_level = MAX_LOOP_FILTER * 3 / 4;
(void) cpi;
@@ -377,8 +377,8 @@
Bias = (best_err >> (15 - (filt_mid / 8))) * filter_step; //PGW change 12/12/06 for small images
// jbb chg: 20100118 - in sections with lots of new material coming in don't bias as much to a low filter value
- if (cpi->section_intra_rating < 20)
- Bias = Bias * cpi->section_intra_rating / 20;
+ if (cpi->twopass.section_intra_rating < 20)
+ Bias = Bias * cpi->twopass.section_intra_rating / 20;
filt_high = ((filt_mid + filter_step) > max_filter_level) ? max_filter_level : (filt_mid + filter_step);
filt_low = ((filt_mid - filter_step) < min_filter_level) ? min_filter_level : (filt_mid - filter_step);
@@ -474,8 +474,4 @@
}
cm->filter_level = filt_best;
- cpi->last_auto_filt_val = filt_best;
- cpi->last_auto_filt_q = cm->base_qindex;
-
- cpi->frames_since_auto_filter = 0;
}
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -671,7 +671,7 @@
{if (cpi->pass == 2)
{- cpi->per_frame_bandwidth = cpi->gf_bits; // Per frame bit target for the alt ref frame
+ cpi->per_frame_bandwidth = cpi->twopass.gf_bits; // Per frame bit target for the alt ref frame
cpi->this_frame_target = cpi->per_frame_bandwidth;
}
@@ -1100,7 +1100,6 @@
}
#endif
- cpi->initial_gf_use = 0;
if (cpi->auto_adjust_gold_quantizer)
{@@ -1476,7 +1475,6 @@
}
cpi->frames_since_key = 0;
- cpi->last_key_frame_size = cpi->projected_frame_size;
cpi->key_frame_count++;
}
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -278,10 +278,11 @@
if (cpi->pass == 2 && (cpi->common.frame_type != KEY_FRAME))
{- if (cpi->next_iiratio > 31)
+ if (cpi->twopass.next_iiratio > 31)
cpi->RDMULT += (cpi->RDMULT * rd_iifactor[31]) >> 4;
else
- cpi->RDMULT += (cpi->RDMULT * rd_iifactor[cpi->next_iiratio]) >> 4;
+ cpi->RDMULT +=
+ (cpi->RDMULT * rd_iifactor[cpi->twopass.next_iiratio]) >> 4;
}
#if !CONFIG_EXTEND_QRANGE
@@ -2447,9 +2448,6 @@
}*/
}
-
- // Keep a record of best mode index that we chose
- cpi->last_best_mode_index = best_mode_index;
// Note how often each mode chosen as best
cpi->mode_chosen_counts[best_mode_index] ++;