From patchwork Tue Feb 1 13:06:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34066 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:e44f:0:0:0:0:0 with SMTP id d15csp3768938qvm; Tue, 1 Feb 2022 05:19:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJxz1UuR8jH1dhjUdMNjHvova5oISFBnGRLp3p6AYUhoNPLbMXLMiXwbkhDJJJKOxejqSgyC X-Received: by 2002:a17:906:2e8b:: with SMTP id o11mr21424561eji.383.1643721590027; Tue, 01 Feb 2022 05:19:50 -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 dr7si10724500ejc.798.2022.02.01.05.19.49; Tue, 01 Feb 2022 05:19:50 -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=WTnaNoV7; 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 C000068B3B0; Tue, 1 Feb 2022 15:08:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2064.outbound.protection.outlook.com [40.92.91.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1590F68B3B2 for ; Tue, 1 Feb 2022 15:08:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CWzq4xcSdTfPiLscmrblS1mV4YI2WobCSH6nbWNpAF4LuWA/LexLAWIm9oiZTJtIRqb6JpkzW0igDfFkzZjfIbLgKy3atP4peRG8rrx9vsXZnmCztQp023iCyb2a756E86fPl2pk9+5/Shuq1p2z5MAjcMEYcR+c1Bb6fcEZVsClAnXPCTgf7ZOBm5mi2KTNm47Zu9At+B9AMB20h4jNHq3HXrF4I8kWB9KW9AIjPJ4dUmkyubNd3rmUYPELvh5CoHChqgnGVOx/Z1S6f0ZFAVN6aocTgIg20bVdAQ89o+YPQrBWIuUTWpScr1JHsA1XTOuWT+XV/rvDe18jMoPiwA== 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=nBaED/XnwDL/+ZUAuJpzU9iMcsphrJ2rc203Q0cSKrk=; b=cjglRmNJPQ37d+yNeOgg4AOeFLCj173vAl7RgrjAYcWbnKzA98+IXil7IEhHFdnM+06aku1YasCEewAlpi+v+6efLdpJ0JBdVr8rFnwEgLN+J7BuJHi4xicXNeldFPM9nQ+SFmiCM3EMWaQy+QtWhYXWZwj7HBg+FJSmYQBN2mVFy/L9HqKlh5HBLs8yHaua72Ff8QnufPAYZBqY75dGI2Vjew2sNBr4HUgsY2xV2hdsV0upGgawCSMVg+/IQJhttOyYw31BNQdZ+7IElSFPL6nGqgcBzLzkKfuMB0mPFe9cgnHgy3y09YBp5MjKH1ZP/zox1Ak2t+D2Gf8uR+JqCQ== 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=nBaED/XnwDL/+ZUAuJpzU9iMcsphrJ2rc203Q0cSKrk=; b=WTnaNoV7NLjtwAyIYvOvhw+PP5IrIakAjwaILD/bN+7tmD7k3vaIInmhzCJpWQGRueLTMKudrVUV0bjWfVBp8pccH15tF2cQsU5dlnuGzzOhl1C8Xoet0iomW3y9Ej0aZ/W4RQxjbUOF3i2NqHk0kSCL7miRVR8wUmw42vEtqfb++b52QUBS6c8K4zVYCNPxgRx/V6B/+C1kx7mZ6ROcALY/OTtuBAUkGLUBpiOHDIYn6CfOvxI5WUKAoeqXNPrCYuNykP+3Of6n8MD8FBPVRfj6L9u3MbOFUM83VMOL3Oas5CKOslNucIIY7mexHBYxi183Am0GxL2OHcw7tX7vGg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB7962.eurprd03.prod.outlook.com (2603:10a6:20b:439::17) 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:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:49 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [sjaIQBlV1teAjGWWevc4jN5j7MyCrbs6] 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-51-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6776889-a8df-43e0-cb63-08d9e583f43e X-MS-TrafficTypeDiagnostic: AM9PR03MB7962:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6wlNuoqOEGtyjWID8ptyng26rW3O2HacRHUNAGmXfHxnjfF46dGrjh5Yw6J9nRzMNSTzg4Su7m+VI3HKDXuawhNKiPmW/dovoXkJrUV04je4Qff62MfYMVHJK2QX4wLL/EZmcCrDIRrq0dDdim3maKxiGxPH72Sih8pPY0o3/+cCd3KPXr5xt2WztHpGt2jSQw5RbCxHOV6UbfrvvY9fgZ0QQwCJq/raYM+qox8W03H19OYSgVtdy8qpicHrsi3GP4wZBjk8xycO9SyQRCDamrVNmxXRntaw8vEye6/5HJrA5N/BM5qxb9nC+doFYSAFXSS0VAt+cLfjm7lycXGXSnsbiyUHIVz3xs9tgvG59SCgUw39wgQNn63wFR1O/fchRP03MFp35cLVWbJw09qSou1cUG8CQClvuaxFphZLIAnEM9JRF/0nxJbkKgn/973Y2TSFKYDJl9vzGpreRPNPoGxCM+4/EQpKaCwUfCEtzHfVWNSmCpTKYILVPLkrFVenY0DbAWcxvs9wOcCY113LGg4FWwaNv4W5gHxysmyoJ2Y= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +QzujVY5zWqbP18Zegyej7aAMTLTRkJy7wZPCB/6EXYRF5mx9PIQ2bkP4HeHrxfHAm0PPAGgYvLWUpKTFtN+ZPQGQQ6Y2urnmpS26hYI9WA3rYYRuWLNH9RMR8ycvbj3MCUOTuTSeaXLSa6PqDjwDBKs+LwPuCDFplwjS05DH4kYGdNOiS0rVPFURzuz//Bt8WYBC/0dPnRs923g1sSZPj8oA2poBUREOnUX2ZWAj2HlIFUI5ZwXD2FgB8mPuqeJi3BDpXED1e+O3c7kK3kmvQlukJ7Z+Y20vtS59SpVwG5I83V7izXMdtRH+XbfHwx0T0KHTI/ERajNTzbOT30x84tqEJEnwnx2wgdJMoe6IAxI7N6BDZ8RCkCNnfOzpC7OoY3rf/u2skDls6958IgbS/RAj84Y6paWLpy3p1r2bYatfVOZL/UdA3Ne9HWTT+eWZBawxzvtUNL+ydzPNM46UdZAxFTiNN7hOADGpl7WoLBfF8/aRFqyT0jLxRoCA0n7Aqlpjo1rinDY3U00Yex4S6Cfq+GEe1/ocLI+zAQbMuyvnQ4iO+ZbjSxcCORM8zpYkSzc9lvivUBwa/TFdeYy6bRVtSUMX5QmQR+TtO6CCaydlUvUkVIb0GfTx/iB9ZKelF36bde3i1OONUBTuWoEgVTg7mivD/IOIjUa74jS/X34/HfDrStKDCdbyyWlItrggPPfQiXv+RgNB0g08oR1q4BRI8cuCGNCC6WvEIOFQpEmr4eaMxm3WscR8b+TiXcfCZPVLtJPMbPlUhP46KZgMohq9DBBIaO2KJ7DC7p18uzIAA3izpfQpmbm/8FcdgBf9/L91CeU+1zdn5efYMc3AKyMSeGrhNk1Iqee0+BbbsxhY1zyOfHEkE1HkZoXMteqT9yPhSSjqwiVQDld1jZqEL8NOidjVR5XMffVSu4yvMGhOz/ph/6WnwV8aBits3qhxH7p29k1KTqX+bNUhf2+TA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6776889-a8df-43e0-cb63-08d9e583f43e 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:35.1800 (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: AM9PR03MB7962 Subject: [FFmpeg-devel] [PATCH v2 52/69] avcodec/mpegvideo: Move input_picture_number 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: KZ2bgvnWUxiN Content-Length: 2538 Only used by the main encoder thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 1 - libavcodec/mpegvideo_enc.c | 4 ++-- libavcodec/mpegvideoenc.h | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index ce2d36ab15..99361f0733 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -104,7 +104,6 @@ typedef struct MPVContext { /* sequence parameters */ int context_initialized; - int input_picture_number; ///< used to set pic->display_picture_number, should not be used for/by anything else int coded_picture_number; ///< used to set pic->coded_picture_number, should not be used for/by anything else int picture_number; //FIXME remove, unclear definition int mb_width, mb_height; ///< number of MBs horizontally & vertically diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 06c6e5cca1..ecc25ba8a2 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -291,7 +291,7 @@ static void mpv_encode_defaults(MPVMainEncContext *m) s->me.mv_penalty = default_mv_penalty; s->fcode_tab = default_fcode_tab; - s->input_picture_number = 0; + m->input_picture_number = 0; m->picture_in_gop_number = 0; } @@ -1080,7 +1080,7 @@ static int load_input_picture(MPVMainEncContext *m, const AVFrame *pic_arg) if (pic_arg) { pts = pic_arg->pts; - display_picture_number = s->input_picture_number++; + display_picture_number = m->input_picture_number++; if (pts != AV_NOPTS_VALUE) { if (m->user_specified_pts != AV_NOPTS_VALUE) { diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index 8f6d069369..42731a5edc 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -48,6 +48,7 @@ typedef struct MPVMainEncContext { int gop_size; int picture_in_gop_number; ///< 0-> first pic in gop, ... + int input_picture_number; ///< used to set pic->display_picture_number, should not be used for/by anything else /** last non-zero pts from AVFrame which was passed into avcodec_send_frame() */ int64_t user_specified_pts;