Commit b447b9d9 authored by Adrian Grange's avatar Adrian Grange Committed by Gerrit Code Review
Browse files

Merge "Revert "Removing this_frame_stats member from TWO_PASS struct.""

parents 5f72de91 a4f74792
...@@ -460,7 +460,6 @@ void vp9_first_pass(VP9_COMP *cpi) { ...@@ -460,7 +460,6 @@ void vp9_first_pass(VP9_COMP *cpi) {
TWO_PASS *twopass = &cpi->twopass; TWO_PASS *twopass = &cpi->twopass;
const MV zero_mv = {0, 0}; const MV zero_mv = {0, 0};
const YV12_BUFFER_CONFIG *first_ref_buf = lst_yv12; const YV12_BUFFER_CONFIG *first_ref_buf = lst_yv12;
FIRSTPASS_STATS fps;
vp9_clear_system_state(); vp9_clear_system_state();
...@@ -758,6 +757,8 @@ void vp9_first_pass(VP9_COMP *cpi) { ...@@ -758,6 +757,8 @@ void vp9_first_pass(VP9_COMP *cpi) {
vp9_clear_system_state(); vp9_clear_system_state();
{ {
FIRSTPASS_STATS fps;
fps.frame = cm->current_video_frame; fps.frame = cm->current_video_frame;
fps.spatial_layer_id = cpi->svc.spatial_layer_id; fps.spatial_layer_id = cpi->svc.spatial_layer_id;
fps.intra_error = (double)(intra_error >> 8); fps.intra_error = (double)(intra_error >> 8);
...@@ -796,7 +797,8 @@ void vp9_first_pass(VP9_COMP *cpi) { ...@@ -796,7 +797,8 @@ void vp9_first_pass(VP9_COMP *cpi) {
fps.duration = (double)(cpi->source->ts_end - cpi->source->ts_start); fps.duration = (double)(cpi->source->ts_end - cpi->source->ts_start);
// Don't want to do output stats with a stack variable! // Don't want to do output stats with a stack variable!
output_stats(&fps, cpi->output_pkt_list); twopass->this_frame_stats = fps;
output_stats(&twopass->this_frame_stats, cpi->output_pkt_list);
accumulate_stats(&twopass->total_stats, &fps); accumulate_stats(&twopass->total_stats, &fps);
} }
...@@ -804,9 +806,9 @@ void vp9_first_pass(VP9_COMP *cpi) { ...@@ -804,9 +806,9 @@ void vp9_first_pass(VP9_COMP *cpi) {
// the prediction is good enough... but also don't allow it to lag too far. // the prediction is good enough... but also don't allow it to lag too far.
if ((twopass->sr_update_lag > 3) || if ((twopass->sr_update_lag > 3) ||
((cm->current_video_frame > 0) && ((cm->current_video_frame > 0) &&
(fps.pcnt_inter > 0.20) && (twopass->this_frame_stats.pcnt_inter > 0.20) &&
((fps.intra_error / ((twopass->this_frame_stats.intra_error /
DOUBLE_DIVIDE_CHECK(fps.coded_error)) > 2.0))) { DOUBLE_DIVIDE_CHECK(twopass->this_frame_stats.coded_error)) > 2.0))) {
if (gld_yv12 != NULL) { if (gld_yv12 != NULL) {
vp8_yv12_copy_frame(lst_yv12, gld_yv12); vp8_yv12_copy_frame(lst_yv12, gld_yv12);
} }
......
...@@ -44,6 +44,7 @@ typedef struct { ...@@ -44,6 +44,7 @@ typedef struct {
unsigned int section_intra_rating; unsigned int section_intra_rating;
unsigned int next_iiratio; unsigned int next_iiratio;
FIRSTPASS_STATS total_stats; FIRSTPASS_STATS total_stats;
FIRSTPASS_STATS this_frame_stats;
const FIRSTPASS_STATS *stats_in; const FIRSTPASS_STATS *stats_in;
const FIRSTPASS_STATS *stats_in_start; const FIRSTPASS_STATS *stats_in_start;
const FIRSTPASS_STATS *stats_in_end; const FIRSTPASS_STATS *stats_in_end;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment