From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B2D4A40768 for ; Sun, 30 Jan 2022 06:33:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27FDF68B2F5; Sun, 30 Jan 2022 08:29:21 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2023.outbound.protection.outlook.com [40.92.91.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B843C68B2E2 for ; Sun, 30 Jan 2022 08:29:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hI+W7SFKfHJUjybawGsXGSSfdaFeA0lE0ETliukEGqV0a58DGDw3NA0HVU6ICSFyztAaukv+b+3CE8ZMIHLRCzTKBcZKs/IcJfI1hfPLOHykwYC5Fwd4Ee1zBKbTXD77RADoB9Fm3HSsgJ4+TuWMYVqXpdEgJkwsn9/1th4EbNTt49N/vHdGZ2cYaxxKbJ6smGbcIHWYt+alqV6UOELpZAd3MiWf7l2tBnJHFnc9Wcq/ppQxdLMy9QqAXKiKz11IxYl9zdY6ns2AMWNedgu9FCvfa+wHvkdZsVxivecrBB1M+P+0WyRAXSS6cAiJpUo/B5gdGlErgGSX/0FKNMVDKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ImvEkyh2G2kfls4y/2uM/Tm8dx0f6mO/plE1b6W0oCU=; b=JJpC6HjJmZTWXbDOkVelNp+/E/knj55oH7aeevMcrhKxY82Fbnrrug5alU6imchsll+b8IacXSgnOTpxLRWlN1oMQoRuy+nQkCHuc3lXc6llWCzJXWPp4dNT8mi7GFo/aanXf2DDE0IBpnrCvFYqU7o4o1k+pPjt527LXn3mRyxkAZ9lTP9qojx0LaoW1pAYH9h7O+En7st9Zx1bN98QMV+dDnJd2SBT5vIiSn8tB0/mTgjwPVYuhfpNM/7+vFZhf43GWJJRMNQWdLvGTlJO0v/RFuVLbYYt+pJUu+xEqQmCU4ub1KcYuEVocsX65RPwocgQ+n4+IjauNPGmxihiRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ImvEkyh2G2kfls4y/2uM/Tm8dx0f6mO/plE1b6W0oCU=; b=nZfLbMUkEKV/PcwiZzp7o+6J8+Ftbqb6cu+Nh68mEU779J3nKmXml0owZVV742dSbLMi/UXrkv6Hl0kzYuItbUZo1gR+91YOwA7hvTtsPYgbv9iL6uCpSYbvwRE5Goqkd3NzTlEMnxXTD7OUJTolkF0X+3uXi7h04si11AmFSC6dzA/PTbTRa/z294cYseEdnhSXu064zYw/jsdgOlJ3NGbHw3ff5z4fT45kZZ6a2z2vEzkq1Omxw2kElsUjoCWvSMEZlilsVOoavH0mTRg2JwABtFJl0RHf+1BLLvexdsbxoLnh2n5oS3PmB8EVBmMghpKUMhAQGCezTzN3y0+KWw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB6239.eurprd03.prod.outlook.com (2603:10a6:800:140::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:29:13 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4930.021; Sun, 30 Jan 2022 06:29:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [vyQuJbW05HDNhepS4aLWP6gsoy+DWayu] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-33-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1593ce4b-08d0-4ce7-884d-08d9e3b9d523 X-MS-TrafficTypeDiagnostic: VI1PR03MB6239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7fM/4nmv0hESBXMmgvMS81uoI/OqQpibBDEm7vhKyhMZFi0MAv5FCgzeqs8WHtR8mANPR1IYZ93z0QX3hw+yHEm2TAVo0C0TIj+7yYG5Rmc+oghSrsYELbncivFYERp+ZV9GB3Kc3yUkV0ymWBHdTuAqYhcsal17PGpdGpfx2wAinIJLysM4dExZe6+KH2HUBOSl0ubB6Rqb7+4NlOiy+KQGt1oyoM005YEaEPYk4RDPxRsBZsHoj7zRwYIGoFDdIs68XBBu3n9RRlC0IntzJ6lMNh8kwj1kHEQhY1N+y/Th7VxbqMsE9kDH5abcOsNPjHiecvR/uqim9tlQQNKjTxVGzU4CZzwiJ1GiZc5pAzzIam4z8tA0mPB/0B3Z0YlpbT6QLkRiZKEe6dSsjos90lE7at+Eiu7TKXxOBrG/zx8p1+tnF9/nujMiwrf4uWoouzJfSbpklU3vnVOG8VBoZiaHvurE0H5yyjUtjtpcO4lB7k9F770GBRhM2U6p3u6gjnxyubRfhO4Mcv4nS/uNgzzGmEzWHSWUufT1F4+x/pdHILec8kU5MOVwitUaUwj5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CsKc+AjNEt44NXziKm/AYeWOLLMwEc2NXydwQKehFHfetYvBchB6LZ0XVWzY?= =?us-ascii?Q?lb60wXPkdBMb+VxA3QMXyEh6kIZTuvPcC90CHA3guX8m+03859lFuaU+N0cx?= =?us-ascii?Q?5KEFBb2o1PzDfyqAT4KjxdApqP1Imp21d5Z1GPZvL5aWwFvRJgxQfpkE9GSi?= =?us-ascii?Q?OA4NnNQpCnophwKXh8jTsNrOhg1a49LRjUUGxRcmZvNXA4BTPjwSxytRUdzF?= =?us-ascii?Q?SrCW/LJKG+FkH5k1vWTv3MqFZ4lRjoGKALxad5SNmZpUVBm0MTLQRvgjjYhx?= =?us-ascii?Q?eAu9p+a1/S2baCVCM21Awyx8RZHuvRSpNi7xddwncigCPMfoRMRWhrDTCP2b?= =?us-ascii?Q?gIny0/YorZVtjhAWb28lTj58P2BKZC34NQTISp+TiqwC1id3HrLyhVXYWV0d?= =?us-ascii?Q?BO4Av4PTfjT2XCE70ARuitTMU3JWcomwKGMQpPKtfCYbbJ3kVRqmfXWFl1rk?= =?us-ascii?Q?NC9mrHAMoj3HKFd3WtqXZ1eq6Y6X7cjUxvuGTbcmCRsEwhBXuYQwfTntjOpI?= =?us-ascii?Q?E0h5VxiRh7lLkjhWztPHLdxs+L5Sg93AWgiiRrzAVoXdA6kemecwfsPvw+Ck?= =?us-ascii?Q?wgFXcALXYuvPnPAnv3UqFQ7gUsO+1LLQjdcX2oDFs8xAjRpqblylWBk9+Uzi?= =?us-ascii?Q?74HySKoVv/v1gUp9DDWHDjiL+foQ1q5Z/sLqWUnlvl26Hv35QqmfWIZIwova?= =?us-ascii?Q?gGmtz3GwyPcQ8qPPt/X7/FaR9FCb3iCWvJ04M6WvDZXopNoJaIcZbn0d0gtT?= =?us-ascii?Q?j//4kwkMnS0vm2gKIcLHfAn4iEr9W3SElqRtUKMKNykreOYJWWUBZPg0FC3G?= =?us-ascii?Q?DKIGGKzOxlzaGpW0NsMFUFV+f1JfzPxCu4kqe4R50LZRI+yPb/IamLcLmCuU?= =?us-ascii?Q?MIfWSeJvqga51XBGd9R4z5OlNpRPcDMVPHnIYxRvSp2k/wQ+gc2xWnkby3tb?= =?us-ascii?Q?I3YcdMVKd+Zqs2scNOc6Hg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1593ce4b-08d0-4ce7-884d-08d9e3b9d523 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:29:13.4747 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB6239 Subject: [FFmpeg-devel] [PATCH 34/41] avcodec/mpegvideo: Move ratecontrol parameters to MPVMainEncContext X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: All except vbv_ignore_qmax are only ever used by the main encoding thread. Signed-off-by: Andreas Rheinhardt --- 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 c11aba340e..ed62175db5 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -473,21 +473,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 1039a50db8..fd82681869 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -406,7 +406,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; @@ -1746,7 +1746,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 539bdf3065..ada5935410 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -68,6 +68,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[MAX_B_FRAMES + 2]; @@ -123,19 +136,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-request@ffmpeg.org with subject "unsubscribe".