From 4d2523bfdaae70c93668f0f2d3394f91a9b6fc81 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Thu, 10 Apr 2014 16:21:39 -0700 Subject: Removing output_framerate field from VP9_COMP. Change-Id: Id755813fd5e78039bc9e76a046b33c8cafbc36dc --- vp9/encoder/vp9_firstpass.c | 2 -- vp9/encoder/vp9_onyx_if.c | 3 +-- vp9/encoder/vp9_onyx_int.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index db32ef8c9..3324b9c60 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -981,8 +981,6 @@ void vp9_init_second_pass(VP9_COMP *cpi) { oxcf->target_bandwidth / 10000000.0); } - cpi->output_framerate = oxcf->framerate; - // 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 diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 2f1381476..21d109632 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -633,9 +633,8 @@ void vp9_new_framerate(VP9_COMP *cpi, double framerate) { int vbr_max_bits; oxcf->framerate = framerate < 0.1 ? 30 : framerate; - cpi->output_framerate = cpi->oxcf.framerate; rc->av_per_frame_bandwidth = (int)(oxcf->target_bandwidth / - cpi->output_framerate); + oxcf->framerate); rc->min_frame_bandwidth = (int)(rc->av_per_frame_bandwidth * oxcf->two_pass_vbrmin_section / 100); diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 18203f96a..126711e02 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -376,7 +376,6 @@ typedef struct VP9_COMP { int active_arnr_frames; // <= cpi->oxcf.arnr_max_frames int active_arnr_strength; // <= cpi->oxcf.arnr_max_strength - double output_framerate; int64_t last_time_stamp_seen; int64_t last_end_time_stamp_seen; int64_t first_time_stamp_ever; -- cgit v1.2.3