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

Merge "Removing this_frame_stats member from TWO_PASS struct."

Browse Source
This commit is contained in:
Paul Wilkins 2014-05-28 08:07:50 -07:00 committed by Gerrit Code Review
commit 15600eb8b8
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vp9/encoder/vp9_firstpass.c
View File

@ -434,6 +434,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
TWO_PASS *twopass = &cpi->twopass;
const MV zero_mv = {0, 0};
const YV12_BUFFER_CONFIG *first_ref_buf = lst_yv12;
FIRSTPASS_STATS fps;
vp9_clear_system_state();
@ -728,8 +729,6 @@ void vp9_first_pass(VP9_COMP *cpi) {
vp9_clear_system_state();
{
FIRSTPASS_STATS fps;
fps.frame = cm->current_video_frame;
fps.spatial_layer_id = cpi->svc.spatial_layer_id;
fps.intra_error = (double)(intra_error >> 8);
@ -768,8 +767,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
fps.duration = (double)(cpi->source->ts_end - cpi->source->ts_start);
// Don't want to do output stats with a stack variable!
twopass->this_frame_stats = fps;
output_stats(&twopass->this_frame_stats, cpi->output_pkt_list);
output_stats(&fps, cpi->output_pkt_list);
accumulate_stats(&twopass->total_stats, &fps);
}
@ -777,9 +775,9 @@ void vp9_first_pass(VP9_COMP *cpi) {
// the prediction is good enough... but also don't allow it to lag too far.
if ((twopass->sr_update_lag > 3) ||
((cm->current_video_frame > 0) &&
(twopass->this_frame_stats.pcnt_inter > 0.20) &&
((twopass->this_frame_stats.intra_error /
DOUBLE_DIVIDE_CHECK(twopass->this_frame_stats.coded_error)) > 2.0))) {
(fps.pcnt_inter > 0.20) &&
((fps.intra_error /
DOUBLE_DIVIDE_CHECK(fps.coded_error)) > 2.0))) {
if (gld_yv12 != NULL) {
vp8_yv12_copy_frame(lst_yv12, gld_yv12);
}

1
vp9/encoder/vp9_firstpass.h
View File

@ -44,7 +44,6 @@ typedef struct {
unsigned int section_intra_rating;
unsigned int next_iiratio;
FIRSTPASS_STATS total_stats;
FIRSTPASS_STATS this_frame_stats;
const FIRSTPASS_STATS *stats_in;
const FIRSTPASS_STATS *stats_in_start;
const FIRSTPASS_STATS *stats_in_end;