From patchwork Wed Feb 2 06:01:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1266485iov; Tue, 1 Feb 2022 22:02:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/q6YeJJbWrSCfq5q+VUYEcOkK1ZWi4gJj2+/FW2TCdKb6Ak4/T/8l0lBi4OCtRN4088We X-Received: by 2002:a17:907:968f:: with SMTP id hd15mr15633137ejc.208.1643781749889; Tue, 01 Feb 2022 22:02:29 -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 z12si12493469edc.406.2022.02.01.22.02.29; Tue, 01 Feb 2022 22:02:29 -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=SBxKaabG; 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 191D368AF81; Wed, 2 Feb 2022 08:02:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067012.outbound.protection.outlook.com [40.92.67.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C27568B195 for ; Wed, 2 Feb 2022 08:02:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZelGYQS0Tn+N3IR9mQlUff6rl8E/ST73kKTcFXlM7XqOOahQsvEYZpfgp1zQ+nU0uzf23/zWwasWu/4F/YdjNrHj2e7422BwPOvQf477nHmsJJ/ZtJZMN1z2M+Yue1kwTRhg8KgfAc6+Pn9HBSmD0In8JS69NXWfE1D8FyLJVAAVoAyRJs5nQ/hGjdf4YIAEEc3Yd7R/Ji0U3ZziCyq9AAFk+ktfhjnLRo0S2uwp0ZA1l4VPT1C6Od6MZ4GkQVVQ32M+HuexDf1tMRYxpiBfMsFW6gjmADq+t9JQhyZxe6C9eq1ar/Di63gsXqyltKueUJ9yR5dnLff4P4ca4gNRQw== 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=z2zIAGlayOlV8Uc9K88nNWqxuJE8r5MxFe/jLwUayeQ=; b=XqlCoUUqas0CXLJNyH0We9ZLdKexJvyj6+6exUJ6g1840erLgmxw5sopjeZwiev6wQwXS5QpnL4A8FfF5RqDejUKUaz6A35bMShib8SE0PzH/WsqAqdK2wfmmpqPKSbhMnTKvkjTe8U9G92yFwBOsbxt3H8Be4sXVszuae0qgWBVQl6tTWzAPBT+XQM9/+cowlMc3pw6cIgc+wBYzHiuLIGHivZUIdf87WUGoYTx/Qp1i8iyFfdKC/MZD4IapWli120WIbw3Z1y5AszO4kHKnB1svUoS+0epBFKm8KUKc4KjMPCVSQi2i9ZMxAZD444IdQzYAXNJpxreX78uECLdkg== 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=z2zIAGlayOlV8Uc9K88nNWqxuJE8r5MxFe/jLwUayeQ=; b=SBxKaabGDO3wWdTTUmm+fa0VA6EoCvWmRYormbxbDHy+EWMo+Z5Y+krCzuu99yOYvqRhJUP2Bm0lhiZGAe2bQmeHuhW8smuOqj4K4HP5gomtrLrOzcw4Zz6IGu0WBEB6KoqusPIr1IM2Prpljkc+N5UsgAXn94BYyKAexeGc8zZxlfc4GJCwkGw+7P+EGzV6D3v+ILmkEFynp3UePIVnvumQ96Xq2NDCwb3PbIts3AEgCar7BOzzvO91fG33jgzRinu+8vW8coL3GdilRKOKWAIxsPWmMwA4N+QNrBY5DfEqObjlNBQ8J1/+g1xPMeYTe1tyRrwThDljSjOQ6H7f5Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0302MB2813.eurprd03.prod.outlook.com (2603:10a6:800:e2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Wed, 2 Feb 2022 06:02:07 +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; Wed, 2 Feb 2022 06:02:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Feb 2022 07:01:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [zPikoPYXbE0hOMQFlpLzgpigUM6aHKhv] X-ClientProxiedBy: AS9PR06CA0280.eurprd06.prod.outlook.com (2603:10a6:20b:45a::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220202060158.1636121-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 440b7541-95c9-4d0e-9724-08d9e6118b43 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2813:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tnYG0Q+EzkL6sdv74NPqlEMBC0WhhBAIzVTh+MOJlruFMrORPezTh3F0m4otHgq2kSVE6DbozfxaoV0kIJ8yzi9Vk3vGPZAWzFdBSB1l6EKjbfzABSp37cyJXx4LkFRsf2NVHHDpOVPa7R2bihwtmM84LsiaqauYx7EAhGkVnn3hN563l/j/ZOMYPuvdrFpiUu83bmKJGwvTGkP9n/wC/e2L6RkyvgOJ7w3myNEy+k2ZLcHi9pG8VZWK2E9/ZUXPbXlbO1lpdc2GcHYYhA2sRSHzakPH38VNM4hZSF7XbpaG52v3wlQ91IUzZeScYYpeYQg3TbokD2PyuTge+Gj6f6L1WTO/nZ2o91XPoPmN8ToecQhthP+P6VeqEv1xz2d/QKIMa+Cw7WKB8YAWXTydfHNbllLK20JcYnjQ5mcrjk/0iIZNuo8SmjEW1h43IdXjNn+h41z0wJSgBMlced4XNOWN19PUX8j6djWWHZ5WJ9obRHIQK6q3FnW5CuaGypBJ9Nd6BYfVGt40g81CkiB2oHGKVMkB145y+p/HS7qhBEHbMC8j9KtWDaxI7456i+tt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sZKpHzDiI5qJkLwgXVp95/xXznaRgkZj8fGBFbmZA2pOfxnKrPJnTe9o8vWj3pcYpmTl6FmYRQdH9VQR1qSSP0iuN0bWewOrVLncPqKlgV01wNb119LYdmhO9Kx/j1WUuUxuNUnOWNQ1DU7sTTIEvafE/58UcfeoOp+MZT9t3JMcW0bCqpXWLQCBEzt/4IOtt4QnicyNqv4+D9i0WByMpzuZ26jekjXqUiUgTyqRYF38QeLCuSvCR037IUK0jQsASiZddrvtcxBXl2/mNC61nRMFlPWEjYF2DtZpoRI6VZexLjJm/UUZk59I5ds9h4jEpMsV1AK79v4Jn6Frkwje8rcV1fH64uELu/6dk/K6alkJUUJVv/B3k8GaSH++TEZ5BF2U/Oc2MKrSqC3QhOWbQoq5PVZjqNNbJsFHrSiXZwyjd4+W1FaCH2TbtLyuXyRB22daQd86uCz9dzt8VP3jAnY9B7kfeuWYXRMa8qqcFuaILnPCqesHVbGNzKl31cvPEJ0ZNmkiUqgnvQO6yQLLb6BH1EQ1MtYix/kEZt9qE6nIaPR2v9CsC8jNYAdmi62RCnJkoiLXFa5rpZ/npwxstHIP3v9x6OeNOTbpz4u4HbE9JEffttqF7Lsp+e065EBQ9R+HibcHj4Zo0l4wD6HL9vkoYPOqihJU8VIpLnLBpRbpc+4NGTWwswgi/EZKFzwBQsS0a4YsEd//KzteB2SDsXEr0+NwNKOOdhM+7T/syhRHK45tMeudy4FbUS5lDLtSdH4akYTC+CKwcXH9+w9KA1vqUr7w1cQVR5OdS3HOXWFIqv1t0lK6aZB0/Z3B3s5WZbpBmvdtzFE4NLI7ANKstoIdXK1MAEdmcKetcyUNJ+MTOqy9p3YjQgqLq9+rWLtEkmRpo9kN7BzwZwnNz6wvHaX/4Pk6sejFa0HNWsuc1gkW+xXWJRKezGfrvQuDzV/8A1Z/xRcl1WCtpVDP3xxXOQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 440b7541-95c9-4d0e-9724-08d9e6118b43 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 06:02:07.6493 (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: VI1PR0302MB2813 Subject: [FFmpeg-devel] [PATCH 71/72] avcodec/mpegutils.h: Move DELAYED_PIC_REF macro to h264dec.h 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: ASVg6Ra0ZHzG It is only used by the H.264 decoder (as well as the dirac decoder, which already uses a local copy). Signed-off-by: Andreas Rheinhardt --- libavcodec/h264dec.h | 5 +++++ libavcodec/mpegutils.h | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 8168c8e97b..2a06d9a092 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -139,6 +139,11 @@ typedef struct H264Picture { int mbaff; ///< 1 -> MBAFF frame 0-> not MBAFF int field_picture; ///< whether or not picture was encoded in separate fields +/** + * H264Picture.reference has this flag set, + * when the picture is held for delayed output. + */ +#define DELAYED_PIC_REF (1 << 2) int reference; int recovered; ///< picture at IDR or recovery point + recovery count int invalid_gap; diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 07705854b3..c92f9192db 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -37,12 +37,6 @@ #define PICT_BOTTOM_FIELD 2 #define PICT_FRAME 3 -/** - * Value of Picture.reference when Picture is not a reference picture, but - * is held for delayed output. - */ -#define DELAYED_PIC_REF 4 - #define MAX_MB_BYTES (30 * 16 * 16 * 3 / 8 + 120) #define MAX_FCODE 7