diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-13 02:15:46 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2025-03-26 03:29:35 +0100 |
| commit | b038c7af0cd47db7d6e34772d5451841f91d8f90 (patch) | |
| tree | f51ef58e43f588204a32beed8e53c252d99fcf79 /libavcodec/ratecontrol.c | |
| parent | 553fc3a7647d726e7e257761a4ff6ebd23cfdd95 (diff) | |
| download | ffmpeg-b038c7af0cd47db7d6e34772d5451841f91d8f90.tar.gz | |
avcodec/mpegvideo: Move macroblock-variance stats to MPVMainEncContext
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index f4df67aab0..9c5d34dfde 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -51,8 +51,8 @@ void ff_write_pass1_stats(MPVMainEncContext *const m) s->misc_bits, s->f_code, s->b_code, - s->mc_mb_var_sum, - s->mb_var_sum, + m->mc_mb_var_sum, + m->mb_var_sum, s->i_count, s->header_bits); } @@ -986,7 +986,7 @@ float ff_rate_estimate_qscale(MPVMainEncContext *const m, int dry_run) if (br_compensation <= 0.0) br_compensation = 0.001; - var = pict_type == AV_PICTURE_TYPE_I ? s->mb_var_sum : s->mc_mb_var_sum; + var = pict_type == AV_PICTURE_TYPE_I ? m->mb_var_sum : m->mc_mb_var_sum; short_term_q = 0; /* avoid warning */ if (s->avctx->flags & AV_CODEC_FLAG_PASS2) { @@ -999,8 +999,8 @@ float ff_rate_estimate_qscale(MPVMainEncContext *const m, int dry_run) } else { rce->pict_type = rce->new_pict_type = pict_type; - rce->mc_mb_var_sum = s->mc_mb_var_sum; - rce->mb_var_sum = s->mb_var_sum; + rce->mc_mb_var_sum = m->mc_mb_var_sum; + rce->mb_var_sum = m->mb_var_sum; rce->qscale = FF_QP2LAMBDA * 2; rce->f_code = s->f_code; rce->b_code = s->b_code; @@ -1060,7 +1060,7 @@ float ff_rate_estimate_qscale(MPVMainEncContext *const m, int dry_run) qmin, q, qmax, picture_number, wanted_bits / 1000, m->total_bits / 1000, br_compensation, short_term_q, m->frame_bits, - s->mb_var_sum, s->mc_mb_var_sum, + m->mb_var_sum, m->mc_mb_var_sum, s->bit_rate / 1000, (int)fps); } @@ -1076,8 +1076,8 @@ float ff_rate_estimate_qscale(MPVMainEncContext *const m, int dry_run) if (!dry_run) { rcc->last_qscale = q; - rcc->last_mc_mb_var_sum = s->mc_mb_var_sum; - rcc->last_mb_var_sum = s->mb_var_sum; + rcc->last_mc_mb_var_sum = m->mc_mb_var_sum; + rcc->last_mb_var_sum = m->mb_var_sum; } return q; } |