From patchwork Tue Feb 1 13:06:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34011 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp607679iov; Tue, 1 Feb 2022 05:16:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLA+s9u6xlie3q+OekiAd/ze5EBz5DmCjvLWumnyhTlVHhaMUuzPLweginI4ghL3h8ccC7 X-Received: by 2002:a17:907:1b0b:: with SMTP id mp11mr20647217ejc.382.1643721374502; Tue, 01 Feb 2022 05:16:14 -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 m2si9478909edf.567.2022.02.01.05.16.13; Tue, 01 Feb 2022 05:16:14 -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=o5ic4nFc; 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 5637568B3A9; Tue, 1 Feb 2022 15:08:43 +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 D2E4D68B317 for ; Tue, 1 Feb 2022 15:08:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SryO4UENT+F2yXqb4iT+18gU7t7xeGuH/J0YOujUDMPcjGsP6mOWObHX7dephjRxqX5voiApadP1Seik2TP5Pi1yUUlEXROZEpCk00Bwbu7uhhfFLXYvgFs0azzalTLPqmAug/8e45lToVd15H1rP+4V3GbJ1rVy/yQ1OQ4oBOAPxhvbFJMYY7fpysmcte/xNCVqZG5xQHVL1gCScfHFjdYELJij8oAwKYpILtyF/rlBmSnP3TiWLBlTh6d7/Kt/ONJactMNXuVhyyZqmnqxZ3mJ1utaezwq+CYD0LnfgtR6w+3YeLdLi0o4llVa3UvgcmmU0ZpfU8NWFnkq/OEWzw== 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=wRUQPZLGLeTJPbj5bpDtS+8+2wCqjSnYNqFUMB+mA/8=; b=BVtV2pcXQ7E5+ndstF5x+WHbE1BzBlg492bmQHrkfoWPwuiHiV2c7JWgpsMqfWwQ2aYYr7yOrlSEJkEXky1lSwQNbQDc81ui0S6bY9vLZRLy1cLNrWNnjxJAU9mEuHin6xLxJddBY90+P8Sk8qKB24NuUpq2K5ijzrcwOKje9GqRWMNuDIRBhhVKTNuISSf4DF3i0DaYCUKMyM8oS0Aoo5mW07qQSawttLIAcfnntUr9CXzFvcRLvUfYAux3n15IPy0Qcw1ZEpIpLhqcmOYwfrZWNv5zXIFJiKQP1Ix5/vythRnFTvkhYFB5onE3YCgEWGfdJlSeaU3pS71JNGvpnw== 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=wRUQPZLGLeTJPbj5bpDtS+8+2wCqjSnYNqFUMB+mA/8=; b=o5ic4nFc8YetiGeoKgGpLimZuzG8dffBwfTY1BZgNcu/UwrJ68OjtyLyxhrOrEPjPby2JBiKHuLKIz4eJrNrNksoYvGbOWVFU8eDl7IaefbDdctOFjK1TMlCmWK5mkR3QUsHA78Kr5T0qxeMck6ZZp573Y/Il9Pxu0659WgKGC6rZwVbxso6L9W6Ulm8udjnZUEnNYMN7L0xMoZ17AKDXvZSTAQdqfbEuLVIE4EJEy0rUsSTl46E1cKyacW93OVOKEIEqQSMSMOcBAp6UEW9k/YUkM9JC5SIygUBvI/mpEOkDUNSIqkt55xozP22zLX81DdNz3fVhJ1an8RcJCPQ1A== 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:35 +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:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:35 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [gzlWhGcKkgQrOLT00yUYn3jLy4Bwhfn6] 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-37-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 15a10ffd-876f-42f0-c78f-08d9e583e3b4 X-MS-TrafficTypeDiagnostic: HE1PR0301MB2330:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KfLEuDuob0KWuNFTtki5gtMsudTniEtg0/Ju5X/aev76NvoIC1y9jv52Sj1YSo/jrtcXEx+MZGYG51OZUMurHmH9SEA4LjWO8C46glf09iLVZKkidt2ihbPm5exH/siZ5Fc48lIFNcnjbUwx1gRgJec+OV0yhymNDxYDpJcm5AIiaCDyDGvYiBSCL0GsDu3Bnf/My9P2HdwCMAcpCMYsyIXKv0zbCNgxPjLiuzEFyRVVnueohoITQjjPl1kVAaoB0OSj6aPxhH+R1JhBKW+7kuhehKQFHV6/+sjT5na5fvCBEoil78AR2RCaR+FIBVQ0+51undgJM/Ja+0RAqvCYdIEazzWoU8NMMaEq7UpVg4rtZKUz/deL+tg3lHarhrM0g22AbJnCuvfBZldupLtGS+xk0FOTQr06QAWw9C9VZFcitMFRn/2gK+SBFoE1pS7vN7Os4ilGtRqBggofY0LgC6hqvsV9MZ/e/ky33aP8W/6LbPKYT0S9ELUsy3xjHsih7fZrxYLWmk6CmAgNMlEDCL6NguphOGqpw02k0lcsPUc= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bnrYT7NimAcvW3WWeBAD1ZxYBBDtEc0VNHLqEq0Zuf0v4p3S+QFPsCtgE8tfhyI2c0oCSTKUTEJ2Qzb0QWJ+GsNfca/ULRa+FdRYxyY2NqsyfB2ghP3f5jEBo/3YwQooAjgFsfK6xzUM2gqzYdjz9/Ew7NPFLxfB6Dgp8gsEB1LABn1vaIfcn2+0egxhGiJIBSYCzh4RpPzQREUTfgy/hawHKP9jiMUSkHyrrSFx4777b/xgPb3kwQio4tG3bZliq51z8uc6cNrzWSYxAUaN0lAWBLBiiaK4tNDsbn2TdXGDhsi3fOXAsY5T5tvcuB+d3M7VXs7OOSugRRO6LGgO/b5qzkxzTFEE3ZOnGAmhMZ/sL3JtmymBodOF3SIDl/loIHghJIefH0HJD15Tq0yD9pK/WRCtQSrvD9bfuMRjD4/+QS18DjkBiag8W6vy2N795zStNDGSJKcW2J6T446oylHB1yiE7oT8tIo1PttOTsIKV4nWwnj6kfpIUiPsQrDdkD+lT2Etk3lRHY79nQt3MWPOB45Y0EQt/c+HvJQRlp7uIUFJOtjnCtuq07XnarkVfECM5C0qMbf7SR5vXb9yOvC41u1wtdmsXPp8dH9ajHqx+/8AVOuKmnLTupSBP3mITOvr4b352fGB2rHAhqsXBZTJwYGx+c2zyZEGXcxLgW916ktfSWQNJj1I25Ms82iUp36fOcLMZjia+ox4Cp2O1jZOy/1HU+0NKBGX35ERHK//59l4cQxIt3TlJZ6WSkOckCjpAVRRDTcdMYFL8qLGiieJ7yeKihjDuIIPkNGTMZ40pbswKcHIkA8laIWT77b82nb7AdHQyTyIiS0OsXIH7N5cDC0n2HXtl+hCQiuzfLjulR2MVp5u6S6ZlaAffId74DAUYN5h27QLxtFHihpD9+5k37agQMfZfPEhHpsHplTNlfX4VPybiUOpreJfMLAS991ppFn5QoP5TJlj7hKLlg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15a10ffd-876f-42f0-c78f-08d9e583e3b4 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:07.4480 (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 38/69] avcodec/mpegvideo: Move last-pic information 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: rq1Whf/Y0EvO last_pict_type, last_non_b_pict_type and last_lambda_for are only used by the encoder's main thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 3 --- libavcodec/mpegvideo_enc.c | 16 ++++++++-------- libavcodec/mpegvideoenc.h | 4 ++++ libavcodec/msmpeg4enc.c | 5 +++-- libavcodec/ratecontrol.c | 4 ++-- libavcodec/snowenc.c | 2 +- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 757c514a6d..14e5e241cc 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -180,10 +180,7 @@ typedef struct MPVContext { int dquant; ///< qscale difference to prev qscale int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ... int vbv_delay; - int last_pict_type; //FIXME removes - int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol int droppable; - int last_lambda_for[5]; ///< last lambda for a specific pict type int skipdct; ///< skip dct and code zero residual /* motion compensation */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c537ce8c19..6d45885185 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1240,9 +1240,9 @@ static int estimate_best_b_count(MPVMainEncContext *m) //emms_c(); //s->next_picture_ptr->quality; - p_lambda = s->last_lambda_for[AV_PICTURE_TYPE_P]; + p_lambda = m->last_lambda_for[AV_PICTURE_TYPE_P]; //p_lambda * FFABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset; - b_lambda = s->last_lambda_for[AV_PICTURE_TYPE_B]; + b_lambda = m->last_lambda_for[AV_PICTURE_TYPE_B]; if (!b_lambda) // FIXME we should do this somewhere else b_lambda = p_lambda; lambda2 = (b_lambda * b_lambda + (1 << FF_LAMBDA_SHIFT) / 2) >> @@ -1577,10 +1577,10 @@ static void frame_end(MPVMainEncContext *m) emms_c(); - s->last_pict_type = s->pict_type; - s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality; + m->last_pict_type = s->pict_type; + m->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality; if (s->pict_type!= AV_PICTURE_TYPE_B) - s->last_non_b_pict_type = s->pict_type; + m->last_non_b_pict_type = s->pict_type; } static void update_noise_reduction(MPVMainEncContext *m) @@ -3527,9 +3527,9 @@ static int encode_picture(MPVMainEncContext *m, int picture_number) ff_get_2pass_fcode(m); } else if (!(s->avctx->flags & AV_CODEC_FLAG_QSCALE)) { if(s->pict_type==AV_PICTURE_TYPE_B) - s->lambda= s->last_lambda_for[s->pict_type]; + s->lambda = m->last_lambda_for[s->pict_type]; else - s->lambda= s->last_lambda_for[s->last_non_b_pict_type]; + s->lambda = m->last_lambda_for[m->last_non_b_pict_type]; update_qscale(s); } @@ -3555,7 +3555,7 @@ static int encode_picture(MPVMainEncContext *m, int picture_number) s->lambda = (s->lambda * m->me_penalty_compensation + 128) >> 8; s->lambda2 = (s->lambda2 * (int64_t) m->me_penalty_compensation + 128) >> 8; if (s->pict_type != AV_PICTURE_TYPE_B) { - if ((m->me_pre && s->last_non_b_pict_type == AV_PICTURE_TYPE_I) || + if ((m->me_pre && m->last_non_b_pict_type == AV_PICTURE_TYPE_I) || m->me_pre == 2) { s->avctx->execute(s->avctx, pre_estimate_motion_thread, &s->thread_context[0], NULL, context_count, sizeof(void*)); } diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index d66462b19a..8eab164d7a 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -58,6 +58,10 @@ typedef struct MPVMainEncContext { * a delay */ int64_t reordered_pts; + int last_pict_type; //FIXME remove + int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol + int last_lambda_for[5]; ///< last lambda for a specific pict type + /* bit rate control */ int64_t total_bits; int frame_bits; ///< bits used for the current frame diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 7c1fa0a1e3..f8080a194c 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -151,7 +151,8 @@ av_cold void ff_msmpeg4_encode_init(MPVMainEncContext *m) static void find_best_tables(MSMPEG4EncContext *ms) { - MPVEncContext *const s = &ms->s.common; + MPVMainEncContext *const m = &ms->s; + MPVEncContext *const s = &m->common; int i; int best = 0, best_size = INT_MAX; int chroma_best = 0, best_chroma_size = INT_MAX; @@ -204,7 +205,7 @@ static void find_best_tables(MSMPEG4EncContext *ms) s->rl_table_index = best; s->rl_chroma_table_index= chroma_best; - if(s->pict_type != s->last_non_b_pict_type){ + if (s->pict_type != m->last_non_b_pict_type) { s->rl_table_index= 2; if(s->pict_type==AV_PICTURE_TYPE_I) s->rl_chroma_table_index= 1; diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 4e7bbe49a7..03466a1a43 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -901,10 +901,10 @@ float ff_rate_estimate_qscale(MPVMainEncContext *m, int dry_run) /* update predictors */ if (picture_number > 2 && !dry_run) { const int64_t last_var = - s->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum + m->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum : rcc->last_mc_mb_var_sum; av_assert1(m->frame_bits >= m->stuffing_bits); - update_predictor(&rcc->pred[s->last_pict_type], + update_predictor(&rcc->pred[m->last_pict_type], rcc->last_qscale, sqrt(last_var), m->frame_bits - m->stuffing_bits); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index ebed90c729..6ff0491a77 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1858,7 +1858,7 @@ redo_frame: return -1; if(avctx->flags&AV_CODEC_FLAG_PASS1) ff_write_pass1_stats(&s->m); - mpv->last_pict_type = mpv->pict_type; + s->m.last_pict_type = mpv->pict_type; emms_c();