Commit c01e86cc authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Removing output_framerate field from VP9_COMP."

parents 8e4d5e41 4d2523bf
...@@ -981,8 +981,6 @@ void vp9_init_second_pass(VP9_COMP *cpi) { ...@@ -981,8 +981,6 @@ void vp9_init_second_pass(VP9_COMP *cpi) {
oxcf->target_bandwidth / 10000000.0); oxcf->target_bandwidth / 10000000.0);
} }
cpi->output_framerate = oxcf->framerate;
// Calculate a minimum intra value to be used in determining the IIratio // 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 // 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 // that clips that are static but "low complexity" in the intra domain
......
...@@ -633,9 +633,8 @@ void vp9_new_framerate(VP9_COMP *cpi, double framerate) { ...@@ -633,9 +633,8 @@ void vp9_new_framerate(VP9_COMP *cpi, double framerate) {
int vbr_max_bits; int vbr_max_bits;
oxcf->framerate = framerate < 0.1 ? 30 : framerate; oxcf->framerate = framerate < 0.1 ? 30 : framerate;
cpi->output_framerate = cpi->oxcf.framerate;
rc->av_per_frame_bandwidth = (int)(oxcf->target_bandwidth / rc->av_per_frame_bandwidth = (int)(oxcf->target_bandwidth /
cpi->output_framerate); oxcf->framerate);
rc->min_frame_bandwidth = (int)(rc->av_per_frame_bandwidth * rc->min_frame_bandwidth = (int)(rc->av_per_frame_bandwidth *
oxcf->two_pass_vbrmin_section / 100); oxcf->two_pass_vbrmin_section / 100);
......
...@@ -376,7 +376,6 @@ typedef struct VP9_COMP { ...@@ -376,7 +376,6 @@ typedef struct VP9_COMP {
int active_arnr_frames; // <= cpi->oxcf.arnr_max_frames int active_arnr_frames; // <= cpi->oxcf.arnr_max_frames
int active_arnr_strength; // <= cpi->oxcf.arnr_max_strength int active_arnr_strength; // <= cpi->oxcf.arnr_max_strength
double output_framerate;
int64_t last_time_stamp_seen; int64_t last_time_stamp_seen;
int64_t last_end_time_stamp_seen; int64_t last_end_time_stamp_seen;
int64_t first_time_stamp_ever; int64_t first_time_stamp_ever;
......
Supports Markdown
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