All except vbv_ignore_qmax are only ever used by the main encoding
thread.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/mpegvideo.h | 13 -------------
libavcodec/mpegvideo_enc.c | 4 ++--
libavcodec/mpegvideoenc.h | 31 ++++++++++++++++++++++---------
libavcodec/ratecontrol.c | 38 ++++++++++++++++++++------------------
libavcodec/snowenc.c | 6 +++---
5 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 62347eff81..307964b10e 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -469,21 +469,8 @@ typedef struct MPVContext {
int mpv_flags; ///< flags set by private options
int quantizer_noise_shaping;
- /**
- * ratecontrol qmin qmax limiting method
- * 0-> clipping, 1-> use a nice continuous function to limit qscale within
qmin/qmax.
- */
- float rc_qsquish;
- float rc_qmod_amp;
- int rc_qmod_freq;
- float rc_initial_cplx;
- float rc_buffer_aggressivity;
- float border_masking;
- int lmin, lmax;
int vbv_ignore_qmax;
- char *rc_eq;
-
/* temp buffers for rate control */
float *cplx_tab, *bits_tab;
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index a1ea875546..da417acfae 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -408,7 +408,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
avctx->temporal_cplx_masking ||
avctx->spatial_cplx_masking ||
avctx->p_masking ||
- s->border_masking ||
+ m->border_masking ||
(s->mpv_flags & FF_MPV_FLAG_QP_RD)) &&
!s->fixed_qscale;
@@ -1748,7 +1748,7 @@ vbv_retry:
int min_step = hq ? 1 : (1<<(FF_LAMBDA_SHIFT + 7))/139;
if (put_bits_count(&s->pb) > max_size &&
- s->lambda < s->lmax) {
+ s->lambda < m->lmax) {
m->next_lambda = FFMAX(s->lambda + min_step, s->lambda *
(s->qscale + 1) / s->qscale);
if (s->adaptive_quant) {
diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h
index 350a1f70a6..86c86e0ddf 100644
--- a/libavcodec/mpegvideoenc.h
+++ b/libavcodec/mpegvideoenc.h
@@ -70,6 +70,19 @@ typedef struct MPVMainEncContext {
int stuffing_bits; ///< bits used for stuffing
int next_lambda; ///< next lambda used for retrying to
encode a frame
RateControlContext rc_context; ///< contains stuff only accessed in
ratecontrol.c
+ /**
+ * ratecontrol qmin qmax limiting method
+ * 0-> clipping, 1-> use a nice continuous function to limit qscale within
qmin/qmax.
+ */
+ float rc_qsquish;
+ float rc_qmod_amp;
+ int rc_qmod_freq;
+ float rc_initial_cplx;
+ float rc_buffer_aggressivity;
+ float border_masking;
+ int lmin, lmax;
+
+ char *rc_eq;
/* temporary frames used by b_frame_strategy == 2 */
AVFrame *tmp_frames[MPVENC_MAX_B_FRAMES + 2];
@@ -125,19 +138,19 @@ FF_MPV_OPT_CMP_FUNC, \
{ "error_rate", "Simulate errors in the bitstream to test error concealment.",
\
FF_MPV_OFFSET(error_rate), AV_OPT_TYPE_INT, { .i64 = 0 }, 0,
INT_MAX, FF_MPV_OPT_FLAGS },\
{"qsquish", "how to keep quantizer between qmin and qmax (0 = clip, 1 = use
differentiable function)",
\
-
FF_MPV_OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0, 99,
FF_MPV_OPT_FLAGS}, \
-{"rc_qmod_amp", "experimental quantizer modulation",
FF_MPV_OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX,
FF_MPV_OPT_FLAGS}, \
-{"rc_qmod_freq", "experimental quantizer modulation",
FF_MPV_OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX,
FF_MPV_OPT_FLAGS}, \
+
FF_MPV_MAIN_OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0, 99,
FF_MPV_OPT_FLAGS}, \
+{"rc_qmod_amp", "experimental quantizer modulation",
FF_MPV_MAIN_OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX,
FLT_MAX, FF_MPV_OPT_FLAGS}, \
+{"rc_qmod_freq", "experimental quantizer modulation",
FF_MPV_MAIN_OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN,
INT_MAX, FF_MPV_OPT_FLAGS}, \
{"rc_eq", "Set rate control equation. When computing the expression, besides
the standard functions "
\
"defined in the section 'Expression Evaluation', the following
functions are available: "
\
"bits2qp(bits), qp2bits(qp). Also the following constants are
available: iTex pTex tex mv "
\
"fCode iCount mcVar var isI isP isB avgQP qComp avgIITex avgPITex
avgPPTex avgBPTex avgTex.",
\
-
FF_MPV_OFFSET(rc_eq), AV_OPT_TYPE_STRING, .flags =
FF_MPV_OPT_FLAGS }, \
-{"rc_init_cplx", "initial complexity for 1-pass encoding",
FF_MPV_OFFSET(rc_initial_cplx), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX,
FLT_MAX, FF_MPV_OPT_FLAGS}, \
-{"rc_buf_aggressivity", "currently useless",
FF_MPV_OFFSET(rc_buffer_aggressivity), AV_OPT_TYPE_FLOAT, {.dbl = 1.0 },
-FLT_MAX, FLT_MAX, FF_MPV_OPT_FLAGS}, \
-{"border_mask", "increase the quantizer for macroblocks close to borders",
FF_MPV_OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX,
FLT_MAX, FF_MPV_OPT_FLAGS}, \
-{"lmin", "minimum Lagrange factor (VBR)",
FF_MPV_OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 2*FF_QP2LAMBDA }, 0, INT_MAX,
FF_MPV_OPT_FLAGS }, \
-{"lmax", "maximum Lagrange factor (VBR)",
FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX,
FF_MPV_OPT_FLAGS }, \
+
FF_MPV_MAIN_OFFSET(rc_eq), AV_OPT_TYPE_STRING, .flags
= FF_MPV_OPT_FLAGS }, \
+{"rc_init_cplx", "initial complexity for 1-pass encoding",
FF_MPV_MAIN_OFFSET(rc_initial_cplx), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX,
FLT_MAX, FF_MPV_OPT_FLAGS}, \
+{"rc_buf_aggressivity", "currently useless",
FF_MPV_MAIN_OFFSET(rc_buffer_aggressivity), AV_OPT_TYPE_FLOAT, {.dbl = 1.0 },
-FLT_MAX, FLT_MAX, FF_MPV_OPT_FLAGS}, \
+{"border_mask", "increase the quantizer for macroblocks close to borders",
FF_MPV_MAIN_OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX,
FLT_MAX, FF_MPV_OPT_FLAGS}, \
+{"lmin", "minimum Lagrange factor (VBR)",
FF_MPV_MAIN_OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 2*FF_QP2LAMBDA }, 0,
INT_MAX, FF_MPV_OPT_FLAGS }, \
+{"lmax", "maximum Lagrange factor (VBR)",
FF_MPV_MAIN_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0,
INT_MAX, FF_MPV_OPT_FLAGS }, \
{"ibias", "intra quant bias",
FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS
}, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"pbias", "inter quant bias",
FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS
}, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"motion_est", "motion estimation algorithm",
FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO,
FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index c41682b29c..fa28e6d61d 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -118,10 +118,12 @@ static double get_diff_limited_q(MPVMainEncContext *m,
RateControlEntry *rce, do
/**
* Get the qmin & qmax for pict_type.
*/
-static void get_qminmax(int *qmin_ret, int *qmax_ret, MPVEncContext *s, int
pict_type)
+static void get_qminmax(int *qmin_ret, int *qmax_ret,
+ MPVMainEncContext *m, int pict_type)
{
- int qmin = s->lmin;
- int qmax = s->lmax;
+ MPVEncContext *const s = &m->common;
+ int qmin = m->lmin;
+ int qmax = m->lmax;
av_assert0(qmin <= qmax);
@@ -158,13 +160,13 @@ static double modify_qscale(MPVMainEncContext *m,
RateControlEntry *rce,
const int pict_type = rce->new_pict_type;
int qmin, qmax;
- get_qminmax(&qmin, &qmax, s, pict_type);
+ get_qminmax(&qmin, &qmax, m, pict_type);
/* modulation */
- if (s->rc_qmod_freq &&
- frame_num % s->rc_qmod_freq == 0 &&
+ if (m->rc_qmod_freq &&
+ frame_num % m->rc_qmod_freq == 0 &&
pict_type == AV_PICTURE_TYPE_P)
- q *= s->rc_qmod_amp;
+ q *= m->rc_qmod_amp;
/* buffer overflow/underflow protection */
if (buffer_size) {
@@ -177,7 +179,7 @@ static double modify_qscale(MPVMainEncContext *m,
RateControlEntry *rce,
d = 1.0;
else if (d < 0.0001)
d = 0.0001;
- q *= pow(d, 1.0 / s->rc_buffer_aggressivity);
+ q *= pow(d, 1.0 / m->rc_buffer_aggressivity);
q_limit = bits2qp(rce,
FFMAX((min_rate - buffer_size +
rcc->buffer_index) *
@@ -197,7 +199,7 @@ static double modify_qscale(MPVMainEncContext *m,
RateControlEntry *rce,
d = 1.0;
else if (d < 0.0001)
d = 0.0001;
- q /= pow(d, 1.0 / s->rc_buffer_aggressivity);
+ q /= pow(d, 1.0 / m->rc_buffer_aggressivity);
q_limit = bits2qp(rce,
FFMAX(rcc->buffer_index *
@@ -213,8 +215,8 @@ static double modify_qscale(MPVMainEncContext *m,
RateControlEntry *rce,
}
ff_dlog(s, "q:%f max:%f min:%f size:%f index:%f agr:%f\n",
q, max_rate, min_rate, buffer_size, rcc->buffer_index,
- s->rc_buffer_aggressivity);
- if (s->rc_qsquish == 0.0 || qmin == qmax) {
+ m->rc_buffer_aggressivity);
+ if (m->rc_qsquish == 0.0 || qmin == qmax) {
if (q < qmin)
q = qmin;
else if (q > qmax)
@@ -275,7 +277,7 @@ static double get_qscale(MPVMainEncContext *m,
RateControlEntry *rce,
bits = av_expr_eval(rcc->rc_eq_eval, const_values, rce);
if (isnan(bits)) {
- av_log(s->avctx, AV_LOG_ERROR, "Error evaluating rc_eq \"%s\"\n",
s->rc_eq);
+ av_log(s->avctx, AV_LOG_ERROR, "Error evaluating rc_eq \"%s\"\n",
m->rc_eq);
return -1;
}
@@ -522,11 +524,11 @@ av_cold int ff_rate_control_init(MPVMainEncContext *m)
}
res = av_expr_parse(&rcc->rc_eq_eval,
- s->rc_eq ? s->rc_eq : "tex^qComp",
+ m->rc_eq ? m->rc_eq : "tex^qComp",
const_names, func1_names, func1,
NULL, NULL, 0, s->avctx);
if (res < 0) {
- av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\"\n",
s->rc_eq);
+ av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\"\n",
m->rc_eq);
return res;
}
@@ -627,9 +629,9 @@ av_cold int ff_rate_control_init(MPVMainEncContext *m)
return -1;
}
/* init stuff with the user specified complexity */
- if (s->rc_initial_cplx) {
+ if (m->rc_initial_cplx) {
for (i = 0; i < 60 * 30; i++) {
- double bits = s->rc_initial_cplx * (i / 10000.0 + 1.0) *
s->mb_num;
+ double bits = m->rc_initial_cplx * (i / 10000.0 + 1.0) *
s->mb_num;
RateControlEntry rce;
if (i % ((m->gop_size + 3) / 4) == 0)
@@ -753,7 +755,7 @@ static void adaptive_quantization(MPVMainEncContext *m,
double q)
const float temp_cplx_masking = s->avctx->temporal_cplx_masking;
const float spatial_cplx_masking = s->avctx->spatial_cplx_masking;
const float p_masking = s->avctx->p_masking;
- const float border_masking = s->border_masking;
+ const float border_masking = m->border_masking;
float bits_sum = 0.0;
float cplx_sum = 0.0;
float *cplx_tab = s->cplx_tab;
@@ -895,7 +897,7 @@ float ff_rate_estimate_qscale(MPVMainEncContext *m, int
dry_run)
Picture * const pic = &s->current_picture;
emms_c();
- get_qminmax(&qmin, &qmax, s, pict_type);
+ get_qminmax(&qmin, &qmax, m, pict_type);
fps = get_fps(s->avctx);
/* update predictors */
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 6ff0491a77..ce5baa754f 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -75,8 +75,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
mpv->avctx = avctx;
mpv->bit_rate= avctx->bit_rate;
- mpv->lmin = avctx->mb_lmin;
- mpv->lmax = avctx->mb_lmax;
+ s->m.lmin = avctx->mb_lmin;
+ s->m.lmax = avctx->mb_lmax;
mpv->mb_num = (avctx->width * avctx->height + 255) / 256; // For
ratecontrol
mpv->me.temp =
@@ -1907,7 +1907,7 @@ static const AVOption options[] = {
"defined in the section 'Expression Evaluation', the following functions
are available: "
"bits2qp(bits), qp2bits(qp). Also the following constants are available:
iTex pTex tex mv "
"fCode iCount mcVar var isI isP isB avgQP qComp avgIITex avgPITex
avgPPTex avgBPTex avgTex.",
-
OFFSET(m.common.rc_eq), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE },
+
OFFSET(m.rc_eq), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE },
{ NULL },
};
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
