From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 31B2442BB1 for ; Wed, 12 Jan 2022 09:49:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29FA168AD5F; Wed, 12 Jan 2022 11:49:07 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075098.outbound.protection.outlook.com [40.92.75.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C09E068ABCA for ; Wed, 12 Jan 2022 11:49:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RnNiewMdQz4vFoZ4C7OvvR+y1H2XD9U8DVfX2UvUbQi4ZpfOgHmcbdP01hkme04ykTIsdM3SVBiKePB22JlDsMYbsN0y/6VTGk93BKmHVvfijAhyhQkkxeraoZoA1aXHZLC+JrztXaw0hBnR4MXBCI8ol3uaNCJ75TIETizWpMs8B3Ea6lNxy10gq0Cw6tiRpgMRrbn6uhQCjF5DeVYX10x+Or+r+z4vgzXfcXh+wFdt3PPUPJ+dqBdYPns4EcXmuAjuAV3EgVPLXtFe1kfxkHNgwKQP8GFWE5pgVBdKEnWcil9T7ur7rTJHpVY3zlZVV8gvnO0L3s4uXDZYMI+KOg== 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=QsBoHCkVw865W7VKQA7RmLIcBqpD4zv+UPvwDzBvIao=; b=aym85Kc1+WXRA/aEGo0kxHrLRBm//4g/7INb44hLHH43Ar4P6W0WkKH7K1O4kQS8wFEY+jsjZzP+Sco6O9+zOWh7acK39JSxSs8DKKVCNn6RQKc+02l0sqaZKS0niVaZ+P3FyTS+gERlOCfCmjC0BddKCxv3nNuQoYoTG190wgtwvaWjD5nvrrPsXmEPw5zpZLtDHgUZJ+HF9fDaBC1EGS3Xe/y/7JhiLiOR9kzYhLYpFt8U5cam3gVUcnxerybtA8r+hlq8NEw8kxkLyoHjYo4Xpp295ZBN3xIS67OkK7zL2/7QMamUYz/gk4YRxK1aJFH0IGeZsauMIZ+9H/QiNg== 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=QsBoHCkVw865W7VKQA7RmLIcBqpD4zv+UPvwDzBvIao=; b=o5/O5plDsjjAL5qJbIjvHA3uGKQyiveFnQN3r8legxnkaDb2gimb61lvTqYGTIGR+/KLKMQI2kuHJ6WzldXNHZW9f3D+jVACwk29hnpzGs2e0hX9nMmqUl1hIzcr+Ro7Bgu8H5VaqkfB23DdM9YW8qV9zWZAByPuwMLwkJr99i2EgNAmHCz2Ndq8SsZ+UzF7wIioJshZFUznhPy/r8vLCRf0RVotINX+80HjYZDktZh3PL5RcEvlAGsgsquLNKISACaY6o/cogG81XcDVVdF3DEdJd09hkm8cIPayvUFCYZh1HmSHE9C2t2Z7HqgOSvBg28kc9pTYb136MTQ24qYbA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by PR3PR03MB6602.eurprd03.prod.outlook.com (2603:10a6:102:5e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.10; Wed, 12 Jan 2022 09:48:59 +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.4888.010; Wed, 12 Jan 2022 09:48:59 +0000 Message-ID: Date: Wed, 12 Jan 2022 10:48:56 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [7Zf0s1GGwOarMwHjMhm8oWQlj8BLuQCA] X-ClientProxiedBy: AM6PR10CA0041.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <603aa7c3-5895-3a9f-6c68-9ba528a3a35e@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f4894436-d6bd-4aa8-c99e-08d9d5b0c1bf X-MS-TrafficTypeDiagnostic: PR3PR03MB6602:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m+I8epc+wJ8EY/8YsQAwkynmNE5ibZGceZS65ZhBzKK8oqABJ9KslVAeyiwFl5kK5+fkxoJivXcqH61bh0Z5vAsxMl2t+TDJH02JnNdzjiQ1k2v3XsyqFyllxuj6EepV8rkVvDGAnIouuYFsGJWnVgRI7/2sP3qIArD1+uuqs0cFdSfH2VP5EfycqUy+HHtrOl5/YVIdvAqbUN980ZBaaCGb5DgUmfc0kOzE6REmWnfSJnfsE8YjdO8Ph1bw5gmS0ui7pXzEPLkXCFlJ8Ab+SshSDK59zo9TX65fzkBomvANsDmUsqam+z6ZISZ8fLN+seNThFteneeAt9f8+0u7XfeLu/ajndKDAttkKM4BOFtTyHdNDWhMMdcn8Gt98GNhTai1qoJSF8tgurmr+XfMm8qiBZORZv6rTxNiZHaqkbYOuo7YwwEQ/zPgOh5Y62u1EZ1STcoW5U0TWDMWrAFdvI/iLZ6WZ12qdvFg9LXsNTm1pB/ZRjn7TsolQfGvgpQf0521uA2Izu9X/asQbOYn5CeOx3G5A37crb8kiSiWcni+3L90Cr3RTQ4m2rZMEpye9EN/Tmzpry+brxedf1CDFw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YUk1Vm9iY1BleWN6OWhudGFuY1oxMC9SUFRjdVRUSEExaVlkbTNmaWVYaXND?= =?utf-8?B?bHBxelJrNzBwc1FTaHhOOGxvamthV252KzZySHFDNVFoOHR6N210U0NFWEVL?= =?utf-8?B?dFNOeVowMzJqZG1WT1hQODY2WmYzRHdNNi81RFlJUzR5d3NsbmtCQzdCaFVM?= =?utf-8?B?b0xhQ2t1MGxXbmRxTUR6RURNcG9RdW1Qdm9HejlWTVY5bklSS054UFJVMFJM?= =?utf-8?B?SGpUMG93M3VxN2hoQVBmR0RBbC91YzYwYkJTbWpSL2t3a1lkTUZoQk1TaTZY?= =?utf-8?B?Ykpsc1NBWFU5ZDlwaFBMWXgvRGJIY2JiVlhGeEw1b25PMlVmOEFyQU4wckxQ?= =?utf-8?B?a2VuOGpRUUd4aHBYam9yWTJ4Z3Ryakg2RXZDUW5pRDluOFhGSkRQc295ekpE?= =?utf-8?B?a2Vici9UTzNHVnUzWExkY1orZzE2RTVRVUhWY1ZVZ3NYMmQyWDhjTzNWUjdl?= =?utf-8?B?Sk9VK1VvUHRmVEJoL3Q3ZVpxQ0pVc1ZueEE3dnQ2cTR2cGR4Y3RaREE2TzlD?= =?utf-8?B?bndNOHdnME04LzBPZmQxUnpvQ2tEVTQ0S0p5R0duc0FZNTErNWJ2V0c5MWlB?= =?utf-8?B?QWVMNDh2d1o2WHFCdThpWEVPeHRHM3R3ZHYxRUp2Wm5LeTFKL0JZSmsyU2g1?= =?utf-8?B?OW53cmZHQlBIdUVZOHpGdm9UdzB2YThyYWVhY0l1SElkZXIvbkc0VFRsK1My?= =?utf-8?B?MHpoVE0rS1Z1NGE3NWVROHIzdSt2RXprRWd5QUYrU282SnhMWjNEN2lNRXd6?= =?utf-8?B?WE9LMG1WakRmRkJaT0FxSy9uMHl1TjZNN0Juc2F1ZFlnc0VrZm9mdzEwUkxj?= =?utf-8?B?ZGxKU3BreG5NSWhBdjhTZU9CeXZ0S252T3NmRmNiTkhJZU5OZ0R0VjFoZHA3?= =?utf-8?B?U1hFR21aQzZEeVpGc1dRTXV0QlZrZk85Tk83dnJjWGkrRk1sNW50UUt6dU9k?= =?utf-8?B?UStjclVPSVlkYkVKV1R4WDBkZThqRUplZnc3cUlTaWRHd3JrTkVHOVBCZlJX?= =?utf-8?B?SEIyamZ0L1RYYUhyUUFub1FKd0RDbEhjNUZ5U1o5aUhYa2UzUWp3bWNVSkFv?= =?utf-8?B?cmFoenBCdnNvNGlIU2JzQ2ZvbkJhajFFVHAwdm1GUVhBSzBsMDZ6MER2UGkv?= =?utf-8?B?UUc1TG0vR3JpdnMxbVZoNW1rL2FYTUt3d3Q2QnluNDFjc0ZPUGx5eVVMZ0lB?= =?utf-8?B?SW1iblBLT3BzTWJtSW1OS1RKWXVPZ2szekJ4bnF6ajdiZldVd1B2VFEzVlRu?= =?utf-8?B?YVlLNHJLZEQ3TzJILzU5RE1LUnRBcGtUSkd2bmkreXJzeFZFZz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4894436-d6bd-4aa8-c99e-08d9d5b0c1bf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 09:48:59.4136 (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: PR3PR03MB6602 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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; > } > Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".