From patchwork Mon Jan 10 10:47:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33174 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2606327iog; Mon, 10 Jan 2022 02:48:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJznfy9DeHrJPX7kq9J5leKCAlOHSNPJxUhVGsmxdJvtCNbfL0mOgkVoYN/GF61GZjjL/cIG X-Received: by 2002:a17:907:da4:: with SMTP id go36mr57293066ejc.581.1641811695417; Mon, 10 Jan 2022 02:48:15 -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 t9si3525627edd.213.2022.01.10.02.48.11; Mon, 10 Jan 2022 02:48:15 -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=qImUS0Md; 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 392B668AE7C; Mon, 10 Jan 2022 12:48:08 +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-am6eur05olkn2020.outbound.protection.outlook.com [40.92.91.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBF9D6881C8 for ; Mon, 10 Jan 2022 12:48:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fUozv+9EJY0vkkzk9jHbAeB8OLwnh+RqaZ38/muuj3JAJTg4PNYC46yjH6QJO8dgaZRrsPSsewc15KwZU/qXLWooQTNLMxSzgOWneSgTMFwTkeTWGSUcMopJdtOSDuU0DsKUg3dtu8vXQvtYxXcbvuPph0HYY7ZmhXV92ZyQ1MT6PBZgXdET6B463Ti6YEI5MI5ZGupD9m8jjZ4tVvJwmRFF/a0ykvYiZyX3l4bpdPi7Lq3+BoRbyJjjwavLaekF1ZbGdSrnkzXCvo92W5nW9/chMg/ocjG7hCIgFiPDfJDaogiuy93/8dlYP96TPdi3SoDVAq8ce/nR3XcCyw50OA== 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=SX15BgWdf3QCCDA2Zu2lIsSk3RmSI0d+pDuDumZIaQc=; b=Oghm7MocYBhf7rjWFJHdirAWavsL5OhC1sqYOINZkDuv2tsiRiXLfQZXNPPnVa8ADJWQCJ1SG37dsAbFqKa0RwGIo7+/GTL8bYrCHwXV1MGhSBTy19owOQPrdexa7tpCJy14PC+XyZwSbKQGQRDnutJONDggpbbY2Tg+oDgbON/HHnEv8EQZW+VaG4K1jHxPdIUilf7aPC/e2XjR8iSr8L4SqZ8u2dcIdCVqI5Bshgm74rtve8j0WZnjzib1TscnLMxTSfYi1HixSAf4k0Lc6Vy04/KD/DrIU05Fw+gcJbTuF+dRerf4ePAcBOv0M5w9PYe6LzHsNDoUeEL1PSVkag== 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=SX15BgWdf3QCCDA2Zu2lIsSk3RmSI0d+pDuDumZIaQc=; b=qImUS0Md7X+4N1TaSKOfB6enn7rEYS3qXPgC/jkwHK+OON1VN27TKr3XtwuFb2eMJZOTjnbPHbIm6yhfVJsiOQLV5B7lq6P4kWoSZYU0t6RI5ihz9DHiAlsHoS54lguY+AgscUROxfIogcuNe2FK3tGFPIfwcVuwzY8V8RZr7dO8wYlAnOZEyFeAeEzQGJVGntxBnWOIiBj+y47JveSTGN4ZD3HNanBaqF6D4IIRjqyCk8iOrh41nJq86NvxQLwFNx3hjblngFRekTayo04IGA8MDR58EWg38YY4/vA9YnKDkUlHNm/c7OuUJPLmWlWkIEhsuvxnbVMA7rLQvABfyg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5928.eurprd03.prod.outlook.com (2603:10a6:20b:eb::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Mon, 10 Jan 2022 10:48:00 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 10:48:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 11:47:53 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [TkKW+RbxNmldCYHfiRbmo3Aq7R3vAC5t] X-ClientProxiedBy: AM3PR05CA0125.eurprd05.prod.outlook.com (2603:10a6:207:2::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110104753.101144-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ee2ea4b-5e73-4c73-cf70-08d9d426abbf X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JNHxjzR0x0yraFvpPvKuVxPctagoroAA3qm0Zg3qhqY30Eh579UTGkxXsE4G/ENWKEVhNLHsBtLJGTgHopafcqtGUtr24CcpGZe7lWvOu+q4WaHwJ7voM/o2jvCOyaB0466uICLAYV9VXYDOMioeDN/7xeFi0TTpJcipfUxIXOLgVehnp8+Y4tSsYNVHloa7+OXQKVaF4NmaanZ/pvWskhIUd+n4TWSogMnq/YLLRh+1ckg4XrHZ5UvFJn2am0XiQFU/1hJ2eR3g9GIYgXb2M/nBtfK0cAPVq5qE+khOmep2t5apFL1jivhXekE0CG8PpSXRcdYWpDBR32Dwcu7ShSfiNUOGbqAOy+iEVk+MtKqcnaf8JRS2XJSBzR+7O126wHPo1VoHjAbn8J3JYNOiq2FIVltlmUsOLCxkSUaPOcJl02oWGcsGQ7lnHTxKuaO/Lg/DcszPe5fIqNh49nD10UE0rphFYvbtGawYJ2bqe6wliUbSsVuAjQUb/nEwOP9Key5XRufaSaqAi6eZarlUt55aA2lpzeZD1uhZrJwzOs013aucv1jFn/pJipnkbGqJJ4/g0aCsuh1zbrQaZG0rM+7bIoI58MYcSyKNi6OPX9oySaI0qabdluBwWF2/nAFmDZne6JxXMcmFFnmH64Rd5H6C2q3xgCmlngR7c+KfLWck4Td4m2GO3d6Rc6XEbWU9Uk3rlVyXN9YcMI2zDMapKpzeO89tDcIdnl5HiU87u5fA= X-MS-TrafficTypeDiagnostic: AM6PR03MB5928:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: om4o8agRDkNAc4c9lu8SPdTCi6eHvnqio/Z3mv6WczdGgs5lInQM3mM8+VLV5hGFnhOEfN6Jpx7ekqX8SNtDIblpRsSkQyjgzsh8ziZq4pRpEWO2LhVrbCZzTkXHdpXnWQLb7K7UGKwYqQBLhoLkUc4QOJAvxtM9CuEa47JV9CXCY4DoORGrw4MQLL+Fl/j0ELmVmC9sD1+z+iStfOXaF/qR+12LCyg0N9lrKvytRWNRHAJcbFtjfQhze1dCeCaWggcPFpKETS1AhfOrurkOmqlS/EMvwmnJMdcyyAXz9pPEmO0meIMPjgEmFFI8g1IHn86d3ucf166JuYyd/Uw78q9Gkz91epVK4Nhpfbvzb2aHeRx0GHsiZUu04Rvq2TnFoH6SX8hkBQtVrtcwUSsl3tUJPdK0SWaCyHn3yp7aMVezQqhPd0Jhrm04HgxbIn8H1sur131bHeWVdnsXB9Wi+u+hhEIglmJ1Hotc3MYH9bbf8IL66j0O1z2phZqU6LqXAn5VSpLukR5h8zsuO7cTkzyaByVUUL7ytSDuvIP6qOuB3Pq1niopjtlomC8N2DDbRVJ7X4rlJPP2CGTAI3JXew== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uh5GM1KNAXHRGB9Ry6d/hLI8vt7bsEKptwSHRNyRPo/DWeJzNLki6IK73WdoelUvqYy6Ek5LTxi90Jal5l3Y4zcS3GbPHBgosAOZgvmIFHF18neWCLacT8e55G32V3YXz2DG8yeKLuk3hwRw/E37pn6TLiw8l520rV8G29NKgrCEZ9KFRgdFMLQjBEvi5Gzk/axrsynEVn0OZwqoWHdk+6X4zvkbJ9MGR9EAGCkjMcmLBV8bYdF7DJsvl/KgkEZ8zCmzOkVbw4fbwwvuwo8TnoOBQV+EzSc6jmoCCalVtP1KlafTr5DswkVZCE0JyuQX+rAsz02vnBGzXlsZW2dekidp9ZXcabQKc3N45iPoMd4TVZ0iOAbfoMyJz4QHMCVtFO7wb+ojqLR8pCNi69NIRumIL0D145xTiBigFpdVCPHKkY0sQaAbwPmiovlzjJsXhDy4Db1+++3JQlKGuLujsoqzkINKzWGlHSlPBUhBiv6gVEuxXKXm0vSmLTgXrB0JVGmumbUsD7ao0UcdMhf8sN9lj/Z5pvg/l8vJFIYRf6zgor/kAwENYpT4KwXQ9ZtRl361JCNGXXlcPasmq543K5wSYzrWdjB4wyyjpwl9baKT7lKJ37fepBe9lDTUquBCbM04ESB5JMZgq0FhIEex8dUJz81nVv1WHePk0lyVwW8jtBJwi9DdnPylMCk3BNBiaQZfmbiydSTUrhLNrbOZb2RhjuAOcV2IadrfLkLkDq/u5oWaptNNw+gHJDWG4VvlaMBU3x1xDV864MBG+2IkcGrYLwrSnMq8K00yFZ08fIgdUoK86lrzrb8GnOGlLD9sqXRvgoHUuPWdVMLUf3caAUkE0H+C6+4UFulcJc+4cAKKVtuCmLwhO8PYMayaXFJOVqkOCALyI5fjd9X1wNEhE66CYXO9RdVxSQmhb9M3W7u9ZWt1bNkhWQnzEczHMYoYT8KZSr6v05Owe3HocGhg7Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ee2ea4b-5e73-4c73-cf70-08d9d426abbf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 10:48:00.8392 (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: AM6PR03MB5928 Subject: [FFmpeg-devel] [PATCH] avcodec/mpegvideo, svq3: Remove unused next_p_frame_damaged 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: lVMShebdvGak Always zero since 4d2858deac5213eaddfdc06f98379b6325d7b953. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.c | 7 ------- libavcodec/mpegvideo.h | 1 - libavcodec/mpegvideo_dec.c | 1 - libavcodec/svq3.c | 8 -------- libavcodec/vc1dec.c | 7 ------- 5 files changed, 24 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 11e80cb9e9..9cc2665cac 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -603,13 +603,6 @@ retry: avctx->skip_frame >= AVDISCARD_ALL) return get_consumed_bytes(s, buf_size); - if (s->next_p_frame_damaged) { - if (s->pict_type == AV_PICTURE_TYPE_B) - return get_consumed_bytes(s, buf_size); - else - s->next_p_frame_damaged = 0; - } - if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) { s->me.qpel_put = s->qdsp.put_qpel_pixels_tab; s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 1c14f5b0f0..448fe2cedc 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -342,7 +342,6 @@ typedef struct MpegEncContext { int resync_mb_y; ///< y position of last resync marker GetBitContext last_resync_gb; ///< used to search for the next resync marker int mb_num_left; ///< number of MBs left in this video packet (for partitioned Slices only) - int next_p_frame_damaged; ///< set if the next p frame is damaged, to avoid showing trashed B-frames #if FF_API_FLAG_TRUNCATED ParseContext parse_context; diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 8b625d2835..1e238bd1e1 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -132,7 +132,6 @@ do {\ s->next_picture_ptr = REBASE_PICTURE(s1->next_picture_ptr, s, s1); // Error/bug resilience - s->next_p_frame_damaged = s1->next_p_frame_damaged; s->workaround_bugs = s1->workaround_bugs; s->padding_bug_score = s1->padding_bug_score; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index e329578af0..6f3ade8ace 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -98,7 +98,6 @@ typedef struct SVQ3Context { int has_watermark; uint32_t watermark_key; int adaptive_quant; - int next_p_frame_damaged; int h_edge_pos; int v_edge_pos; int last_frame_output; @@ -1470,13 +1469,6 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, avctx->skip_frame >= AVDISCARD_ALL) return 0; - if (s->next_p_frame_damaged) { - if (s->pict_type == AV_PICTURE_TYPE_B) - return 0; - else - s->next_p_frame_damaged = 0; - } - if (s->pict_type == AV_PICTURE_TYPE_B) { s->frame_num_offset = s->slice_num - s->prev_frame_num; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 267d72d15b..7ed5133cfa 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -872,13 +872,6 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, goto end; } - if (s->next_p_frame_damaged) { - if (s->pict_type == AV_PICTURE_TYPE_B) - goto end; - else - s->next_p_frame_damaged = 0; - } - if ((ret = ff_mpv_frame_start(s, avctx)) < 0) { goto err; } From patchwork Mon Jan 10 17:51:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2949112iog; Mon, 10 Jan 2022 09:52:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXzxKC9gJWnolPOjbTjiJ0tX4+B5QDrjlMmZFW5Ovzh3/Jum+Gq3G47vr2297VIF63JzmZ X-Received: by 2002:a05:6402:22af:: with SMTP id cx15mr797342edb.140.1641837134362; Mon, 10 Jan 2022 09:52: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 v5si4090910edf.618.2022.01.10.09.52.13; Mon, 10 Jan 2022 09:52: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=XMWcDhso; 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 7ADA268AB9D; Mon, 10 Jan 2022 19:52:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2075.outbound.protection.outlook.com [40.92.89.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C95668AD39 for ; Mon, 10 Jan 2022 19:51:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BZRhiCGZIg47XimOJOLlBro0UFFd95/WZW/aNATmPHqta6JI50dM4OsbYFO+zN7iD02cW6KTZljoGOjkluatKn49D2UWi7qWgoWwstqqVDUyDrd7JeJmMnFqCcPtlb0Ow0zj0EuuepcJVfZ3EXU8DDykVicNShLr1GAuogC9ABsMaWtQdX0zoOQ8li0C98i8UjoQz42BxstmZbTc1OI6k29REOSbMKaaxe6FjTiAFiuUF9QtUgJ0uJELEGm5j8UYeI6b+66SpLONp8t1a36bCyXANChQ8shxloRyTFLtxkRDL4BNf8lhthmv87OWgTpXCoW+yNvCgsF7TVuCrQgk+w== 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=GeJlKjW/39mPnXz1QpKwKDh2gdc7P1ZgqwFxx+u/Eag=; b=gsqr6J0gWjL3jxW/lzmJJrcFBIBJaqXSgOvnZxgYUC4MVwZb7T5PTOsJoXmuhwY5cRy9Um+OSLqDf0O6l0azd4+5shOuiG/SUNCIS8kA57RSD1PYwTCr3ff6GTGqZtIWQkif6lwHSCRXO9+IMJNm27B9krdWuL6MMfOvb+rfqeFDzSM3ySuqEIkXzQ9Rty56V2E/WTpEczEijtyFnbwAcT4cXKffaAGR7KX5hKO6kGowVHRHXDoFEx+HpQ9wZmtW57xhP1tTxaNj/KMJ/meOOQy3an1f5bxn+DpywztPnUYSQj0GBCP6aJrh07WfgoQhZnw1HmJ4Q2nvRBSdZ2hTlg== 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=GeJlKjW/39mPnXz1QpKwKDh2gdc7P1ZgqwFxx+u/Eag=; b=XMWcDhsoxPYXQuLCtl4x2er+V7CsdmLCncKqX5eRoFIuWUf/VuUUll88aLoYLSdnGmnDzkJV0CG/xtWCBei8jK2jPW/UAXIDXfBTm9376VhNev20zAWNJ5jK/llTVNtix9lH7j9/VNaJiilreX3qJo7BRbTAlPH2/739Ey7LTT5pyNKJC7jVU7yv9wu1HnYWhEieqCsz8a7JaQNcw8PhCzqYS7Li2MLR5mgc5SsPAzpfZNRJwmUarZYOWS9mzGHsnpltUSpzbGyXobjQbs+Gr3ztEc4+3sDwWAGMMksNBRjpsjqlQ5R+Eunjc6Z1FdpITws1sAmyH4Pv0D8OqIEa6A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4213.eurprd03.prod.outlook.com (2603:10a6:20b:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 17:51:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 17:51:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 18:51:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VtcouDiRbt7PiZIcbI3W7KValR9+ixuo] X-ClientProxiedBy: AM0PR10CA0047.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110175146.610875-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 912ac1b2-113e-440b-df46-08d9d461e2b0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1J1bOOsLJxbiXE+tSD1q9MOu7HUx9+xqDPtjMDsD+1BVtK9yYONh4fxAin17s7jAY/8NoqGFMXTA49Rb3Aoc0Fz0Le5tmqZwoSosvd2S8oMUyyY0bAh1hSQ3fl8Wq4E/D+WC8LiqzgmFdeIKr1ud1Mt8JKNx6IWXgbtz+7rVMZx4MRW790G1hKwupUYQJKthpIpKoU1HniweFWMItt4uJG7EZFtf0zP+5gJZVrQaWfobK2yNsDTHdPmLb+hG1OLQpNOFXIQ6Vafosw+d0hdyAqnC1Le2VNyPDHLMptsSl9KWl2JGGJs9Q2X3VIMR2YcHF3cz68BfiO1YwrHCIk0dPNQRWLW8Wd75+gSJXml2x5Tsr0jyKhNoylLBK50K6p/Deiv+/Jd3jNRwCcOHW0/Ph7Te8OSs1EoUQ6+ArheCaZdq2xUld2VK6Djstgmf5Y5A1KRYokY3dCjFxI5Di6RpooNanR1kPtjdYmnZJmergEGYmLFIkslMt/4VME2KrqEmSNhl9z5hu7SWY6nAyx3eseUpbfWO5rs2PbxL0mBHscAWwr011gllfsRx740DDOy0ti9R8hsNQpvMS1cDo78PfetGp6gXM8WtzhQyCJyo8fjCJKsebstvDkQSMtyZEMoiUgcTjqa+4UR+CY8PzEPPeagSAxen/9oRb8XRhV9Sd6N9aIygWtENoEWaCZnEBxnwecRmH8s2eXcjKaxitI22shjtEWs4gjdWEP1btgFQOOtdU= X-MS-TrafficTypeDiagnostic: AM6PR03MB4213:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JY0hI5AfU7pNOZok8zPXOB/U6h9rety+prcxKWTKfSj3xBRGXU5pg/QJMfX0tT+oUUy7Z19pXgp4+dO8i1vk5uk7Qg+ks+oASnObKDnfQ5fozqMlr5B9E1FxzvwWcX/feljjueHZShXPaZyzUWqHMa6gkS0xXYj4q8c4YyTx9ujr3IgMADOX4EEfydXb3NCKxwoft4+Gj7FPQIdrTU2iCI45Pi+0MNGuNRJgiv0A2z0/cCorsxlWwN6ja8NobqQCwume7n/eZSfO+SpPo4Bc43n9kE1ct7wJai2jtZCvhRcS2tIPnySgAY/QBVoUgIILH26CR9j/b+BjATf6cWJhwvcxwkqwcii/o3hXAwNzSsvl7x/46/1L11HkbRo1/frPTGpHIeZW09d1fjHaND/qRYw8cJUYUb25CiKqVmk/i4FVPpGV5VxpVylfUYuE33XdwbVG7puyfVhc8r4MDeskkWg/3jBWWkSJtkzh7exbBt5TQT3/eGrDuCEMZfwalRQaZYLBvQT83DYrJczuFXTq5Lbp948ytGs689Yj8ohwwT5uYVFCAHAaRcobgYKplh5a6YksQDH3bBXryNwyzDnMxA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c+SQGHq1nsIOutJCDWPtV1KyJWLeKGFoZrz/PMYJYoCKS5y7SZC4UdsL+PtQukTi8SiKcx0D0EAs7aEM3mzFJPM1T34qz2FaTBoj47erMIIS60jJw3JqJQbHTnS+fZJf1gGyUmJi+hV2Es1JKp5/NRf4DAhWq66rZqfs59RdrAKLQN59ej7BN8CvxtjYeqoC1zec5BRNL1rJHGEhem7jaMJ6Pzu4tVpaUtokFzMCmWJBmwKYKuA4zLKghto82Qt3i06dx4/HUYX6EnzKH323B7A2Gx+36zh8aHljWS2GZNfPK2pDh9dw7s2cIX4kxiHYMZig/zK4b2sHssu3VNeVEg1Jg23t3h4saVh2oNUtMf/8l88M0dZE4NgJf2eniaKNc6/8Mup40cY08/m5Wc3n9KZyI/TOYXnK206xAOecZGEC+u1+Uf7a5PgdSZZW7ycsuoUf1GFbzuiD+MUplYlDh1V91kaWK+zbcpxeQdrV9CHjKiHyoMTkd4KNell3LdVJ4yhUiVHEpoCLGyJgRu12Cjxtw7QfIP+vXlzUXuw0EshVpCvnyhfc+RHai+8Tofmp5gQRWquhHFtDAfA2Yh8rd9m4zj9pN0IqvOOvtbALOVI9SpP0a3D8eAmSZMhmXwz4pIGpx0bz6F9j4dSoP+vpywnfvRZrfft0UrIrmwyqvxs+oNtUp9i2sGZmNoLTrkWc4no33HFFu5apJbJXfMFqOjIBLIuiMF3+6aw01G8L8bSOzwKJi3UMSwzofHOp0RRHvr7VT/+GcgwGyFuYiSVCUE04qugteqy+SgXe6p5XVDFX5WVJR7qAVSAJX/XeGL/q8Soyr/MrGWQcQQ9mwMFWdviK/6fvra2WjFVz1LF2UZsJ/5q9AlUR0Gor5ygCIfKSWlKsGVRZwHEbiBasGDAX30nq4qLeQK5ymcVDg+XFN2fCBdsPmX6gq4YVaGz6frjZE6xX7CTCzOtcDn/KFCbzFg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 912ac1b2-113e-440b-df46-08d9d461e2b0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 17:51:53.3400 (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: AM6PR03MB4213 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/svq3: Remove dead topright_samples_available variable, code 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: Io+1XU0T9KrK Topright samples are always available. Signed-off-by: Andreas Rheinhardt --- libavcodec/svq3.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 6f3ade8ace..a3f434ff8d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -128,7 +128,6 @@ typedef struct SVQ3Context { int8_t (*intra4x4_pred_mode); unsigned int top_samples_available; - unsigned int topright_samples_available; unsigned int left_samples_available; uint8_t *edge_emu_buffer; @@ -638,15 +637,10 @@ static av_always_inline void hl_decode_mb_predict_luma(SVQ3Context *s, const int dir = s->intra4x4_pred_mode_cache[scan8[i]]; uint8_t *topright; - int nnz, tr; + int nnz; if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) { - const int topright_avail = (s->topright_samples_available << i) & 0x8000; av_assert2(s->mb_y || linesize <= block_offset[i]); - if (!topright_avail) { - tr = ptr[3 - linesize] * 0x01010101u; - topright = (uint8_t *)&tr; - } else - topright = ptr + 4 - linesize; + topright = ptr + 4 - linesize; } else topright = NULL; @@ -721,7 +715,6 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) s->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; s->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; - s->topright_samples_available = 0xFFFF; if (mb_type == 0) { /* SKIP */ if (s->pict_type == AV_PICTURE_TYPE_P || From patchwork Mon Jan 10 17:51:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2949349iog; Mon, 10 Jan 2022 09:52:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgdA0dWGBtAuJDFgnbQTCwr4wChwoXoJESLAlelOnt99iRnPgp6g4iNDZ8kx7AIH9L2HMx X-Received: by 2002:a05:6402:154:: with SMTP id s20mr801554edu.148.1641837152990; Mon, 10 Jan 2022 09:52:32 -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 e1si3300360ejs.857.2022.01.10.09.52.32; Mon, 10 Jan 2022 09:52:32 -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=k3EEEFU9; 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 DEC7468AF07; Mon, 10 Jan 2022 19:52:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2075.outbound.protection.outlook.com [40.92.89.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F7D268A199 for ; Mon, 10 Jan 2022 19:52:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dt1u4dlfCqMcs9Dlp/b6xwI/DLPmTR0gI8LR6yuE4T+5t0bAa0KzHDc7zhpcwFdJIZVREWU0HO/gUlNoVYKL5L5pojaW/rm1XW/qTyg12wQCkiUNtAn56pbaIyq8DOqLkyT/LIe0TnGtJqA9GXQrVqC7BtWPuMd2sfOb3verQ3uPw6OclmI5XppfGStoV5CngEyOHWDlWTuDOsOWuONnBsHjTY9s7VBtnqF3q9h9jeDx7mCywNrd6Ri6+myL6OQcxFrrAiI7YukQB1++HcygnseHbgqnW2h35wNT6NN10YEoX2nGNe3A7u3cyjZPmEwI7m3TdxjG27JTeDRxdDB58A== 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=Xb3QcCrqEd+W9VUlRWaJSxXo19y/7ig9qfqAcA2TlqU=; b=UHpD+xCO89nvJxd4iuniZwrMEHnKvfLWvSvG73TC8V0lRbvxAVBK01XqgzxWvxp1jhO1sARttse9CsyyAPx6ISjzYMYssRXDQ4BDaI7/2Jia/GRBZS8IJzSQdj7rZ9qOjh/+giIP4FYwceG7/0lT+LYZMSVQa8mlse1ZtyrNdrN1xQSTY5IMXfqQ8XQR8mrXBm8LDYd6Crc5OKaf3uIR+45Bdbf+KV3YgvlLQv3JczMNOlgoQwLhfkEj9cdklIW6wDz7niTSH0qz44AfNNQTIBHVQZNjqhmK9TguXSvEXxPPz+OXdvwcDJ37cdgaHvvF71il0sgeGWa64CP/DxecBQ== 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=Xb3QcCrqEd+W9VUlRWaJSxXo19y/7ig9qfqAcA2TlqU=; b=k3EEEFU9iRotMxaoj+yj62oLKn3L9Le3fFYFuPTHIqoVWW34fNQKIIl1PhlZT4Rlr8XkGuCIDUDFRHhmjczo8xOfH5jCRP0PfoaRbiguFh3UU4LqbWXDy7iltn1rZyx2Mc7q8G7dHQ+ybiIZR43rxYKkha7hvMwv0QltnjC6umsKNsmaoSQ4aZVPS/kSuck2q4ACcu1/DOjIubYc+3+4hYCDFxnDHoL/X2laZmgh6S/5gLPejwV7IFgvbN3ymzEl9Nb/XMRd7t2Tf/6A95c27qFLsnTUL8hHg9UH1OJTHxup/OfeOm9RCwQUgMaU81d0TkkqZ1Ko4Gj6FKthAiZuag== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4213.eurprd03.prod.outlook.com (2603:10a6:20b:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 17:51:55 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 17:51:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 18:51:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [4ICLnNJ7I7oVa3PwT6tzooyKHYrAnDPI] X-ClientProxiedBy: AM0PR10CA0047.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110175146.610875-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52ed7cfc-5f59-4a13-da77-08d9d461e3c7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhl/ltQvue2qLPf5uVpwbGirHMxTIGiK4vWGCr7grtAzqIH4D1c8pxq0up3ewE3vkzTEjY0+84evqHgRNegGikbAk5HZK2Ps0WJ/63SjCz6tm4HyQG0S9bSJjl727V7DVqxN4tRa1IRBZKBf8F6a9asO1NDfhUUf9dAr2B/VqV563ssHTa8JlwKKuJPZi8R/dIfTCp/pKO9gT/U/Ri6SlCwvveZPxZvZ0b4MCkk17Y8nEuTH6kdzCEzYY055GJs79F0J3Xhlh7VUFXbyd5xE/6exUUXrMaDKHy2gl+nP7GY+Uiz1jipFv9y4F5SaueuZGAy8yALg788BOjMy5FRq4GvfgJBAcJWVGFy1P1x2B57XJlU4CePDUyat74tjhOSneB/LET36VSaPncxjjq5jLtbgoOHXp8vaBUfAM4pNrxl3nhopHLpSfy7kosYnvKbfqSgssaz+Fdt9BtpppmjBla9WoEqCP9crAdU8CnCZSyKUqXb0BaNx73STmH+kUtMoOqjkifxtnCBHSFiWLcj6WsoVXb+EnYqiQhWREu0XP6HVTfyk2iVw8/zJ9srxKNTt1pfqCQZdK6+y+zEJTAt+UGAQ4Tm8bYI0GWEUzcvIJeNA/BGU1I/kEk82Uyi7B5WyZvodowZAxrbcBoA5KQX/ZgeOoGo/yrpwbfVroLAXH/dIp2dPOzYcUjdT3U655ZKVZUlyPB62IUyHZI= X-MS-TrafficTypeDiagnostic: AM6PR03MB4213:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ADFsA66J0xI/I2kzxyOfpwctqA2v5ySZGB2JL5Pwq0pGGD7Cwq+Cp4GWXcJMwEi9oZjKiUjhQs5pl5STMsWXEhTyBDb1mUmqPzMzLCDjvHznm2ZnqJsIXjG2recy3lCZWaJndsAW1ZBk6rpY/PjE7Fvt+ObArN2fW7A+PDtTLylnBA1MYV1dOi+Yfl0n+xXnkD+e6WI8gDdMQqgZiSIG7KMz9+twabs+AAPicEQUqoosQE3QGgu5yLMiK2iozox/ts1G0Q5lQFZtU2l3ZMNfSPTB1wSQxazjZIecbtYINH1ieamNvtIcFJfWi0Ivn3jsiqkFBediyUi9QqXWnFYi6Y6dlorUFgy3u8FOsMzPop8FOndq/iyw1B/2f3IdL8hgqTMHPJJLqMy0Rw0oAq7NyAkPkGn/tamvGubT+uJD+1a4iHch1kPdTRt+nKIVYcYeP2laitepcQdLYPsOqZWhyUA6POmURfptPkPacy10ec+/8gRF7qrIc52eu65cj/dhRuUW+EGbh2ZHefdHyEmbkzaqG6M1zcNnu3jWFg9qZqFesYLa3NINs7ZBnYP4plMssRQpWUzL/3gHkvfatKnozg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vbSdahxVLZHYEX1ZpAUzjAckuWWdhCP90NJ7msycElP+8pBfLlMOxBtA2k6xmTRbMpkxnv5KBr7FrjhrBSP/6fGSwZO2g30rHZGF3fpSOdYOrvx5D2iCLIz2QYso7oRCYWXDHF1dUGphWQjA2225RJUQ4lh4ZeMifmGlRqbQ3u03pD/Y0H4hoBREbweISxgC9eAvR3796oD1edMnFMoyguQbg6B7cWqHzAgLmODnpQILLSCCqxF9UwJUuGgvOubW7yxSEcx/04gyvo0/xGpKhA9tiE8sc5QkAavShp7k017vg/dmSl+nUmxo0xZNnK6JTeUKVxDpxG7KUvxdRgWy7GqehhocuHIB2BiRgMdPCIOiTY9cZJFne19O8ZNUnEd6OO+xnLfsDFtU5bcjQum7eeiGTdmxFd/X87in2AUAynFHH8ZnWQBFYnZsJxxv9bHeqa51qr9KfQgT8EUY0P6thQjHP4vSWSKwFG/cdibjE4C/Q1++qvxWkZ6J2KR5370tVPzTYtxyE6QB1rLMk0VZvWQ1kghNVhsKAurKwx1vw727lCMM7o7pZOpZNUf3DSjnB4eBaev0yDdh9IcRGvUdaJNGfjbbQhWUQRC7dpBB1836GyAKnzRK02qGvvlu1gXOTuvhuBg6psu9UCoH8Vjk23pmAbU/NFxdDrK16c1CctJkChHTqUedsFMzspaYWaydDdiEneL5zMCnIPwQYwmm4kvYa/x4S5PCsKgMkRzLblBwTUrtLiibGkUN0Aep8uypXN3LcA1Pzq14zTsOm8PecjVCyRp84DskXaQvk/dsFoFBX1vjUyiYPXaLztavaFX69TBqWAUADBcaH5jqSXUxksf/bwZTCxsOFJjCrwjcqub/z5vzDlpVruxpuxPTHzzgwZa53Dt4UCpeSLoH4jFjAtIna9xDjVexJEIkNUI/bajbPZY7RXAQBbfx40LCCoGt+IcenwAx797tBeY2gF8OXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52ed7cfc-5f59-4a13-da77-08d9d461e3c7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 17:51:54.9796 (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: AM6PR03MB4213 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/h264_slice: Inline H264 codec id 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: Cvt30nQ2OBi+ This code is only reached by the H.264 decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index f9c300bc2b..4833282191 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -998,7 +998,7 @@ static int h264_slice_header_init(H264Context *h) sps->chroma_format_idc); ff_h264chroma_init(&h->h264chroma, sps->bit_depth_chroma); ff_h264qpel_init(&h->h264qpel, sps->bit_depth_luma); - ff_h264_pred_init(&h->hpc, h->avctx->codec_id, sps->bit_depth_luma, + ff_h264_pred_init(&h->hpc, AV_CODEC_ID_H264, sps->bit_depth_luma, sps->chroma_format_idc); ff_videodsp_init(&h->vdsp, sps->bit_depth_luma); From patchwork Mon Jan 10 17:51:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2949481iog; Mon, 10 Jan 2022 09:52:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJyKw09r+ltmNJzt/img33zKaewrqoJHFzg3WT3J9HRptqiJ8xSfqCBHbh6435TP8ca9Lfmo X-Received: by 2002:a17:907:629a:: with SMTP id nd26mr687014ejc.680.1641837162859; Mon, 10 Jan 2022 09:52:42 -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 q20si4393874edd.566.2022.01.10.09.52.42; Mon, 10 Jan 2022 09:52:42 -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=g76tTKo2; 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 DAA8468AF11; Mon, 10 Jan 2022 19:52:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2075.outbound.protection.outlook.com [40.92.89.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 824C068AE72 for ; Mon, 10 Jan 2022 19:52:05 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oOGVJCpHSJ7m+OlJhXBmk9AY5ne2GPumoH+OUaxRUb8u16uf0uZeLmO0yOayM3p+rB7QFh7fkVeKAgW+JQfT1itL7+/z7dKm6MkcNExcolGxlCnYe/y2osXOIlPAjK4zfnWZRe/yq8ZJqC8jW/FQ/UT0Dmxm3ZHpOUv9/kpZAO1cq7cXFSCwA40xkAqmTszCw6dmlx6fNtwOJS/U9ibySE5lsMXrCKx8MFQcB/ZYFWulOaZdA70QWL13n9saF+abxbGvaEKHP8cRamvQFkrMzHot1g7YqMu9G+Ntx8L7OSWM1ocD7q3RCh7iTSwfqStbkZa3jAiDNb+WjQb85RYOQQ== 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=1R1HelvG0YNVtbF8aeon3EwZUbm6m6RmrmtOB1Il/cY=; b=eC+KXFXO1fjNPDO+I/HN9NudIIPJwOLPjSfUlSd0hiYqJWicP+4QvuJeoxp/7YFYaVhrwQy5yaRfHwK7xBb5+ksJNSnnUmW1GzE8M7JytXKF4WAsqikGSI+cmP5ZYF8pHpKN2Sx0nlZW+WXleUpP/bpUuvOg/MGMEFMUeFtU4R8wtfjOBnBvfsueVhsFer4uJpRXQEuG7BJH0LcLo72ldMGJLZtGmAQhxKumN4ZPBGrAO1hdxM/eJgYIpXFUa+dNypaccgDYawnN5psTYevcaslW0mG7+mPx/UaQU45Zp+3RuTxqkDhrNVqo3Hhk/qMtOtEh5XhB9ZlC0VJT/IvAtQ== 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=1R1HelvG0YNVtbF8aeon3EwZUbm6m6RmrmtOB1Il/cY=; b=g76tTKo2Qr+dKu/P3e7MqTWNUZfq5IjuUh6Yte6rv2ZxxLkKslmupAGEHfZQqQb1UyG/ABOYKbh0+1tMPC2sYJdWzQ82fPEXuFvGmx8sG9Og8f40BXpbei/U1kWAjCXePHgPmzcTIMXtley3FzL7lw5lMPJMP0+0oN8vVCLrOexkO0iGw+FLhwqX/W9+BN1M6OCJzBgxW0222PCuWWtcSL9UvfE5sBETQDkAuYKxZSatPNcxkWsCOvqgaiLt7nDT5iRG1oAU0SpvPYubng7XdhiaSrrOTiofzfNlmViImQdw6A1G+XhRHq8FJQ55EcPSF1XPBKOxZiqGpICygCoSOA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4213.eurprd03.prod.outlook.com (2603:10a6:20b:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 17:51:56 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 17:51:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 18:51:44 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [f8fdgiHlVsHmnOwhyYb3y1s65PHefvPt] X-ClientProxiedBy: AM0PR10CA0047.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110175146.610875-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3878b763-de4a-4772-849e-08d9d461e46c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JIV/ib0urkAhnptyhWUNm5W7Hs1+x4EKeHFsJ219WkY1svdJfdYmg9+vyWgKl5fl/HzvxLCUQmoIfPcFv89PV+AJhPjCGdrSkBgiwxU9/aLdAgt+J1PH2QYg7Db3VaAI4hp0INVjDvz8kxcCFxqBer8pd09EfplufdM9dAw/+tFi/zhDkusCPWzzAlipKZSQIeUaFqaZqwB5f7ps7TJ2OwsMriLYivXfDK2TBadMZiKHgPuE/8/56T073814SOhJAo7ZgdwTAiaHCn77BmvLBHqs+304hOQDdTkrB3Ii3i4k7afO8yEQrnlbhSgyY+C0LT1YGci0YukgeVzGWQyeomE2AQSfugBLP0/m+01FAMENaM1CgKDDMtROkqfWU+FkR53n0EHtX7NkvBd/CGPxaS7Nk/Pxt/IK/NFxWeb3F2VzUQ8mdgMvUJVaTK364u/rOcgtl69t3D2RixQ/GAYDmss0EA3AHMri/JOqFMzpu5t4MK/r5Hm5G7I+oRQsxnJB/N2VBSV2mD5BaGWdXCDL2voESiGXleJdx1Eyn7kukAhPMbWghTVee2HCI1a+Kzv2zlSK6P2N/1DMIzEkQo5dbHkcb7dZ4M1F36GPzIsjt4JHfFcvchaGP7wV4P36pQLi1ok6Q+RlcV72rpePiVZtstAIgs7x8DCL4REJ9+nD4Td7Ti3lMUP8gBLECpERSGXrKZkb4INY8Nlj2FN7XZLI/xmJw7sSkwZCRr3NH+rFvBQ8= X-MS-TrafficTypeDiagnostic: AM6PR03MB4213:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EDPWboE3ZB/926ISuBvaOKlwss0lxct3JG1jjWsnvFeQKMOeBztGOOadR88FWR5vONG7PpkeuXbZb/j8HjelWbG7kayf5s9S6y3/h/pkefYDSEwNF415zDH7uXcesayaTFe/e67sFYQbpyGyw0oruI0msaeDzYaxS52ycUB2FoAnyOq7+Tk5DAtgwrYazEcVeTIUvmISMkCnGJEjfFGSFp/vXseAT+t+vdMV+udkBKcnZtGV2UaIXgBFqRltA3oaBYZFgJXutEP71IQUgQqatzqAH9tOR3V4mhQcXxxUMXOpxM0o0bRP3+NXP2iM7rrDUrDvYx+x8sJqiBEs0Dmlqi3aDflC37JwrvrFPdVnll+StOmAqQGaR9z2hmCMZsCcw0MwGfWdPIN6Vq4WIHE0lOIn3gCxFg9Foyy5SD3m1WVkzXbgnRteSVvbqCKU8sumd3zWFL8qhZPNzX823h2d9QqX1Otd2PSET+BPBFX5+2XVIiN+niWpjT8UsT6tm93/+lgrHR9hUBM4JaIcxoy7NKt4BCiwKSayechCu382HLhlNrDWJCegjY6gLZCt/qnKre0jv8tHE0MHZHj7VfjqEQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L4MN6woxYC7PRThpQT5SEW6fBKmnngEXtue0RFYMjcnie1IF52jVlBY8rshcTLxOnQvTMjnDCiRyF57rwBaoIko1aJQL9NKw+ukeo08g2ckwKeY5JS8XABlzskoHUFr6cLLfqOtAnqK+hWCT6yHsUnDxDS/QwelaOI1EWi2Nsb1MYP9nnD1WJz4coWstFGWP0T5kc0q4wo8g8CDlbo9WAQhfDhKER6ctNQaAVkT2Smg1cOkz3ajIzhKo6eTiTZBgKgLMHVXRzlXLVfLKckBHRvLvcLli9RUllqdxaDhKi9qYy+2suG0WBMP7z1ViJQXvyZzRoDqNMVyFS4GYcns91dZ74nRG96FW78n0x9tTnWoMqlWuSXAoEPaYgEysCmUi7PxZhgf/0Uv0lRtIO9yE7XTzNTAonkxOJm0IUhDQDQXAMfOm2BjLZb17A9F6gUkvtcYE4eIlDnAUYn9yRw0xVev+nSBWpIEjoF98t5uNRy8/qqLg8JCfs49D4/kMsKE0FkFUCnzxPp14WEw9zUWPqEKIqAd23dtVwSRCyoQEn4jmFl+ibN+n0U9UNI5F3z8GdmsdZADGUgpzMMdYFVRFxCp66X/bbsXsvq+GssEZ6eDLF2K2j2wsJv9LImLglwENxiB8/6Lw0N2VZm1K+m0UKuDijpUf/oeABbjhkmPei6mlY3SUvlpzQli63o/Iqt2VVyi2VF6O8hOtux+5BJg0n+PxXVfMQMKzjUpfJ7A1+4aRyEc1+FdC8PMM1bbXAt8E4AzXJMypxOi/DtY8zIrmIN2l9SkMudvEgug7WhJiSCJdc2rUVFB8Qbkc3Vba/8tiNqdCfH6GlkYPDb4WOn5lq/1zFLZD9hK+8FehniP8RyocpXwqjmFQWDQT/0JxMxVCYDst4dGQYuzlfQYVtMG3JXsyobgkyLZiU7tWf1ohsnhrptk+KdN1Hk+PvtNh1rHE7oUGfbDKjM1lFGqikvserg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3878b763-de4a-4772-849e-08d9d461e46c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 17:51:56.1524 (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: AM6PR03MB4213 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/h264pred: Don't compile > 8 bit versions of VP7/8 functions 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: NN5E0YxEbRJv VP7 and VP8 are eight bit only. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264pred.c | 36 ++++++++++++++++++++++++++++------ libavcodec/h264pred_template.c | 34 ++++++-------------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index bd0d4a3d06..731cf48ea6 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -53,6 +53,30 @@ #include "h264pred_template.c" #undef BIT_DEPTH +static void pred4x4_127_dc_c(uint8_t *src, const uint8_t *topright, + ptrdiff_t _stride) +{ + int stride = _stride; + const uint32_t a = 0x7F7F7F7FU; + + AV_WN32A(src + 0 * stride, a); + AV_WN32A(src + 1 * stride, a); + AV_WN32A(src + 2 * stride, a); + AV_WN32A(src + 3 * stride, a); +} + +static void pred4x4_129_dc_c(uint8_t *src, const uint8_t *topright, + ptrdiff_t _stride) +{ + int stride = _stride; + const uint32_t a = 0x81818181U; + + AV_WN32A(src + 0 * stride, a); + AV_WN32A(src + 1 * stride, a); + AV_WN32A(src + 2 * stride, a); + AV_WN32A(src + 3 * stride, a); +} + static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright, ptrdiff_t stride) { @@ -447,8 +471,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\ } else {\ h->pred4x4[TM_VP8_PRED ]= FUNCD(pred4x4_tm_vp8);\ - h->pred4x4[DC_127_PRED ]= FUNCC(pred4x4_127_dc , depth);\ - h->pred4x4[DC_129_PRED ]= FUNCC(pred4x4_129_dc , depth);\ + h->pred4x4[DC_127_PRED ]= FUNCD(pred4x4_127_dc);\ + h->pred4x4[DC_129_PRED ]= FUNCD(pred4x4_129_dc);\ h->pred4x4[VERT_VP8_PRED ]= FUNCC(pred4x4_vertical , depth);\ h->pred4x4[HOR_VP8_PRED ]= FUNCC(pred4x4_horizontal , depth);\ }\ @@ -524,8 +548,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, h->pred8x8[LEFT_DC_PRED8x8]= FUNCD(pred8x8_left_dc_rv40);\ h->pred8x8[TOP_DC_PRED8x8 ]= FUNCD(pred8x8_top_dc_rv40);\ if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {\ - h->pred8x8[DC_127_PRED8x8]= FUNCC(pred8x8_127_dc , depth);\ - h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc , depth);\ + h->pred8x8[DC_127_PRED8x8]= FUNCC(pred8x8_127_dc, 8);\ + h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc, 8);\ }\ }\ if (chroma_format_idc <= 1) {\ @@ -547,8 +571,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, case AV_CODEC_ID_VP7:\ case AV_CODEC_ID_VP8:\ h->pred16x16[PLANE_PRED8x8 ]= FUNCD(pred16x16_tm_vp8);\ - h->pred16x16[DC_127_PRED8x8]= FUNCC(pred16x16_127_dc , depth);\ - h->pred16x16[DC_129_PRED8x8]= FUNCC(pred16x16_129_dc , depth);\ + h->pred16x16[DC_127_PRED8x8]= FUNCC(pred16x16_127_dc, 8);\ + h->pred16x16[DC_129_PRED8x8]= FUNCC(pred16x16_129_dc, 8);\ break;\ default:\ h->pred16x16[PLANE_PRED8x8 ]= FUNCC(pred16x16_plane , depth);\ diff --git a/libavcodec/h264pred_template.c b/libavcodec/h264pred_template.c index 2b30fff70f..b5bc942a5e 100644 --- a/libavcodec/h264pred_template.c +++ b/libavcodec/h264pred_template.c @@ -111,32 +111,6 @@ static void FUNCC(pred4x4_128_dc)(uint8_t *_src, const uint8_t *topright, AV_WN4PA(src+3*stride, a); } -static void FUNCC(pred4x4_127_dc)(uint8_t *_src, const uint8_t *topright, - ptrdiff_t _stride) -{ - pixel *src = (pixel*)_src; - int stride = _stride>>(sizeof(pixel)-1); - const pixel4 a = PIXEL_SPLAT_X4((1<<(BIT_DEPTH-1))-1); - - AV_WN4PA(src+0*stride, a); - AV_WN4PA(src+1*stride, a); - AV_WN4PA(src+2*stride, a); - AV_WN4PA(src+3*stride, a); -} - -static void FUNCC(pred4x4_129_dc)(uint8_t *_src, const uint8_t *topright, - ptrdiff_t _stride) -{ - pixel *src = (pixel*)_src; - int stride = _stride>>(sizeof(pixel)-1); - const pixel4 a = PIXEL_SPLAT_X4((1<<(BIT_DEPTH-1))+1); - - AV_WN4PA(src+0*stride, a); - AV_WN4PA(src+1*stride, a); - AV_WN4PA(src+2*stride, a); - AV_WN4PA(src+3*stride, a); -} - #define LOAD_TOP_RIGHT_EDGE\ const unsigned av_unused t4 = topright[0];\ @@ -427,9 +401,11 @@ static void FUNCC(pred16x16_##n##_dc)(uint8_t *_src, ptrdiff_t stride)\ PREDICT_16x16_DC(PIXEL_SPLAT_X4(v));\ } -PRED16x16_X(127, (1<<(BIT_DEPTH-1))-1) PRED16x16_X(128, (1<<(BIT_DEPTH-1))+0) +#if BIT_DEPTH == 8 +PRED16x16_X(127, (1<<(BIT_DEPTH-1))-1) PRED16x16_X(129, (1<<(BIT_DEPTH-1))+1) +#endif static inline void FUNCC(pred16x16_plane_compat)(uint8_t *_src, ptrdiff_t _stride, @@ -551,9 +527,11 @@ static void FUNCC(pred8x8_##n##_dc)(uint8_t *_src, ptrdiff_t stride)\ }\ } -PRED8x8_X(127, (1<<(BIT_DEPTH-1))-1) PRED8x8_X(128, (1<<(BIT_DEPTH-1))+0) +#if BIT_DEPTH == 8 +PRED8x8_X(127, (1<<(BIT_DEPTH-1))-1) PRED8x8_X(129, (1<<(BIT_DEPTH-1))+1) +#endif static void FUNCC(pred8x16_128_dc)(uint8_t *_src, ptrdiff_t stride) { From patchwork Mon Jan 10 17:51:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2949650iog; Mon, 10 Jan 2022 09:52:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbflxjbOWdKHyHOMtKNoij0Gt+ZdcwZ7LAs+bO73u6TU3bgjOnErcjcvJk87lFsKvhPeOF X-Received: by 2002:a50:c04c:: with SMTP id u12mr733566edd.107.1641837172871; Mon, 10 Jan 2022 09:52:52 -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 w2si4296621edl.506.2022.01.10.09.52.52; Mon, 10 Jan 2022 09:52:52 -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=Anmd5B5C; 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 CD51A68AF26; Mon, 10 Jan 2022 19:52:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2075.outbound.protection.outlook.com [40.92.89.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5E1A68AE72 for ; Mon, 10 Jan 2022 19:52:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RsG9rp9ZBCYSJmvI1X30Sur0dncZA6GVQmJ17AdQuCngBgEAiPHWLCD+GGL8KIepRzSaYMwqS/AxsvzF8rD6oyYoS45knbMng8nBRevPzNStAw8aL13hvMvfCEwzdkGV1LX6PuFjohyDt0H4X3b8NYYFOeZ4tnTwZMHPvPgA8XXZgT6HoRD3UvLiEb/cTem2VwctLvD/ZkpmskzVVQxtfrpBK6pao27A0VG5yEtycOu923wCeUpPGzyj9PbZ0Z/7VFVEn2cyEiLP4F+c0nZvEmrSLoLwW+A8B1uyBfUbYdU7/PpEr3Uv1GQ1fiICrSswglRXmdYQU0UzukaSpUYGSA== 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=mlPRDdwEAhBGmEqSPPQgsOhPDextybCKLDrVgUyTONU=; b=JVx5BwfVX74ohM0x0ro+56xMpVG03VI1M5patyNZJOtkorHka+eKtbhDsnnFtA46JNY0N9Axk8lrPwmxdWZw0TR16EmfhC1e1PevycxQot39HdctDqMoRTM0DIul/K/A4L7bZ1XvdBmX5xNr7lEC8rzsUmVLMUv/aie/xOnkw6dGfgYD1reJiabOz6tQ+8xa9jlIleQG2MmbwdZPsWotqn5ZLtYEgfZT2qRo0aOkmqm4Hi598y//2HFHD80LMEvl5wW41xjrzhAT//aANrtNim3WmLX3X812apNK2b7nKcFCUBKInMqxDyKtINlGIdlRDeFhDQ8EdGHd0nwmfDul+A== 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=mlPRDdwEAhBGmEqSPPQgsOhPDextybCKLDrVgUyTONU=; b=Anmd5B5CSF8p9F6ZGkI9l9CZH6ArzDjvh5AzYn9t5Rp3tUImUbqs3pG8Wd7M48unktec+MXoWgh7EeRdVJv4Bs2YEQlSHyibi39QhyWtzF8irfTbVRjIlVySXskBuW9SqjBm58T1tNrTJfoOYKS+PqzR5sXtU7VvSzP/okXzcDaqnBaS6UqV9AdZPm+bVRoNVblYEFFy4pNjDya3P/Kf7yP3BT/fLfOj7F121C42kaw64W6yHMDDp6TBXbNu/S+HvuMfa+dMpH8OfPDcrEQarvvNSLG6KaIxLsiG1H2QklbCXjDgQHt/+dqieUTtr13/W0bjPQFUWecoi2hLPPESOg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4213.eurprd03.prod.outlook.com (2603:10a6:20b:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 17:51:57 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 17:51:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 18:51:45 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [61ieKtPXv3CnU56SYYEZbL9bSOgXSmx7] X-ClientProxiedBy: AM0PR10CA0047.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110175146.610875-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59d0c8c3-0ec5-4fd0-1013-08d9d461e524 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhl/nDOcdxVxA5+LBLxLHvHkiGSs40o3u5NF+1in1SBCCSsSWT2q155vl8Mka2NHiezAXh1HsEbXisqDLtBLoZaf/nqDOAQICTogFGnHqutzQQ+zTJ+mwFaNQj9eoZHxwLlYNzqFCHqk3iwid2ENxY79vM5KPAdCmaCFiIjVupm1fqpuaZel2LO1mBiMg/XM/Lzn1OJDvufCy4G8wrhZYPqekiVT1PXkbsvGluLHWRpAAYTCEu8+iIf96AAMvGEHkNoS3S58e+OARhe73ZqzG+NsCc3f5EHbeIYe+0fqKG80MRxmtMOGFgUDxRoEZNsWdtEEHh1jgfXNdlr2PDntMavr5Hy7E8NWK3Nv5KJv7Qt1BoJpX5dw3kSAtvgjr0nNDQjdv9CA7O5g/fdix6HNDooZW2eM7u0mqMWt1iiAVNSGFhE7KG8aJLYR+H6uk1i81+QeGVP02qRBeuc3c1M44Vo3N3z4Zl96tspL4RjeP2OpzXNhBVf8TrsGLCmpzVUounB93mUMXIMYtkYAQ35OBoqXBuT3CtetCdQo0+TLAIbgD9WJ4khXDW5kasjM+fDlQHSMrqGkK8iw1czgY4Jrk1hHYa0hWXQZrDqEgcZRSU6AOxgW7CbT1PFKXmd3H3cnYsfN+ZZDEQAxl2niwCb8iffaMOBvj1quJ+Rs4TGxUqhdtDr9JSbMAxhIfMlNxETeLZSM0019ReghBk= X-MS-TrafficTypeDiagnostic: AM6PR03MB4213:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AQ7kOS0hNfVO0EG+4fROCG6et/6yQWiBkZ/ouvX70ZQoS1Ny8NkVCxvcf3yd/pXN3yssIFnxSmWtNj5iIucCApXJXbpJLcOCuEPzkDjNVXvI/mQKYThRrVQ6NiXGvQV8jzLf/FTURGrbcDd8MiXTV6gPG9IyzPW54nUTwR6FPFPvekXAkWG23hp37moEXcTe3xr51r80dONkd3zxtecrHUHqKFHpZUt8AzxskWp1ayNWFJ0osie3nSzG7B7XC7oUF3CVNqEc9JFzlQYOuf4zUabv/ocvEJf1LKAB8TaJwDiEAsQEER+ivJ571uMaouCKf/K2G37Ej7Ns/HnVUbSJPK6oeuOwvDs0YBbpuWVk+Rg6aNiz8Nn/UEeEeQ8454sF1Mn+RdI7mq6V+jeUVb6J00+AOjunqYw/YnumLm6ciF2xFZedwl6UtOWh8pvCjXK++JrroNPO9RaFDwQExMay2+s0tMIYODNHp4KANxqWUC39NLdJG+ZRJd4MHCIq/hM6ju/rTLPpBiu19A85/UZB4efoLu6rll0PPWDf4ygTVbt0qSs2CXrkkLwp7SwaaSIv0t3MQzw303yYLp4lzcjKoQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 18bOZI7RnkhRQI7RbWdhisV26S3SamwBxlOEun3AUH2D3So6U2Uz39a7r+tWdz5bBe2BwIQ21bIV28iOA0q9HgszhqleebN+ZGqGrI3AVQN1wKxRMJw79jmmhPOTj3D1pOkvbEXnAXpObbVPiNWY1p5VfP/A0pCqqazYPkHVc+syJGq+C1aQ1MszAoZNt5iXUE0MhbSDCHMOhAJ5FrOfqLSr2sYllA5na+WSH9JbLr0eXL/dtgc7GYiU/96s3oAyQS+sXYFsRTay1t4IpOusNZdUCgQN4iL9bxGYGf6dGNNQcPcdrccjvY/xXPB0I1PmjYT7/mP2oUAOj3ylTv42eSWT2D29qAxpVnv69VX0Bx9FCYkHexoQ91nWGPZgzY+UKCilNE4GD3c+HzcwZLFJxT9vobPDFWSmP8nleJKX/1F8Ota2dAPbXb8VknDtg088+GNLWe1catOxq7vqJSlGtC0YiNqenc358tSwH94avpkmLFobZjwsmlBTvOhm0PCxZYpRptTJ1J93W2yJpgMjcd+zFYQVj+870Lm69t24LvkwpUcpgpHUvFXdhfKTL+54sGoVHp1vqHKYWgnQtlXMXsvzyR583nayh+XXDcsfR/DvoFdJAD0Fl3+icC+jVPdJWg3iy20wSiX+OCziWorz8Yp6wD1iEmo3ptT/9acqieS1f1xFPuuTHLbzkRNHaCCI47eCMI6aiynHprUJp0dn/LsqTBFxo9Xosebg/GNkHuN1nkKzJ7EvIVmg22EIkookffmF0NYUbhhsF+yDgQAwNYY6HsXUkMukLZgUJJXjEfuOqlksouAcU3LC1VtYufWUNaB3WcBR4f2YyMo8WMbmLwBGplB4Jch4KiBoJCEND2Hp53YfUqRb4DWbd6mC8P7fvrcJv02XXCsGyd8/A+4/+PesMERiwe/5WD2lDkppREphE6JqH3cb0aSS6XUZAHFFsltYra93zNbk6NNILxewAw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59d0c8c3-0ec5-4fd0-1013-08d9d461e524 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 17:51:57.2772 (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: AM6PR03MB4213 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/h264pred: Remove dead > 8 pixels checks for 8bit codecs 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: 1LVos2DiS7uJ RV40, SVQ3 and VP7/VP8 are eight-bit only, so it makes no sense to check for them in the codepath initializing > eight bit contexts. Move the codec-specific code to a switch located after the eight-bit init code where this is easily possible; and add checks to the macro to enable the compiler to remove the remaining checks when initializing bitdepths > 8 at compile-time. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264pred.c | 101 ++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 64 deletions(-) diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 731cf48ea6..2d115f7b43 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -445,56 +445,19 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, #define FUNCD(a) a ## _c #define H264_PRED(depth) \ - if(codec_id != AV_CODEC_ID_RV40){\ - if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {\ - h->pred4x4[VERT_PRED ]= FUNCD(pred4x4_vertical_vp8);\ - h->pred4x4[HOR_PRED ]= FUNCD(pred4x4_horizontal_vp8);\ - } else {\ h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical , depth);\ h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal , depth);\ - }\ h->pred4x4[DC_PRED ]= FUNCC(pred4x4_dc , depth);\ - if(codec_id == AV_CODEC_ID_SVQ3)\ - h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCD(pred4x4_down_left_svq3);\ - else\ h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCC(pred4x4_down_left , depth);\ h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right , depth);\ h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right , depth);\ h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down , depth);\ - if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {\ - h->pred4x4[VERT_LEFT_PRED ]= FUNCD(pred4x4_vertical_left_vp8);\ - } else\ h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left , depth);\ h->pred4x4[HOR_UP_PRED ]= FUNCC(pred4x4_horizontal_up , depth);\ - if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8) {\ h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc , depth);\ h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\ - } else {\ - h->pred4x4[TM_VP8_PRED ]= FUNCD(pred4x4_tm_vp8);\ - h->pred4x4[DC_127_PRED ]= FUNCD(pred4x4_127_dc);\ - h->pred4x4[DC_129_PRED ]= FUNCD(pred4x4_129_dc);\ - h->pred4x4[VERT_VP8_PRED ]= FUNCC(pred4x4_vertical , depth);\ - h->pred4x4[HOR_VP8_PRED ]= FUNCC(pred4x4_horizontal , depth);\ - }\ - if (codec_id != AV_CODEC_ID_VP8)\ + if (depth > 8 || codec_id != AV_CODEC_ID_VP8)\ h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc , depth);\ - }else{\ - h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical , depth);\ - h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal , depth);\ - h->pred4x4[DC_PRED ]= FUNCC(pred4x4_dc , depth);\ - h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCD(pred4x4_down_left_rv40);\ - h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right , depth);\ - h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right , depth);\ - h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down , depth);\ - h->pred4x4[VERT_LEFT_PRED ]= FUNCD(pred4x4_vertical_left_rv40);\ - h->pred4x4[HOR_UP_PRED ]= FUNCD(pred4x4_horizontal_up_rv40);\ - h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc , depth);\ - h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\ - h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc , depth);\ - h->pred4x4[DIAG_DOWN_LEFT_PRED_RV40_NODOWN]= FUNCD(pred4x4_down_left_rv40_nodown);\ - h->pred4x4[HOR_UP_PRED_RV40_NODOWN]= FUNCD(pred4x4_horizontal_up_rv40_nodown);\ - h->pred4x4[VERT_LEFT_PRED_RV40_NODOWN]= FUNCD(pred4x4_vertical_left_rv40_nodown);\ - }\ \ h->pred8x8l[VERT_PRED ]= FUNCC(pred8x8l_vertical , depth);\ h->pred8x8l[HOR_PRED ]= FUNCC(pred8x8l_horizontal , depth);\ @@ -516,16 +479,14 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x16_vertical , depth);\ h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x16_horizontal , depth);\ }\ - if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8) {\ if (chroma_format_idc <= 1) {\ h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_plane , depth);\ } else {\ h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x16_plane , depth);\ }\ - } else\ - h->pred8x8[PLANE_PRED8x8]= FUNCD(pred8x8_tm_vp8);\ - if (codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP7 && \ - codec_id != AV_CODEC_ID_VP8) {\ + if (depth > 8 || (codec_id != AV_CODEC_ID_RV40 && \ + codec_id != AV_CODEC_ID_VP7 && \ + codec_id != AV_CODEC_ID_VP8)) { \ if (chroma_format_idc <= 1) {\ h->pred8x8[DC_PRED8x8 ]= FUNCC(pred8x8_dc , depth);\ h->pred8x8[LEFT_DC_PRED8x8]= FUNCC(pred8x8_left_dc , depth);\ @@ -547,10 +508,6 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, h->pred8x8[DC_PRED8x8 ]= FUNCD(pred8x8_dc_rv40);\ h->pred8x8[LEFT_DC_PRED8x8]= FUNCD(pred8x8_left_dc_rv40);\ h->pred8x8[TOP_DC_PRED8x8 ]= FUNCD(pred8x8_top_dc_rv40);\ - if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {\ - h->pred8x8[DC_127_PRED8x8]= FUNCC(pred8x8_127_dc, 8);\ - h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc, 8);\ - }\ }\ if (chroma_format_idc <= 1) {\ h->pred8x8[DC_128_PRED8x8 ]= FUNCC(pred8x8_128_dc , depth);\ @@ -561,23 +518,7 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, h->pred16x16[DC_PRED8x8 ]= FUNCC(pred16x16_dc , depth);\ h->pred16x16[VERT_PRED8x8 ]= FUNCC(pred16x16_vertical , depth);\ h->pred16x16[HOR_PRED8x8 ]= FUNCC(pred16x16_horizontal , depth);\ - switch(codec_id){\ - case AV_CODEC_ID_SVQ3:\ - h->pred16x16[PLANE_PRED8x8 ]= FUNCD(pred16x16_plane_svq3);\ - break;\ - case AV_CODEC_ID_RV40:\ - h->pred16x16[PLANE_PRED8x8 ]= FUNCD(pred16x16_plane_rv40);\ - break;\ - case AV_CODEC_ID_VP7:\ - case AV_CODEC_ID_VP8:\ - h->pred16x16[PLANE_PRED8x8 ]= FUNCD(pred16x16_tm_vp8);\ - h->pred16x16[DC_127_PRED8x8]= FUNCC(pred16x16_127_dc, 8);\ - h->pred16x16[DC_129_PRED8x8]= FUNCC(pred16x16_129_dc, 8);\ - break;\ - default:\ - h->pred16x16[PLANE_PRED8x8 ]= FUNCC(pred16x16_plane , depth);\ - break;\ - }\ + h->pred16x16[PLANE_PRED8x8 ]= FUNCC(pred16x16_plane , depth);\ h->pred16x16[LEFT_DC_PRED8x8]= FUNCC(pred16x16_left_dc , depth);\ h->pred16x16[TOP_DC_PRED8x8 ]= FUNCC(pred16x16_top_dc , depth);\ h->pred16x16[DC_128_PRED8x8 ]= FUNCC(pred16x16_128_dc , depth);\ @@ -615,6 +556,38 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, default: av_assert0(bit_depth<=8); H264_PRED(8) + switch (codec_id) { + case AV_CODEC_ID_SVQ3: + h->pred4x4[DIAG_DOWN_LEFT_PRED] = FUNCD(pred4x4_down_left_svq3); + h->pred16x16[PLANE_PRED8x8 ] = FUNCD(pred16x16_plane_svq3); + break; + case AV_CODEC_ID_RV40: + h->pred4x4[DIAG_DOWN_LEFT_PRED] = FUNCD(pred4x4_down_left_rv40); + h->pred4x4[VERT_LEFT_PRED ] = FUNCD(pred4x4_vertical_left_rv40); + h->pred4x4[HOR_UP_PRED ] = FUNCD(pred4x4_horizontal_up_rv40); + h->pred4x4[DIAG_DOWN_LEFT_PRED_RV40_NODOWN] = FUNCD(pred4x4_down_left_rv40_nodown); + h->pred4x4[HOR_UP_PRED_RV40_NODOWN] = FUNCD(pred4x4_horizontal_up_rv40_nodown); + h->pred4x4[VERT_LEFT_PRED_RV40_NODOWN] = FUNCD(pred4x4_vertical_left_rv40_nodown); + h->pred16x16[PLANE_PRED8x8 ] = FUNCD(pred16x16_plane_rv40); + break; + case AV_CODEC_ID_VP7: + case AV_CODEC_ID_VP8: + h->pred4x4[VERT_PRED ] = FUNCD(pred4x4_vertical_vp8); + h->pred4x4[HOR_PRED ] = FUNCD(pred4x4_horizontal_vp8); + h->pred4x4[VERT_LEFT_PRED ] = FUNCD(pred4x4_vertical_left_vp8); + h->pred4x4[TM_VP8_PRED ] = FUNCD(pred4x4_tm_vp8); + h->pred4x4[VERT_VP8_PRED ] = FUNCC(pred4x4_vertical, 8); + h->pred4x4[DC_127_PRED ] = FUNCD(pred4x4_127_dc); + h->pred4x4[DC_129_PRED ] = FUNCD(pred4x4_129_dc); + h->pred4x4[HOR_VP8_PRED ] = FUNCC(pred4x4_horizontal, 8); + h->pred8x8[PLANE_PRED8x8 ] = FUNCD(pred8x8_tm_vp8); + h->pred8x8[DC_127_PRED8x8 ] = FUNCC(pred8x8_127_dc, 8); + h->pred8x8[DC_129_PRED8x8 ] = FUNCC(pred8x8_129_dc, 8); + h->pred16x16[PLANE_PRED8x8 ] = FUNCD(pred16x16_tm_vp8); + h->pred16x16[DC_127_PRED8x8] = FUNCC(pred16x16_127_dc, 8); + h->pred16x16[DC_129_PRED8x8] = FUNCC(pred16x16_129_dc, 8); + break; + } break; } From patchwork Mon Jan 10 17:51:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33187 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2949265iog; Mon, 10 Jan 2022 09:52:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyuNS04bEpArINZCCdP9vFXuvsP+62Nv8mc1MNt2V8BI/nmpQwpdXKjQL+/j440a06pP25w X-Received: by 2002:a05:6402:520e:: with SMTP id s14mr810268edd.10.1641837144602; Mon, 10 Jan 2022 09:52:24 -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 sc25si3989397ejc.417.2022.01.10.09.52.22; Mon, 10 Jan 2022 09:52:24 -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=eFJSjFH9; 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 99E6C68AEFF; Mon, 10 Jan 2022 19:52:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069083.outbound.protection.outlook.com [40.92.69.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED22468A199 for ; Mon, 10 Jan 2022 19:51:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OTE4wK7nO5YpVVPUAa5AZY3Xi2oEBAjChn5m5BkQa1jm6dPewt++tw2SVItHb3X+OlLz23mwmn8DmNovp4UroJ/ty71uNrPDEg3ohobYPPLR8tJL4Ga3N0Ytfh8uglyWMNKNccKRfWR+VoxJIe0eK26HbXQ3REEB0qcosmDtrlVcpn19GjAe1Mfr+donfGPov7LKBfc/v7XGFrAG3L8g0y6tq3aB7dW3GGYHQmhGuJYbsBLLeQTNytJf3XB4nPGA8bDUiDekk1JMZTH2f127lnqn+HEm+JHx7VBf6obpJWbNjeTWhjOPkSND1Ebh2yzea1Kmtmvbl/G5aiqHhSCKwQ== 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=+IqFB49PA0+wGT8mcH1yOhjG9hMpwOSLmAr55xnLObk=; b=ntKtkL6QPJJDUYViR/g9e+xCfzyiqM/axpGZ+b63EEVygzlZYUxBixNevp17qcKwvZQWfCe87AbMRoEspdmsG30pbUoMBAfI4TqgrxUOvX4ITXCx+QkuJAs/QRWacdR43jN+nzAMrG4wZuOkYROp9eUaFmI3TQ7Bu0chBh3aZS2my8xXU0kzo/ahOKuk75jGCQzFo2BisFKKtb0WpxLjlUDstMLuTRvPKP+TC45lhFzlMCGYlK7iHxFKBNOgUS8Oy3sEE+ZyZ2mjky+Fzta2MU452YK5PU4PVlLqv7Bet1aKHltAkE7GQAMupCx/iu2ScUd8/1zV6WgAejY7hyZjaw== 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=+IqFB49PA0+wGT8mcH1yOhjG9hMpwOSLmAr55xnLObk=; b=eFJSjFH9cedr3VmDO1yAXzXU3LTmSZna0kyDVtGW9GDD1V2okmp6LmbDN01DlUgZM6wjKVNdtsQrMi9ASAhPLs4O6OdsOASF2BfttK2/rul6no1hYAIEvnXC4hwhwoPyzI/+OL698iQvPyYNPFCSL/oNVOqjNlpOsaCLnSw5Js/OS5svnWVcZusVxABTFD+yxBGcKRJlWeAQZ/egrQJydXo2jD1kF+I65og9C4IXyHaErVzNcnIf5INepcWkq59EpBI7vRryNGUBbs9Mp7TrlQq+vzOSi8IbEuM6U1HMXcMDoj2YAyP7kVbcfGG3oS5Hac6BWRb5TFewdrJQw+ffNg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3400.eurprd03.prod.outlook.com (2603:10a6:209:1d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 17:51:58 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 17:51:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 18:51:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [dKLW5+KvHWEuZ2yVbi/fhMFSkKoq80zx] X-ClientProxiedBy: AM0PR10CA0047.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110175146.610875-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 53e28ef2-4359-4c8f-5f03-08d9d461e5e5 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ+cHfC79vTguh6WqLpD1ahCNo71l62gc5revjxsp2U/N7Ijep5IIL9mZIkWx+lhRJ6iRiyQcukFRX5BrHGXa3jFRBSg3E35idOe09Ql+7h2BGsalZCbU+WIib6gNPnnbwnH2q5cbbsNtoRJo/KHhEgdKoK3x51solh4oKiUh0kPr7RedJizYlrm+dIiYbFoHztpempKT8Gg6NV++k2YfQl+M/mgA+vUT1k1JINE9NzNIJeiX3rah4SFySKcdZYQ8+GusV/jch4mRFjToTqcvRJrG52JwO3UaDQ/u/hoCmWYu+N7IbHai4q1niCFv8/Id3ITjIlZVfIuWJtnfGwDm53XokSySqRhq9BkjGBb3usDJ7QG/RN9qkgrLrFLPtYCEBav5ZLacGYoFWiiVsLU+4MTcNItCwcGded01TE9nh8paZ5GMitay9rr/nFsLXySGEjgOV+tommOzKV0b/+nvM3r8LKA3VkaR22q6oTShI/hZazsSppl/J8TM4dexSZ8NBZvG2MRyTLd8gH08ZY/KM8NcTFa07BCKYexW3I9iBBC4ope9knVX/Zz6n+l9nooipXEZ3q82atZMY2EJ8a60DRh9bhfCI3wH0pY0U9unex3KgGiZzPP5m7TcvVl2b0Q1UzLZkos8YsJT+r0I9u4FTDGEu30FQUdHKFDr04ZHF7ydk72LPG6UhpBYWzFFW25sTlJtzifKadrA== X-MS-TrafficTypeDiagnostic: AM6PR0302MB3400:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ve4PQ2va4FUhsedgMTEBPgrxhajX7ybM3J4ReMWWmn+j9r6Drgz0v1Fmpl9dm/lRymIblF01Olc/uKzwUHRhkHS6WDNxtWPaK8vLGsceyj86D8hkAN+q63Nd3XF4L42GWTmOpjNPrKDFKaTlOHYOivpMD9XQury5riC+TrLhQqEY99WahCvoU6n924/s4Q/1V1BKwdz7WeVJduimAeu8m6eUvhfnNHs3yUoQQ9IhxoboMcgNoGSTtoEidsr+azl8Qq04W8OEovRBT5lwyqWC8S0PDhlUyNkxKQ1s1/jbT3KXS8PkDbs3AXVTrG07c6eRyEVDDCV7+ifd+EeL4ANgLU/EHjdz45HrzvxM0f25nlYULkHXABdVV+yhIHDMdDGJMCN8DhjZpBDBQ0KWNgOSQmBLB87Gw4JwhG8F+BMQlYlz3iUw1yG58cFX1qqTsKxhXQXSHyFKxQDMYVXKeWEWEETB/0TiNJmlnYymV4C+wSbAFtUGvE7KVvmLdfH8QA8piFU54c9kgibxxI9g45X9QWRZPd2/XSt4s4bf8dTv23f4T+W/AT5ymznG+C0sJDhtt4/z/qLXBexXMgMI2+o3xA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BtQBCJ5T7VEXeiUZuEceVQdBqFcq4mHQPgaEmWvQkTrTp1rK/j2+6Jxb5ml7hVO09v5+O96/1qG2pTqwqVZp4WrAgg3Ioi/8ZLZV/AG3vB+2KMaY3Twl8MaDCSHCmLA4ydYPQjAilihIB1CaMhsT8U1NTPCQwiNYMPXXnilT37lBFzyiAmuctgTCG3lGfQ1mFms1r+dE9vtQCylVqij65ZMAw9EjtlAgpWGSVXt0eU/S7r0VoIY+Xpat0iKUPzc5qvVqqGpsvbqnEfnfurf7OkIy0olKZfezioia10QXsb7ezw8HEgZFy3C6QmbIPitFFtMjEjuOZVWzuU6y8jKX0AyALNxa5ht+bVAvj6rCLyzqNFs1ZrR/xvbZKPHYNCZy0p4uU9EcHHOKu3z67cWmusZivn85mUeIrdGKE/0zRuKzbYBGrLVF4RNWPmsfxG3Rs07GvzUXYKNDiX9wZohhdPWL03Iv4Nl5LTYVvgg0vHlOihvTwsm3Q0TC9PVXGGWGjdCShAiT3D5C3HHQSZX3fRofmoayDw9H/geoiDf7OGFcfp9AWx2buxKXyUQB2H5mX8an8fSfbjZO7diRImHligYA5L1lmpKf6F+pzNqqdqI+MlP5qpNIycJVGgblodZD1BOFHGRAcNMkrwFSZLs2M0qkJEVXPU7UUQ/UXgurXkpfUSsAguV0J3C+Plj+nLZRfsZfg5RQDWll3ipOzl75w/ppvyYH8CQPFRm3vbPsX5WGY2fba5fl3jUWbY3y72TQ0FjZpQXD9nif1UfoqxRRUUbq0t1OZOdjuv9ZLbYbIbMLPD/J0YibV7CbYKJp3Fr7YUOtR1hyZgv1fANsj2dRvrlH2mZI1Apz9OBGGgF3vgoFv3LXaRJCUruRyaitWZfwGR63oyVcBsMpofTUOz8JmUzpbfyxMXyDwoVjQqrwSQK8S63V2m2XzQv8/iz3do9V6pzuYvUgD2BfTAlPFryACg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53e28ef2-4359-4c8f-5f03-08d9d461e5e5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 17:51:58.5440 (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: AM6PR0302MB3400 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/h264pred: Reindentation 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: FSMs938geeKZ Signed-off-by: Andreas Rheinhardt --- libavcodec/h264pred.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 2d115f7b43..d83ca37a69 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -445,19 +445,19 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, #define FUNCD(a) a ## _c #define H264_PRED(depth) \ - h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical , depth);\ - h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal , depth);\ - h->pred4x4[DC_PRED ]= FUNCC(pred4x4_dc , depth);\ - h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCC(pred4x4_down_left , depth);\ - h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right , depth);\ - h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right , depth);\ - h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down , depth);\ - h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left , depth);\ - h->pred4x4[HOR_UP_PRED ]= FUNCC(pred4x4_horizontal_up , depth);\ - h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc , depth);\ - h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\ + h->pred4x4[VERT_PRED ] = FUNCC(pred4x4_vertical, depth);\ + h->pred4x4[HOR_PRED ] = FUNCC(pred4x4_horizontal, depth);\ + h->pred4x4[DC_PRED ] = FUNCC(pred4x4_dc, depth);\ + h->pred4x4[DIAG_DOWN_LEFT_PRED ] = FUNCC(pred4x4_down_left, depth);\ + h->pred4x4[DIAG_DOWN_RIGHT_PRED] = FUNCC(pred4x4_down_right, depth);\ + h->pred4x4[VERT_RIGHT_PRED ] = FUNCC(pred4x4_vertical_right, depth);\ + h->pred4x4[HOR_DOWN_PRED ] = FUNCC(pred4x4_horizontal_down, depth);\ + h->pred4x4[VERT_LEFT_PRED ] = FUNCC(pred4x4_vertical_left, depth);\ + h->pred4x4[HOR_UP_PRED ] = FUNCC(pred4x4_horizontal_up, depth);\ + h->pred4x4[LEFT_DC_PRED ] = FUNCC(pred4x4_left_dc, depth);\ + h->pred4x4[TOP_DC_PRED ] = FUNCC(pred4x4_top_dc, depth);\ if (depth > 8 || codec_id != AV_CODEC_ID_VP8)\ - h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc , depth);\ + h->pred4x4[DC_128_PRED ] = FUNCC(pred4x4_128_dc, depth);\ \ h->pred8x8l[VERT_PRED ]= FUNCC(pred8x8l_vertical , depth);\ h->pred8x8l[HOR_PRED ]= FUNCC(pred8x8l_horizontal , depth);\ @@ -475,15 +475,12 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, if (chroma_format_idc <= 1) {\ h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x8_vertical , depth);\ h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x8_horizontal , depth);\ + h->pred8x8[PLANE_PRED8x8] = FUNCC(pred8x8_plane, depth);\ } else {\ h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x16_vertical , depth);\ h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x16_horizontal , depth);\ + h->pred8x8[PLANE_PRED8x8] = FUNCC(pred8x16_plane, depth);\ }\ - if (chroma_format_idc <= 1) {\ - h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_plane , depth);\ - } else {\ - h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x16_plane , depth);\ - }\ if (depth > 8 || (codec_id != AV_CODEC_ID_RV40 && \ codec_id != AV_CODEC_ID_VP7 && \ codec_id != AV_CODEC_ID_VP8)) { \ @@ -531,8 +528,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, h->pred8x8l_filter_add [VERT_PRED ]= FUNCC(pred8x8l_vertical_filter_add , depth);\ h->pred8x8l_filter_add [ HOR_PRED ]= FUNCC(pred8x8l_horizontal_filter_add , depth);\ if (chroma_format_idc <= 1) {\ - h->pred8x8_add [VERT_PRED8x8]= FUNCC(pred8x8_vertical_add , depth);\ - h->pred8x8_add [ HOR_PRED8x8]= FUNCC(pred8x8_horizontal_add , depth);\ + h->pred8x8_add[VERT_PRED8x8] = FUNCC(pred8x8_vertical_add, depth);\ + h->pred8x8_add[ HOR_PRED8x8] = FUNCC(pred8x8_horizontal_add, depth);\ } else {\ h->pred8x8_add [VERT_PRED8x8]= FUNCC(pred8x16_vertical_add , depth);\ h->pred8x8_add [ HOR_PRED8x8]= FUNCC(pred8x16_horizontal_add , depth);\ From patchwork Mon Jan 10 22:55:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3164251iog; Mon, 10 Jan 2022 14:55:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzGLDGs5xMJvjzqFXk49lqMycLOk6JmbwBinm2SSHW0tW/D79kzR8ffcIAwWXS8JJlNfsrR X-Received: by 2002:a17:906:c155:: with SMTP id dp21mr1451282ejc.450.1641855357527; Mon, 10 Jan 2022 14:55:57 -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 dt17si1839719ejc.922.2022.01.10.14.55.56; Mon, 10 Jan 2022 14:55:57 -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=WpfEjDPD; 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 C967168A9AD; Tue, 11 Jan 2022 00:55:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074097.outbound.protection.outlook.com [40.92.74.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BB696803C7 for ; Tue, 11 Jan 2022 00:55:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qx8N993Ilr4TKTlsZFnsPkTe/EFWmzV41pqY5PxO6/5J01bu4rYKGCRqwuADdWbtePXZhOIEVORbh7J2NGyKIEYYzLX2U96AIALMiEPssQcKC/2/lGdoFcUfejNToNpA540UiLf0YkyJfzwCTAffgMBqVetP6d5SEZkGOk8eSDPs2cTPKVeFCYFTBbpZxMRnwIWjGhtg8/OJN2iTk+jvA+z9GlHMYFztNhvuN4ujR9iDkgKcjcZSLFtdJN5shbmCtK0L5Ij4GcPQSQQOqhqzlGdN4WGK6qF4rqapeE7cjx3D8JaNOi6MS51LVFdmMUYLCjIiavaA+ZqtPGr5AOr0lQ== 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=kOsWbXT14mXHrGGOwFFZrNFo4h3xKOSd1BsrV1+bSmg=; b=Rvz559mykrMTNjjkNoSN2DDl+xX4YwUdUa9YMYX6Cu6x1hb9VhD8UUyMxGU6NEYPx3pV5BhhR3c0PrB09nQFOQqON+mfTteedIWSRlu6qgn3HzeDYp7nuQHQWkCwXCn5D17DgQ4oII1jG96cOVnxii7wSDTMmSCbfBfnOHR8PpucCA8RsYIrzQ21iVRHyitTvnxmriFG96ad5ZmNkNKcVpuVODcSBptJ6K6HiYLbiUtLMIFKXJJOLTNVkSQn92UvRZykP4bTM4KXYVPkLXkFkl0bDIIsWjIBYQIRHScUedIg2a1I51OYM7b7jfUAPoMlYfHiJlgE9YBKkg/61BHIAQ== 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=kOsWbXT14mXHrGGOwFFZrNFo4h3xKOSd1BsrV1+bSmg=; b=WpfEjDPDGDqIF2rJ7yOuq6QkAXK9Yc4pc+9UsjfdnsLZlTdOUmDRjjzsCEAYaGj6eTbz9RuQ4usnQ+lEZ4ttQO6QzaW7UKiw8how9xI/3NmjJnIeOe0LQviP/QZeoV0RVJvJ1gBo/dKthCTXCHD0PynEukIPdeSQWRtgdg3E2CnSL3dtCqg/P1tdtkxJNNqgwY0UagYIy8RYP91HeXYECn30Nqxae3BpGVOTyhY3TByxHDesDNuqDMnHcgFCwKIBbY//ipsme52noSIWqpDpPNLvc3y/ZoxIs6qTFMhNV0FJagB7QnuMh91ciPftspcBCu+fUOIWE/puzP8Cb/QxDQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6181.eurprd03.prod.outlook.com (2603:10a6:20b:142::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 22:55:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 22:55:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 23:55:34 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [3tKAX5BIHGc1kVRS5agByH9bN4DEM3DW] X-ClientProxiedBy: AM0PR02CA0021.eurprd02.prod.outlook.com (2603:10a6:208:3e::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110225536.887209-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5140c05d-3b08-4b21-9310-08d9d48c55a1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JzDao3i/3GTvoif372ewHF4/atRAL6XSP9tEpiyj7h3kQ5BwGLv2ljo4X2O+5MyLUlRHrtCbYbwNlT6mgSfRBxsyWnmjAgpoA0uJqEOpAaShGaPpYGw3lhmCerl4KR7/PwpgrNl0+7Q+UAr4+apssxWTSuFd0t1yHhoRBTsP13SIDJT1N6HH1n7eDbQwaDqZFATnJckaiLMh6xZoPRQeew6Y3zPb1VBXJfAgWj9gXwW3w8hDW2E36q+DsPsUOe4ezvj0wx65QkTqSa+eiVnwhDLX5OMxb2Ary42RkVs2jXaGg7gVp016faIrHpyo8Czo0dJ1nAwcLIwpFQyB0NF6GZZFn1NvrSL9b9AF+N4oOfbTkvP/BaxU5eKjaW+Qo17Z4lZrL0Mzp+uG1qKc9RrBStLmx4D5WbsRU7EDgW4hnixAaf2zm78ucaLNBpnmi9dArTx/PHgIhis9eGDLiukPfi0r2lKeGsxoeu/5ZhMdmFyHAjgIv28m8jIqyGQmbho8eGE5zkNZn+HKhm96jXxdbi2jiQA3BXdeBiMVDGjlnvEQFKDf+bnzsmCNz/BqfiGJNAM9+WtkqdOkh462t9ywNA1KOGoscm6S6zBs74XrfcQ+fyEJ4LWeaySJprhzlj9m3vPh2+y/lqWOxE+xfereKSi0MogRTdKn3qB+4jYxC7I+545aJ2eAvcmWPy/LM10z8EZhzkzOK9lqEvtb49r95ZOl4/fxR36Cg59Q4GbDGm1w= X-MS-TrafficTypeDiagnostic: AM7PR03MB6181:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9A9sIHPtBgVlESFAPfT+LjTXp3NxQ1y7d0RBKyjH3XbGffx5aCSk/D+LycCRccLpZM+QsEfa6NUzkPT905qaNNEnic90cQDaFHUfHRKZeNKTe5QXADH8r19Qp18ddL+bJRzaLkF9dOKLp/BQjmiSQ6/d4Jrhhm8c1hyTjB3mjYH8lYxCTwo5mKzkAvN8ZLcK7vDGKSsBPXDGnvBbGacudWXBGi2dn6zy3Sl1GpsH6dMHg8Y56qBBw5Vprb+Q4lnY0eKcAGXOqPdV6S2YXGsOTe379nu2VXevo9z1dbehy9+9p3zSxfjfpIVRL72zNaEdOiKRlEmo/IFfnzR4052DHlMm3rLd+WApSMKshrATHvo79ZvCPpjgew7NjhUOEFggG9yqD2TnRprhPSbQraFS4HioCNrf4EiYb3UyzcLBiIHd36a1/PflII+HB/j4t5pJbZdkjrahkJIFqNNXrsubLlMEdXyZ2PIMCC59xciQv0FSeR3veQJwMte2W4hBdtsGKpL/BnHSgiE9DVvWyy6YtuphchvZOsWrT+hDtjurEvVjxGY5owvyM5nYreoZ/whDKxKDTN9PBS8ezlKZGnyTWg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AyvkEqBUHq04bSGXBuwyEEBlvfPqRCfPuXLpEWfl2AC7fostfJMdNX3y8kZYzd7vdPizXmKpy7azoATZW/vY35RthoVIV1X5gAKCkt1J3LbOQTJg1U2WQiOPsNRFYBVma1JWfGd6M660vqouX0aaJ+uBNUpDYFKPK2Vb6Nk71HL7SHyQTD2EVxkJMA38cmR+tzXWtdxXlmGgBO9EEWAUWu8ImVwsbSWpSvlMM5NNfzzMNjFgtwW/Q9wUUgvqQaqP4t+jVQdfDMoYvYhBv+7UobQRvlulXg9zDoi2f7/MWO63gLcDaSpc070MhmcKIugOcNNe52AS/PXoPmOrqGEyh7qRQu8reYHdb3DPOI1b38lnN6puFbp67R/N9jV5df5cxhg4+07yIPNVfm5d3EuvB66m1fiv/pKNhAeFzwpaKbFiB6N+syWGtbTYUHZS+PQbvHDDWJFIQOgZ7zjxS/YLwO6cbilaXc3wrEqdbtp2M8edqq0Q2bDkU0EYlk74hK/nDBWm+X3wl3Tg0vQn65tRFM0G9CCCpZdzq1ynKivPTIOilZaAJsFdgJGmB9OrO6N3ASUdns3pyVDtW4FWW2o4wr0YxdI/YaY8R1H5OVxaSqF0p4EoNM0zJVrv2X0hQVbeuMpZB4Jk64Mf8z6ECG3cbh8kB4d8Re3BCUMsgQv8jOcjfchN5e16Fr75yg6UKKSghPQEgwp5EbOYJIb6VsHGK9zEux8RzFudWf2JCDtpKnAE6kKQhMVC68G7xGAv/N33GtAQ42cdATU5eH6U7Su3MBs2qGceUf7lpzaBRf5DwN/7gFzkT9Au5puShxqMf9bljhcC5G8lh4iEq1KvCuhbTHMDy8YEvoMoXc1OlkehTLRFnoo3VwpZyY+YRebsvLFCFlfGSG1a03bCWWcoXZtW6cgaBWt4aEhA8YNT2kw49RkxOBknHA7G5W5zoNL1M1j6KZUjWENpXlApH6ZBSQMXMA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5140c05d-3b08-4b21-9310-08d9d48c55a1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 22:55:45.0390 (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: AM7PR03MB6181 Subject: [FFmpeg-devel] [PATCH 7/9] avcodec/mpegvideo: Don't set unrestricted_mv for decoders 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: DJiet6n41Y7a It is write-only for them. Signed-off-by: Andreas Rheinhardt --- libavcodec/flvdec.c | 1 - libavcodec/h263dec.c | 2 -- libavcodec/intelh263dec.c | 1 - libavcodec/ituh263dec.c | 2 -- libavcodec/rv10.c | 2 -- 5 files changed, 8 deletions(-) diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 6258c1c0a7..2ddcf021fd 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -90,7 +90,6 @@ int ff_flv_decode_picture_header(MpegEncContext *s) s->h263_plus = 0; - s->unrestricted_mv = 1; s->h263_long_vectors = 0; /* PEI */ diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 9cc2665cac..ac48acf47a 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -83,13 +83,11 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) s->quant_precision = 5; s->decode_mb = ff_h263_decode_mb; s->low_delay = 1; - s->unrestricted_mv = 1; /* select sub codec */ switch (avctx->codec->id) { case AV_CODEC_ID_H263: case AV_CODEC_ID_H263P: - s->unrestricted_mv = 0; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; break; case AV_CODEC_ID_MPEG4: diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 7c794dc5e3..58c1b63c0a 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -66,7 +66,6 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) return -1; /* SAC: off */ } s->obmc= get_bits1(&s->gb); - s->unrestricted_mv = s->obmc || s->h263_long_vectors; s->pb_frame = get_bits1(&s->gb); if (format < 6) { diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 17af5d7f89..5329e62a5e 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1150,7 +1150,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s) return -1; /* SAC: off */ } s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ - s->unrestricted_mv = s->h263_long_vectors || s->obmc; s->pb_frame = get_bits1(&s->gb); s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); @@ -1180,7 +1179,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s) s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ s->h263_aic = get_bits1(&s->gb); /* Advanced Intra Coding (AIC) */ s->loop_filter= get_bits1(&s->gb); - s->unrestricted_mv = s->umvplus || s->obmc || s->loop_filter; if(s->avctx->lowres) s->loop_filter = 0; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index d8261c34c7..0dc2c87335 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -149,7 +149,6 @@ static int rv10_decode_picture_header(MpegEncContext *s) } skip_bits(&s->gb, 3); /* ignored */ s->f_code = 1; - s->unrestricted_mv = 1; return mb_count; } @@ -298,7 +297,6 @@ static int rv20_decode_picture_header(RVDecContext *rv, int whole_size) skip_bits(&s->gb, 5); s->f_code = 1; - s->unrestricted_mv = 1; s->h263_aic = s->pict_type == AV_PICTURE_TYPE_I; s->modified_quant = 1; if (!s->avctx->lowres) From patchwork Mon Jan 10 22:55: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: 33196 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3164346iog; Mon, 10 Jan 2022 14:56:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzg2od3b5yQpXOLe94Fb7BVlC4WOet/CQHbIqfJmXljqCsCX4pRImbfQTb9t9SS+IC3XM1O X-Received: by 2002:a05:6402:7c6:: with SMTP id u6mr1748227edy.160.1641855368411; Mon, 10 Jan 2022 14:56:08 -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 j5si3859831ejm.844.2022.01.10.14.56.08; Mon, 10 Jan 2022 14:56:08 -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=LFdAbwtD; 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 E17F268AD96; Tue, 11 Jan 2022 00:55:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074097.outbound.protection.outlook.com [40.92.74.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD7E668A51B for ; Tue, 11 Jan 2022 00:55:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oGGlIeKGzfQdDqfm+wz02DuRycprxIKII0LBEONv14H6T+0JXAol7pkfUzf2PMWtBzs+P/VIXqhNFXsFhZM1pbMeAkTsmSpUJi8fa1cUFInipApO8de4iB1pBQR8lcSIpF+I7EYUwJoCK0Es8IQHoMeT/ApyX7dSVqfVmTxlHqy9OW6+riedgpcdaH2QwurKVHprosC9VRkj2vJUgluKOP3sLeeiel3fYYl459hwQ+0KMIuqUvKIm1rOEqSZsGxrEiSpOFkVz1fqBWa59ErjjdKhwIOkK7NDmgwRQ8zRFc/Kitf5U2anVErgxSHmAywz+/HodHxniL8zH4b4alpGNQ== 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=KGWVjsmO39K/OuXPemkFKGe6fgbpf9XA5GgKBofYO+c=; b=a8+MILOAKgLvWg6lRC79TNFs+evojFLQ9cnvmIufExQdl9pXNcsZ3tDAMPAi3lCQ1kNrmcH34zq/v04wOQJQgnbeKXuWkPGWa9et8p11Nx52M6rfigwJBFFYSB4mER3efKzsD+zAdDKsqMgyZmf4RhR/UBlCFgYGNZbBqy8UII7xfBLlQa4fviBdsbYD8a8dgsHPemGQC+LGQ9B7/WLdtNtXVDzgGepHnWfwThrnpMsxQicziOLs4hoW/qWkEdciJeJW1jv/4vPEzqzid+op8qU+RrmeGAjY3HInGQ4Qv3TVAG8vMdKOZzDG90emSiLSlTeFljj+Tz4pqrY7t8Debg== 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=KGWVjsmO39K/OuXPemkFKGe6fgbpf9XA5GgKBofYO+c=; b=LFdAbwtDjlWooX+18hnEK8jtv53u8bjSGvnl25+9Js9nN5comGsQrFUBoJatTPa6tt8YcsVBNXPYrNsIcsS675TiW53qyz5YbZSg0RZ9JIvYgr2DvdETVWw+p4um9gyRLbmZ/tULpfu5BQmuB2xIkeH0XR9dNwPIDx9EgSjff7CueZgsY4Wif3SPtVYfnF2Bg75CTHTF4KZBJIwOAwSOGGXvRPpzaNrOI/diICJrQyaItFqiifFz1K5UE4wVKkzFFg3UDNO9DIeu7uXpIm0om5CQCzCruWWXajDuockO+5w7bdgn5PQYx/LoK9XXmnxS24aIDtE8jKyNmFi2zfPPZw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6181.eurprd03.prod.outlook.com (2603:10a6:20b:142::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 22:55:46 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 22:55:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 23:55:35 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [1Eowdivscs82khbbofxr5Cb0cT4Ex7Yl] X-ClientProxiedBy: AM0PR02CA0021.eurprd02.prod.outlook.com (2603:10a6:208:3e::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110225536.887209-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe0f815d-ac52-49bb-60cb-08d9d48c566c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlboByDTzUa5cZFVpG+pS0sFkLmDThoLlze8CbLuGDVbSfiJP09znTsvSwHXYydJd52V1k0Fayd2Dcpm/HAV1VSW6mucKDkPKaxFzJGNpdJuvj9Xiq67BTTf+b7JQ9LRY34cZUm6lR0kWYHF1Vn8UML3zkzczZeBGDPTj8zE7/Zj4RUW7SnTvMXxBhLrq2hfFN9JMFreM2hjmVQa3aNiMHdcGYileKTXmvJVKazH2Lo4Xb7QEoMiLmv2kTYAzfENH5ITWg3LCEdUv8gVFXnVKG36iZVxXJpWBcBPO2nHnEyJpo8hXlbnBC/xp0phJtk5a6dAAmABCskgwjY6wkc45SkwIIVmRDY+YC8kh/lTBV+MMY9MNcm3DcjcYbagHn1uJc4WCrsQftdrdaAZufR7zkSZTppVg/gK3nobpyw68BWHnJlZBVTDduY6NL3dk6pDsYCqqh/XV5CJ2U41hIPOZaqe5yzmgsgM7T4VNV6UAqgtYHxKzdpMwIzpSPL38ynwCQPxSDNwC4HkTEnllzQBI7cW/0Qc1qzpzG+nCrb2KLDdM/jokUsp8bdRvi94CQra7sAArxs1lg6MKJdlfsCnAEqWDF/3kOhYh+jCszgs2pjseavqOLqTbLCh9SeuINZ47CJLq/SOt0nc0zc5P+O4UUYIqyPF5CNSFviXAT65BgHKl1w8yvIfhzZW3morDzp7nEZ+LR8zvh3EY= X-MS-TrafficTypeDiagnostic: AM7PR03MB6181:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jA9liSUKL3pj9lybEel4MAxWVM6v0FDMxs0l0XoHMaX+x3fKg0ATE+OyfrqWbP2hkFwnbeKUcRMAMY0DnpAAldGGzNxqT4j50ZTxi5Az6dJjVRRNAV0c/jBjdxBvtXH49uoE6JqXaIYOF0e7UFUxA1wJMzjjxvDoUCGQc54jBCj8hZRo25zCoTbyrDTQT7GOQL1k2hO2NuiBenOmGWf5v3XQywj9A5HNkIeVoFTQwMNUzspHzGrGWsU5QcIgwWNpymnDUiFzLK4ZWHmAIoAWSBjWXLr8Xp7SHeD8R1APOsKB/0T0ebkg1yNiOU7oRgA3zs0EOvRUbAD01fHA8XnExJx1O328xohPT/sEffn+/GHTiMZOw8i6MDTjVcsRohyIe/yoGx3LxPBAu7K2mwjuv/4lou8eeRX4gNQ/S9hPU9jXipAaNkqyhcMcW247BdwgPgqKYcgl3L/W2C3xCQUHqfNcLkexOI+hboD4xrLRIx8ywIsCDsIftHBfvzG3kbUuzJcQV3uvdoMX6ljGV20SIs3u9lGV1Xj/BjRLRtp2hmdlRQgjVM09CaXiPqME6XtKsgBCFEacRA/MX7yHbeGLfw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1sR9lVGwBs0lMs4jUVOgmSLo3OTigq7VC9MShFGiap8CgwYXfguSstIjvR3hqzJ2ruucuSbfggnSIoURE8XVjxAspTtTqypxcEsYSsOd0CwcfO46//Pm//Jbc60opIFFQMwPXzN6KTgqP2DGRonNhzMHP5SJ94a3f3ahFF3bhcu3EljMZ3U3rzjQA9cpobAUaWjuo9PgKaJzroNhmtxK+mSZVx5tJri4esXT0tNTQJ2V9vsc0ZZNxCdBBI5kIF3+uAn6QUeLpme5eVXEdAYhX7gWyHb6bPoDLG3xk01bVg5102JfxNJU/fhF0mEYbOb7bfpatuVNzhrMwKLBlrkuRkBmFUdvfZhuhaMrvJGZ+OKiF7vvWAzubKdYnh/Bq8d+AXxCz7GSmjO+okudvAPMKVPYx5IHW48na9/YJr4CcHaJyr7/SJDzUSg/0z/j3P1bd7jVtztxuk/DMnTOsMbp890VDvZpSkK5zkztK9c1NNQJCDkLmc52xGmNg+Rf2K3BEOCWWjI64YSNTkzbr08++jVwOMOujS4WHx/3LPgbnXWR6JiaIqheNZd8Aqb+Kya+2huNaX3xp4+HCk2yX3ebWexuYCFB62s1yZwxtMBrMCKT19sCy1veY2PeOf+7Fw6TDG20ExaXZIlQg0ZADRlvdRbmeAkJ4WqmAt2I4jr07HglzPR2tBso/HPyG7fLog+jgLAL82FQXonmEdKgoQ2JEMO6H0bY7n4GH6qc6G7QOrkPQMyDyyi5sHb38IR9Xfm+EZG/vMkFKql+98ZLupYRojG8UBG3MDijYkLMp5LU+IATfwQyJ8NKHQq9wLwJIP/Ty79N/e/+LY1qYNvvjuDukx5yJ/tmK4U/9ByWnICC8B0LXGKH2yHeUAb9cOTYeTNHB/Ec2G2Bz/intY9ZgtM7Uw2ISIJ611CHxTKW9GCkMFAUrkG5w6BNNZV9oFJQPnnnM/GruMGj658r9AilojjAQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe0f815d-ac52-49bb-60cb-08d9d48c566c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 22:55:46.1963 (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: AM7PR03MB6181 Subject: [FFmpeg-devel] [PATCH 8/9] avcodec/mpeg4videodec: Avoid multiple consecutive av_log() 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: d9A+fXP/8CwW These messages belong together, yet they can be torn apart if some other call to av_log() happens between them. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 59 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 515a09d8a1..737689b35b 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3276,62 +3276,63 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, continue; // no startcode if (s->avctx->debug & FF_DEBUG_STARTCODE) { - av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X ", startcode); + const char *name; if (startcode <= 0x11F) - av_log(s->avctx, AV_LOG_DEBUG, "Video Object Start"); + name = "Video Object Start"; else if (startcode <= 0x12F) - av_log(s->avctx, AV_LOG_DEBUG, "Video Object Layer Start"); + name = "Video Object Layer Start"; else if (startcode <= 0x13F) - av_log(s->avctx, AV_LOG_DEBUG, "Reserved"); + name = "Reserved"; else if (startcode <= 0x15F) - av_log(s->avctx, AV_LOG_DEBUG, "FGS bp start"); + name = "FGS bp start"; else if (startcode <= 0x1AF) - av_log(s->avctx, AV_LOG_DEBUG, "Reserved"); + name = "Reserved"; else if (startcode == 0x1B0) - av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq Start"); + name = "Visual Object Seq Start"; else if (startcode == 0x1B1) - av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq End"); + name = "Visual Object Seq End"; else if (startcode == 0x1B2) - av_log(s->avctx, AV_LOG_DEBUG, "User Data"); + name = "User Data"; else if (startcode == 0x1B3) - av_log(s->avctx, AV_LOG_DEBUG, "Group of VOP start"); + name = "Group of VOP start"; else if (startcode == 0x1B4) - av_log(s->avctx, AV_LOG_DEBUG, "Video Session Error"); + name = "Video Session Error"; else if (startcode == 0x1B5) - av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Start"); + name = "Visual Object Start"; else if (startcode == 0x1B6) - av_log(s->avctx, AV_LOG_DEBUG, "Video Object Plane start"); + name = "Video Object Plane start"; else if (startcode == 0x1B7) - av_log(s->avctx, AV_LOG_DEBUG, "slice start"); + name = "slice start"; else if (startcode == 0x1B8) - av_log(s->avctx, AV_LOG_DEBUG, "extension start"); + name = "extension start"; else if (startcode == 0x1B9) - av_log(s->avctx, AV_LOG_DEBUG, "fgs start"); + name = "fgs start"; else if (startcode == 0x1BA) - av_log(s->avctx, AV_LOG_DEBUG, "FBA Object start"); + name = "FBA Object start"; else if (startcode == 0x1BB) - av_log(s->avctx, AV_LOG_DEBUG, "FBA Object Plane start"); + name = "FBA Object Plane start"; else if (startcode == 0x1BC) - av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object start"); + name = "Mesh Object start"; else if (startcode == 0x1BD) - av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object Plane start"); + name = "Mesh Object Plane start"; else if (startcode == 0x1BE) - av_log(s->avctx, AV_LOG_DEBUG, "Still Texture Object start"); + name = "Still Texture Object start"; else if (startcode == 0x1BF) - av_log(s->avctx, AV_LOG_DEBUG, "Texture Spatial Layer start"); + name = "Texture Spatial Layer start"; else if (startcode == 0x1C0) - av_log(s->avctx, AV_LOG_DEBUG, "Texture SNR Layer start"); + name = "Texture SNR Layer start"; else if (startcode == 0x1C1) - av_log(s->avctx, AV_LOG_DEBUG, "Texture Tile start"); + name = "Texture Tile start"; else if (startcode == 0x1C2) - av_log(s->avctx, AV_LOG_DEBUG, "Texture Shape Layer start"); + name = "Texture Shape Layer start"; else if (startcode == 0x1C3) - av_log(s->avctx, AV_LOG_DEBUG, "stuffing start"); + name = "stuffing start"; else if (startcode <= 0x1C5) - av_log(s->avctx, AV_LOG_DEBUG, "reserved"); + name = "Reserved"; else if (startcode <= 0x1FF) - av_log(s->avctx, AV_LOG_DEBUG, "System start"); - av_log(s->avctx, AV_LOG_DEBUG, " at %d\n", get_bits_count(gb)); + name = "System start"; + av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X %s at %d\n", + startcode, name, get_bits_count(gb)); } if (startcode >= 0x120 && startcode <= 0x12F) { From patchwork Mon Jan 10 22:55:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3164430iog; Mon, 10 Jan 2022 14:56:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzakZ0s/JgH+6m+JEcMmCsvuey3RSLnlXCuUl9cRywxw2seX5lUihUlukc58MqfScyP5hbL X-Received: by 2002:a50:d541:: with SMTP id f1mr1761687edj.18.1641855377265; Mon, 10 Jan 2022 14:56:17 -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 n10si2949017ejx.850.2022.01.10.14.56.17; Mon, 10 Jan 2022 14:56:17 -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="bJc/2i89"; 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 E492368AE4E; Tue, 11 Jan 2022 00:56:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074097.outbound.protection.outlook.com [40.92.74.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF0D068ACA5 for ; Tue, 11 Jan 2022 00:55:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UjF8gBJALTzxFArWOl3M2CckVFx4AeRgGz1ivIb6oA6K/mnFcyxF1dC/mwxb+LhteMAi5Aw3mndFO775r+UJnh4Yu4+/jDqNVAWPm8eq3nHv1gpIWbzmgC8TM4vWjdD+KsHhKWZpkG/29nIMkD5MvxBjVIctTPlcS4PiO4bO55p1NsniFsjQKknn66vU20J2XDL2uKJsAwHGdvnsPb11I1BW1xUWGMr0yKDyuCpX3whpwbCZjeW4xECSyH3iyBn9W00B6bdxdYnVtVyy8giT5OWxy5ehtX3+QGxrD6f2CChOI8V/PPN04bQyB2ktDAwW+UFmk+XoRdNcPwbgPKaoPw== 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=ScMc0vIKKofPOUYTGwNKq4e7lbFZynw5ThGr5k2T4Jc=; b=S/eNJo/VVEz1OD5C9Rg7C8HSgKJqicIrztShPL2mF4L0fPuZ3Hi8uHP1XzTWNmkrX5fqQs4+yAgQpQz0ExRPVwprh5aFbHbQrUNNpXUD7N6zIQ0SktnrMwEh5f87UdiCl9YNKSap1t5qPlQ86720rjrOSpRLyR20laMu9W+Awls1YnnHFzbUnrvF7B5A4dc4sYzFLFhjxslXKS5DBM4gxOwmlzup6eZghSQi9rm4WAJp7fzpID9K5dOZFst7cBR+F8xAsV+zXetJPvQgNcEIheinn9WnYpmWeimM/H+r6hXg/tZGBbsLrPgWt0ALqaFAwgJUVYz7lB3uqemfqrt2xw== 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=ScMc0vIKKofPOUYTGwNKq4e7lbFZynw5ThGr5k2T4Jc=; b=bJc/2i89zgKsykoX4Frl8hjlaZyLn+I+iap9GldO0T1uRK1EMnXYMVr7dc24f6OWZsoZs9/K0G9s2ZF3tgaFf/mQPF6VEv3gNaBQb/DJ3t1wwv4sq6Q1CwoIRITslrWK+wooDXox5gVEOFGR78lylzfXv7UFpRvytPEQyrakt3Gy+4ij3OqDo47+Uw60wIyK+Julh1RTUI8AtsiP0iwqGm9zGa4S7tjtfsnC7ZOr8+JW8KuKsN2VHGRdpcu97c/k4CsIOtkUEtMrrQYpxwQsLfXpghJVE8LLHk/Ys+HAnH+nvUxg/ZBWY9mmk2WHkXvpHcwnPEBUH+uHoFQpRlRuaw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6181.eurprd03.prod.outlook.com (2603:10a6:20b:142::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 22:55:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 22:55:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 23:55:36 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Lk3Ywxkc5KpFx6IgttStOeNlxxQUTp0a] X-ClientProxiedBy: AM0PR02CA0021.eurprd02.prod.outlook.com (2603:10a6:208:3e::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110225536.887209-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc8fc285-caa8-45e2-7a40-08d9d48c570e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhl6Xxv8kA0Tq0xRJyg66DfNYq6y6OAXB0OvA8Ox/1V9DCJzilpUgVF9GqdIPqK7FfuElDjNKLFL23NKUakNoT56qnICLXwu67mt07WALpPJsfi1Rd5PnROT+nUil4fhaIJn2e8nnzoUgz4iX96bZGbjb+EVbZfYfoVTY+NM/2zkzmc4pQE1wuUhie1Yu7bMp9kI6R/K+D0mvZD09OJYAtB0xwmqUCD5ywVjg01NBbs9ZrjEFc72tL5wZj88T9lrTiY981iUQsk1ehyuvAspJdwUP2Xvhe7XCxfIrZqNOgnF+IdQgCmB/g2DlmaywioTI/LRzUBR2tk8RAoOOwc+HD2+D5QA/UidoUKMGM+DO9A3vUHxSktFdKxp6wCvlhZElFUuhKlIga1ULeASX2iWtoeIZYBAy4FcNy93FIeNx8GrmpWWbAgTWBZPOcmZgLzL/iEKjT2APHXZdEBYg9ZLaRyJH4fRNe1qbYVoTVSz+E7GM6u7VJdFi8GZaRZSTBi9VWt+xNb6FdcilIKXoC3LdQwJG8YU8tli3CrrIOlLfhLoUxFeS9OYeqwGrQJ5pXGlPJPKi/rFdCBursDPkISPVSZLPJRaw3CrGpLShGl7w1gqZhf5DTRc1BtdnOWsVxMdr7VwnHUV9YlVmMk2FCtkNULOb75arB9W+fn4vtIJ7k59DFU6gmrRGUCW3ytabjo3mugF5w87lURRqM= X-MS-TrafficTypeDiagnostic: AM7PR03MB6181:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OjATGhZ2rfszY48Ogoij0fKkqBwQiyXLcPDJkh0o6O/gMAGok2JNp3Vmhx7htm8HMgsMv629zUl8tKkrAwWZMmELTYnRf0EvWflQbMem/qWk8CNPITRCEcuDKdM2vuq16YRaZHxcyvlqBS3qW+FN2Wx/1rTHfxiOWHxGhKoIgT+7qGw8rFiBjdhyuBjpr87qx1U15/KqCtD8sjeqXUeVPHALqdjnDWfzDyJ5ugyFALA2GVkGuxfl7Mm94r1hdq+gL2SvJWmdlUG2EM4KNUtzPpALI7CwlZ0TPGcW9kthowVPXagaEwgLsy2WShdUyrRj6TUEGX+zOUAcGztDcCg9i2yULKfAoAVNFFYhpEE9LWW4eKp8uCDqHr3IzG0UmgFnU57VdZTuyJ2hxXrUD2Y4+RcB0B9J9kF/WRRsHpFcXnoXaJtyp/sXD84RCG7qPZQhXUx8lMygzgLM4+69wMv8bDxufecFRMyF6Jm19NwVD4FgaGYP3T1++ziEd9pdD2+PnHE260rpKsXFOEWaGSAxdJhYg3jzo8IigKyIbXcXL8LTpWaCBmSmjBaN9jsy39bpGopvdxLmxfQLU7zBvkaYZg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gLueJS+VNfurgGn+ngnWcOO3MKTcShGkWOToPADlCJggqY8HVLaK/t2IOT5lGvopoiuEk9u3Eg7NYM5oLTqD0GWbu4lgBCcT0QlFLXMxey3EGVxiZYo0N7JZhndE3YU/D2oXVJlzA69JeFlV6XcTAAj632vxaZ0251aQJJrKRKHt524SvCciua6TBMQ0kANnH8oKcRYRYS7t9Dflk7Ay4Ojfkb2l6Jf7zv/KnwNJntn6plNL4olFz2s0E0+2gtoQHyh95OvwbMCIZZgS4ySrzIk+xmi6O1zLj1n2kGQ7+L08JK2jNQO0JUJQrVzt7k4jSgWoRr/FPViUzhZFKqv7MYAJFgdhtQaihe5jeBBqKwlK/XiNPlt45yY4fCShxyfRtlLE88S5gB5xs5YMKPZj4rMmiSsjUqARLyoaKy8fp1Xi/jy2Ym8HcHECLdTXbVekhmol6ysHQN4yzy2C1WsU880xQB/WXka27bXVYXiFCKvA6q3bBXtf/o3ZblJrwNYa6jcGcAhk5RuoMCJfmeH8qUAvEgsJlLjqiE8gZfN6GNA/uoHRe+9zjwGTQgPeryzOcUVG+Z1TOmdCW4yQSvuU8SQ3D+U8OfFHDv2Ba7ohw1JLNeANizYpOc2rPdr/y9fe5vLY++NfLnNUsxEvPGpVONNrlyW0dZiGRhrhs4uRdD3ZHcbbjECuSqqrP0APYO5iJeHweVqF0pyod9rO0BuM5Quz7k8Mz4JaBePYN00iyAM2pZ6BkGItsWHdrRtX6pEA45ELSM8RJIKV22/baiImRRdv2R2mAbQqxp//j3pov4gSI63I6tKoG86qu93mJK155r17ZelgXaIo80AKbR+0ToI8VWT8Wp91RqANKLYpA0VgEKelOVHkU1VxNndfONn0AsgCWgBA6onU5XqNkqzNfo8OCYmdIGloJTMAlSmWX4VXrdjQhkf2WfqHfE23DzomngASkTKtKAyrJ8tIUY075Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc8fc285-caa8-45e2-7a40-08d9d48c570e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 22:55:47.2912 (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: AM7PR03MB6181 Subject: [FFmpeg-devel] [PATCH 9/9] avcodec/mpegpicture: Decrease size of encoding_error array 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: ukoibaYd+Q2/ The current size is AV_NUM_DATA_POINTERS (i.e. eight). This number is chosen in order to minimize the amount of allocations for AVFrame.extended_(data|buf) for audio; it is meaningless for video for which four is sufficient. So decrease this array in order to minimize what is copied in ff_mpeg_ref_picture() and at the places that copy a whole MpegEncContext. Also do the same for snowenc. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.h | 3 ++- libavcodec/mpegvideo_enc.c | 2 +- libavcodec/snow.h | 4 +++- libavcodec/snowenc.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegpicture.h b/libavcodec/mpegpicture.h index 4bcd666797..a354c2a83c 100644 --- a/libavcodec/mpegpicture.h +++ b/libavcodec/mpegpicture.h @@ -29,6 +29,7 @@ #include "motion_est.h" #include "thread.h" +#define MPEGVIDEO_MAX_PLANES 4 #define MAX_PICTURE_COUNT 36 #define EDGE_WIDTH 16 @@ -88,7 +89,7 @@ typedef struct Picture { int reference; int shared; - uint64_t encoding_error[AV_NUM_DATA_POINTERS]; + uint64_t encoding_error[MPEGVIDEO_MAX_PLANES]; } Picture; /** diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index afad9c8be1..35f0f79d4e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1792,7 +1792,7 @@ vbv_retry: } ff_side_data_set_encoder_stats(pkt, s->current_picture.f->quality, s->current_picture_ptr->encoding_error, - (avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0, + (avctx->flags&AV_CODEC_FLAG_PSNR) ? MPEGVIDEO_MAX_PLANES : 0, s->pict_type); if (avctx->flags & AV_CODEC_FLAG_PASS1) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 8795491cf3..f5beca66e9 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -35,6 +35,8 @@ #include "mpegvideo.h" #include "h264qpel.h" +#define SNOW_MAX_PLANES 4 + #define FF_ME_ITER 3 #define MID_STATE 128 @@ -188,7 +190,7 @@ typedef struct SnowContext{ AVMotionVector *avmv; unsigned avmv_size; int avmv_index; - uint64_t encoding_error[AV_NUM_DATA_POINTERS]; + uint64_t encoding_error[SNOW_MAX_PLANES]; int pred; }SnowContext; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 96b0d320bc..df31eb8132 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1858,7 +1858,7 @@ redo_frame: ff_side_data_set_encoder_stats(pkt, s->current_picture->quality, s->encoding_error, - (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0, + (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? SNOW_MAX_PLANES : 0, s->current_picture->pict_type); pkt->size = ff_rac_terminate(c, 0);