From patchwork Tue Feb 1 13:06:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp609432iov; Tue, 1 Feb 2022 05:18:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJzr55Ld2YHWbZryIP6lIalIkJM3ytGykTrWbmlWRJ2TlwI7skCftYOL0BH4ZsNiPvrxydxu X-Received: by 2002:aa7:d459:: with SMTP id q25mr24720580edr.212.1643721513914; Tue, 01 Feb 2022 05:18:33 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g19si9014243ejt.914.2022.02.01.05.18.20; Tue, 01 Feb 2022 05:18:33 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=A4VcWJtB; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF46468B3F2; Tue, 1 Feb 2022 15:08:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075035.outbound.protection.outlook.com [40.92.75.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABB8A68B3A4 for ; Tue, 1 Feb 2022 15:08:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M4elRfTKCorGDelPGFdTIoSiCIDe7C30IsciYHmo/4IVo9kwusSuy3fsg5bUaDLZTEKt89MUkQFoI/8X5NoFKpPv7aOzPLC4hf/LuISh0TgYxVgstH+zM2Z6Y3o4hOd31ST3x5WzekzDQXc+N6cAy/w5uNz3wQaZy4Hl7IgaOFdHHSZrffN7Z/thGPEezMzME3fwWmYczPmQXI3VRpAM0Oy3kbbJ9jzk2fImckkabTgdeJOE1+gnoW5rniTgTRfhH1OJtaukFCGoYHwOKR3c4x3m6Vj6N9jQ1ez5yVa6vA/RWpe/7VlE4dHD4mwMWJfFUPR05H9SLzs7FWykWwpilA== 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=jkZ22pY+xjsp6ZOrMFqMbXVeGksMv+8hf4TtKQb0o6w=; b=I781Sr01iLxavrMduesLHlGofFFAX6YcWb4BgtTye2so8aZo8aJKpzC/FPrK764Ya2M01Ga719vAqOAV4/675JyOXXLVEl+ehM/35Y1czNyQqJ9/+mlXvvCWAFWIewRd0hxIEWk5KPLnpUr36jV5y2m0kTVb4LCTk0lhsGkRZyUkK4hZ3ch3zfzbggS4FFf7+wz3N/i/Rq+FzPKNp/zwyznnMqMRmB8/ILZlqH8cuZF3R40MI5/hHfmXLDcoQ8EUW3INVtGqLmYHXsGgt5HZqytDjNFM+5MpwSvLQxM7tV5HfwL5+YLLnp8vi5VC+P5OlVNqXNDQj2v9H/lEmlyvUg== 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=jkZ22pY+xjsp6ZOrMFqMbXVeGksMv+8hf4TtKQb0o6w=; b=A4VcWJtBKvhHz6z4dutuuvz0f8Y3UfrqapOZ8hCO3NFJJqSGHv5MVLmBhv6NqXIXWmM/zuRozLz8vqhYY0zkR+tSZ5D8AMLx+YnpVwaMFJZHHmfT2beAQc0GfUT/T4TM5WlTx8KF2ND/Jr+89qGejbMVMaOAYNqU0PXaY/kl87+xOvIBpCY5QCvyl8e9yj7lmQa1tcQM3sBldNKn1E+ib5w6G8erPoj/35LepKwE5TlghCfzFwbN8cIh0hPJ3QbeF6KvTGua/4NLNiT4+kVRq4hwwmmcXqQ9TbVeScemZJPpZYnPmwz0Oy2+hYadMvfHuAuqMKQYnjMLxbnDPBV8UQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by HE1PR0301MB2330.eurprd03.prod.outlook.com (2603:10a6:3:73::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:08:37 +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.4951.011; Tue, 1 Feb 2022 13:08:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:41 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [SbYVpO9ZsgJxaf+sBmba2XtbYPp4VLeQ] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-43-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 153ec003-7f5a-4708-3213-08d9e583eb62 X-MS-TrafficTypeDiagnostic: HE1PR0301MB2330:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 19Otz3r9i1hqdDy7Jy6RoWJtZ3Q7jTQh6BuU3IHJvVvielY5QgshF14Y6rhgAcMBOHkRyLaormcjjn3Yoa/IHbOgF9qzpMooW2/X4Y0Hzf4zhwLDgsE6IGHBULBo9cTYiWqZc50lIq0FkbJ1OKsfm6g3eg5HoogbBxUo068wW7Hduda8WjBHYPC6Jokgy7wZQxqkH2gEeBlseVptr7Amk7+3NEGb3V/TmF9xTXMuqPu9AXCMlMCAF9KovKJRwFk0YPPGIqzzWBrgrRBG3bdqTX46Cq1IwvhfJ+igNeVMrNc2hJi4lawshfEKcJsElVvca+J5/TPrH8p05zFYnptqv0tnO0d48KLWpjZKfLw3P0yUfCp9EwNjX7O28Wq8HrA0/aCKatQsLEp/o0L9vYwVIyei28HlVerlA3RWcuykEObD4PdsTfnlPvE/6VUVB37rwUXon9dK0mvzHIkGSbtAX4/GQiPc3Gn676Bj06MDSCuciAGRkRKVEcF4+VmRdC08sJf0aaYKqqLU61nJYQwZJxgFGbVnfdg6wfMBNwydThW4pYKP7T20eEbZliulPQcX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qJUinUlKDP8KBQ07YBgpL7N/uoa+V/qHmG+jh+DBTCR48EnYHFRdW+7alree+wptK8G9rsd8477d51Y7Vk4stskoLEHoq3e8vfg0wCNLZ2lRepM2Gc179DN8sIT4RAcY20uq4i2EpHr3/Vk33a5zAVgWrZff27OD7xphwbiF9f+f32i6UPZQDSCyKEobDOqisBTN171XTwFUlYIWciZgj7/C4r2scJUtdHoaBGF6RS0tl0wChTuAEIlpKkIQUkt/BdLyIfdvk+4ewEY144ztz6Q1Ve6N6lTBCF2c6oFTdw+5lMG9td5Dd5KTT1bYhWrzktBYtbkMURoMVwqVthcXFwPdYAmtS8bnn0OnciuO6wA0cPb2+O/zDQv8dBoAqEQZJhMygJSaJSBqsuuv2oTXGH/3xpdnQVAyImfF+k6R6exyGnSTlQwFlVu13RWhZIPHy+tpIqLLo/8L0BJugpIVu9pTsgasXlxuq1mwnW1XNUZsdsF2otGjwWzYNLBa+xDB5n0e4n2DHFDEKiBnmXDynvrzFs/7D3wTegMPFrXzkVqAKcJGofpXRXGHK4kMbh8/RvASTsBHCsrGPeYnUD6T/ql9KgoNEiHSZBBlwA/9knVLZFf8uRdIZ3/K8yIqEN024URJQ7nkj3nbw304y5YmaIiTHQNmEssEPHULGHYgAMj8UjbiilUwPJ54LTXm83AM4u3VDXGRE1Uoh/LMfUoROq74PyGpJ2Hy2tF4HPUb3T3EqIIoepflKCYIPpF9TzCQQi848BDzc2g9f6IUxfvseIJQUolzz2PBqi2079JhOhTIAVxnm5RGPmzM0kFp0NFcZ43TmYMUHoZNVzwgvB9dZgp4YvDXUukZ7nk2SOdLb9xR0Gn05wLKLD2R03EeodPfNQl1mkN/JHMHP1vU/9Ui41G6r6GcjLT0IG9VucTSniXFBarOnp8Y+DRxg/z4ssInbZzcLQfebYZzPzDg+iKBhg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 153ec003-7f5a-4708-3213-08d9e583eb62 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:08:20.3130 (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: HE1PR0301MB2330 Subject: [FFmpeg-devel] [PATCH v2 44/69] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uYxUG71vs3Kz 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 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 }, };