From patchwork Tue Oct 3 16:04:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44128 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp2157910pzf; Tue, 3 Oct 2023 09:03:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEjuj18R2AoDpe+eTsySSg88GaV2HSXL00esvBJX4QPvC4B3/DOB5wfGM6k49VZONGe0OuT X-Received: by 2002:aa7:d911:0:b0:531:1f3b:cb36 with SMTP id a17-20020aa7d911000000b005311f3bcb36mr11540163edr.9.1696349030363; Tue, 03 Oct 2023 09:03:50 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y3-20020aa7ccc3000000b00534cf65cb64si698698edt.303.2023.10.03.09.03.34; Tue, 03 Oct 2023 09:03:50 -0700 (PDT) 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=rrZr7PGQ; 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 94B3468CD05; Tue, 3 Oct 2023 19:03:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2096.outbound.protection.outlook.com [40.92.75.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C144968CD09 for ; Tue, 3 Oct 2023 19:03:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ftCf+DybAeuhqc2RDkGzeg49bi4wcfO/v4/iZbMhfpfDjd4X4E5ETO5qmQh0azX2BotzO+YGaXSXOMgN4Rq36X1izpsC5fHBrh0YqEU8B3H6YEQzANnt6F++FhKt/ArJN8DF0zJJXdxWrh0AMsi2Vq41epDdAVhjrhatM7msOG4wCUX3wJDegkCEkBQPekN7L6sGnbhLqpiVy/PfZY2tGSX9ZZ0spY7wJ+W7aVuLoK72Q1SGJGjsreY9HZ/hUAccUGJKWyoW/KvMIvRPjMa02xZWDXKEPv6k59rlBHGmqIPhIB3yPTlCQo/LHtq6ncCh9W/j1koC6Bi/s1kskt5Log== 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=HgwYKzXoEx0lLJt0trQ1jz1+fXgGvqFZZIZzjV0J1j8=; b=NS6dDUxyudJR+o1EJwFN7FZIJPC63PpyJ8Da7Ly7G7vUDvawHN2vmkoUbu/Ht2VPztCuxjg9zys7R1E2t6FaBi30wuO+Thz8xYwn4EvJzCMY3+3/UuK0DysnSF7G/0MTv9paby3P5tPEKu+fpJDhY3E+Smfv7bnsJjJAfsZiF9jJVeGOGUnFfqFbGwaO47j+j1BdJs8UU43uBC/JQ0qnn7IJ1rheBnlHOjTzL8UCinLTomptL2hne/5MBWclxZp8kEHaYor4aTYH/vZPIErjg+d5cKaH6I/0lVGKYJ66HQ2dn/ZGJMGQoDzHt0AS9FutSDgLloUpUWtMAPsJo7qkbg== 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=HgwYKzXoEx0lLJt0trQ1jz1+fXgGvqFZZIZzjV0J1j8=; b=rrZr7PGQ71z/xMFQ7w4U5Oj5vH31Jki4g+g95jwnoI/ggsugcZ92fKpB/aZ0hSTANXyUqyRBdnwJFAjdZuNjmluu53itikWvq/kgV7q4MTMnamTk5/SHQ4QD70NjBAwn9rultl+ZEjs43cD6PFwAaC/681pRt+9ny1rCvg4olJEhabNGWGafx404bED2bXS9alYFl9J3C4d1jAD5qX2taOGBrEbLoe75n+iPMlhV9wF/OCFrqFJKvHHj3tCDyNorhsJml8vUGuKTyIBpWg786gtpN/tkCI8ioxeFOMeq0P9Kl1ObCaM9uFsb8gaQlWj0QLrRtitznqoV3bvXo+09qg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0010.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.33; Tue, 3 Oct 2023 16:03:01 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Tue, 3 Oct 2023 16:03:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Oct 2023 18:04:03 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [vtekGb/J/AbyIfSKMASbs5qtZHwWH7UX] X-ClientProxiedBy: ZR0P278CA0123.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231003160404.1982239-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0010:EE_ X-MS-Office365-Filtering-Correlation-Id: 1182cdfd-138f-45d1-b9bc-08dbc42a37f7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P6nKI9A+3N8/esQuVa4PHOddEh984lSYuXje4v4DsXK3cfdkJNg8IvK2GLHjjcPUii0NhA45xhw2ycIwrlCJP9h/ZmckLIpkb6tq8qhysmhC9g4kSvyNt/73lc7OJPHErTgc+6t+uzh5fp4K9hJ8BGROaW6K6QT3gK4ZoLrTWs6l+ijXUSfz2aBpvxIFpese1Rnm0LO6n73m+JgxFmpuN6QlQlVLw373ZTj9wDwrstlpz969CIKPZiSABNWdU+7Z5VH3HQnva6l3jGXKGSNo12ifyU1RnknHO/QQMMXm6C4ULBvO0ZxbgO3dl4c0XxRSNXxQyuv+pdpsxJcOYGWUdtyK9757/4uJpHBfnbEvhl2JXz9t0UZWda+TjLf8Jj+ji6g0/FcvSci0K5//jW28XRFD/CvYKJK/kkzlAz1tarULmAkb/P2mWhlPqCOkp8gMYnL1adL1A+2W5X9Yt+aLfHYwvKiFjGoNqmfvjYtvvNgJEFAY2RUFZYml1ilYtjwEtDM7MQ8noP5njRITQ4b8GOUE1LGogSNbMqxHwRlFHMfZBKGlN61EetO0iID0Ao6XkFqxZRq2PuKZBM7Ucjf9LHCPCiXDwUK0HP+KQFWlJt0= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hez088r/cFwJFvFkLpttHScF/SAEA5SaHC9XXQiI5PerkLZ8gB688xtI43emXKLs3E9ojLK9c0pL2qDqfy3VKwL9yao8vtReQhiArYIdLz4xsWR7TYEhfvGWwY6IlSCkCY9AfMq7N/tKtm6RyVFkCw738i4BWm+fqSOreub/VA2RRyFOtwWD1Kozp/+yYIxfsuccfH/zYSJyNgiR/I85e2+cIokXmJoIAllGHArOj6srxwJnrNgfOrZ+WJkO6MlBqq0by+ONAVq7I2Dl5leTl90gGZJuQ7O0G3f415c8c1ro2XtSyy56gSH9g+e9+rMBs436ZTIm2qoUHX8FIxUHWnYF5kR6LGftLzos87ibiVA6RvnPkcvEb7bYCdDc+M4HGegcG9kRjcGLtiLBEeGFYT2NfwmUM+fNX4lnw9KmpR8n/xVW+LKOrVEagxlL0BICLgcPg6+e2FEPps6JjedN7fwKGGB/0u+fIiK7XHnYw+txfwTBpMjLM3Oaxs5jyANEXtkFj1gdASvmYriKRAezOQ8Op13uNdmkcSEfLRNCcpKOAwHpeM3lMSruX13rmaXOjxIqzADDtvnvH9i3EQRe2HkTWmfZf3ylnlUgXYeU9wpq1lG4vcevW5HMK5r5QihzrPXMK3Ndbn0ZQ9l7DW0AY4SE8ZCs9keAt0iaN8avxggGbQ1GsGOGTZpqtPG3ovwECBGrZ/gOfKTi4JYXTgdpoZsCEZNBtGRANj4vKX5dU2Wb4VzTaFKQapcnYBBMIn0y6Sq0Wk0qw4eCdfbMVvx0lR4ivfWVuA80dxjnvf0co+PrMAA/Tm+9E5Bvv79rH5P54WMRrZa8tP2WgDCGfLN6RwomLrCyrBnkPy92R34qh7Rg6wbXnoEcqev3iUi1jASMNgCYLJn78V7Bv6TzOLnha05bP3k8LLr15JuoeXz/LrLyBP/d4YHjuvHIXpcXeadXMBUxyTHv2HTcL5MSQAwkWplueO/WG7/Mx0qNost++srNEHtXXI0wZYmrl/XOHYWNa7HNxxiyTWIePpVhOpee5/3Dj/xjTcBduMGqnLrH2UpuOhdDRnTYjSt4yDAtsAFLzOmNR3ToeLVyncNMwK9a/plRJtYjzztSdj6B33z91iHiCMP1dGHBrXo7DW+jRIlGJ4o9Q321aRQ5nrf8bRFbBTqS1/0iHrTvNhv/yWYBFIq6ljMPu2Nb7O9ky0D0+QNh4qTSAefMt5UEmxlcB9eUO5Gnt3Dn3Q3jWIM16y+xhRdt2UmhwQTpwTMamq4o11Nj X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1182cdfd-138f-45d1-b9bc-08dbc42a37f7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2023 16:03:01.2431 (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: AM8P250MB0010 Subject: [FFmpeg-devel] [PATCH 11/12] avcodec/h261dec, mpeg12dec, vc1dec: Remove setting write-only flags 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: W/5ZryeCjCBr These flags will be overwritten later in ff_mpv_frame_start(). Signed-off-by: Andreas Rheinhardt --- libavcodec/h261dec.c | 7 ------- libavcodec/mpeg12dec.c | 10 ---------- libavcodec/vc1dec.c | 7 ------- 3 files changed, 24 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 6cdf11f822..447e168c4f 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -640,13 +640,6 @@ retry: goto retry; } - // for skipping the frame - s->current_picture.f->pict_type = s->pict_type; - if (s->pict_type == AV_PICTURE_TYPE_I) - s->current_picture.f->flags |= AV_FRAME_FLAG_KEY; - else - s->current_picture.f->flags &= ~AV_FRAME_FLAG_KEY; - if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) || avctx->skip_frame >= AVDISCARD_ALL) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index c0f1e8763b..5dac83ebcd 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1326,11 +1326,6 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf, s->mpeg_f_code[1][0] = f_code; s->mpeg_f_code[1][1] = f_code; } - s->current_picture.f->pict_type = s->pict_type; - if (s->pict_type == AV_PICTURE_TYPE_I) - s->current_picture.f->flags |= AV_FRAME_FLAG_KEY; - else - s->current_picture.f->flags &= ~AV_FRAME_FLAG_KEY; if (avctx->debug & FF_DEBUG_PICT_INFO) av_log(avctx, AV_LOG_DEBUG, @@ -1504,11 +1499,6 @@ static int mpeg_decode_picture_coding_extension(Mpeg1Context *s1) s->pict_type = AV_PICTURE_TYPE_P; } else s->pict_type = AV_PICTURE_TYPE_B; - s->current_picture.f->pict_type = s->pict_type; - if (s->pict_type == AV_PICTURE_TYPE_I) - s->current_picture.f->flags |= AV_FRAME_FLAG_KEY; - else - s->current_picture.f->flags &= ~AV_FRAME_FLAG_KEY; } s->intra_dc_precision = get_bits(&s->gb, 2); diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index a4f2d30e22..534128d6ee 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1058,13 +1058,6 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, goto err; } - // for skipping the frame - s->current_picture.f->pict_type = s->pict_type; - if (s->pict_type == AV_PICTURE_TYPE_I) - s->current_picture.f->flags |= AV_FRAME_FLAG_KEY; - else - s->current_picture.f->flags &= ~AV_FRAME_FLAG_KEY; - /* skip B-frames if we don't have reference frames */ if (!s->last_picture_ptr && s->pict_type == AV_PICTURE_TYPE_B) { av_log(v->s.avctx, AV_LOG_DEBUG, "Skipping B frame without reference frames\n");