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; }