From patchwork Fri Apr 5 12:33:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47811 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp931666pzd; Fri, 5 Apr 2024 05:34:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUY1ILsHW1IU5N1D2lIUNSi86VU1AUuFDSP041Qp+7rxFhgzNxh55qw3fvdUjQCcOGX6EAKOC0aZSWdyM8oJFdN5hVjrcIzejYr6g== X-Google-Smtp-Source: AGHT+IEQf62G5v0Xh36J6TYqkFpmBtkjbDifDDJAq5OfbjaODroG7DqGR2JnANze7O+xyhWb3S8D X-Received: by 2002:a17:906:4e93:b0:a51:9d6e:a77b with SMTP id v19-20020a1709064e9300b00a519d6ea77bmr830229eju.0.1712320473054; Fri, 05 Apr 2024 05:34:33 -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 q17-20020a1709060e5100b00a4e0c7da71csi678419eji.225.2024.04.05.05.34.32; Fri, 05 Apr 2024 05:34:33 -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=CzJcHvsT; 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 A1C5E68D128; Fri, 5 Apr 2024 15:34:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2098.outbound.protection.outlook.com [40.92.91.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AABB268CEE9 for ; Fri, 5 Apr 2024 15:34:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f1EoOumFTiU6A0nztzzf3HuieNvNHYJoMJrLayHwZnTAmfUevVMZZysb/ITxwlEloTswu7rFPlFqiw/jIRFU45UKBsHOEoYJZrOBcyVOtgdHeYPXIm+wkyw+XBxh/RftmJVXUTA6ny655EN6bvY3TWACu/Svz7EB39X+wAkvU1+seHbYJN9WCxNgkOGA/gU1+NDc3Hj8ASQ/cVfrNS1rP3l2MPi2fWNN+afIuKHFLCr892kf/8AeQrBymwgrrFf4GK6yar5in0SDhAWf7eHwGHiuQS2IzOEIEIFEMEJXpz6s7nuQ2JY4rE+zwZ4kQCxtBrOb0O52ZmTy93cXJ6QbWQ== 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=lpDaBjsbB/U7MIj5854WhhxVzR3A0WHfsBnr/At90Ys=; b=QmAD+uYSlowdY2bEXeJkPxmzE10oODKFnTwE9tmntRNAYx9KQ3F1JH70McKjKqvjGj/DqTtbTGnxoUkMTbJk3gxkWEctNWRAWv6PG30djvpxpMKaThPcacHtnsJkFH5FwbcpXl08tBZ/k2lT2wtGcU9InE8wWAZuJJ6HyswXH8DBCJVxzNOlaYOc1nOT2dxL53jCj02ThZAqz7d9LqEnYDeljydVqHQQ4Wg6FS9EQHnUKU5Nxgbs3aW2/5xMUmjmxbhDR5yPS90kfwg57XQp1mmBv20DH9j2CQ5WG3aoNs251hx66QzK/gK71eoiVZzKWyio8UDTzC6nNQOVMPzS8g== 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=lpDaBjsbB/U7MIj5854WhhxVzR3A0WHfsBnr/At90Ys=; b=CzJcHvsT79iNrm6M+xdx5pAruhxCZaXuLMh5x5W+6sxsNNSgtlaTNpZrU/4aTJqWVP66TQiDWg/V0VejyniBmGgT45q74G2xKjqLc2zD8nvbuYCCgm40MJVjrtKpDQWOzbmsfkUXVT5iIpQTRTdI8+hj2IPkvW4kjIPAVqG+ZB89uvaIcM9IPIG9vv7lE89jaKm7ySNE2u6E1YVMfEVRPeQKL6jbImdiGa+RiIBR/DShuab2/75JPclQKAKk2mVPMmDa5TW2CmV0GCYRvuex2PWZz3yo/hrPLUFAXg6DX7bB+Z4m78Au4bnPsRblLgwzGin/zZgT17bp5W1hXjZKuw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0122.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 12:34:13 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:34:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:33:52 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [JMObb4E0BJ/qMR+hoRo4z3Sh8FetJxWEBdFkwAvf8Uw=] X-ClientProxiedBy: FR5P281CA0027.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f1::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405123406.2343671-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0122:EE_ X-MS-Office365-Filtering-Correlation-Id: b07fad89-aaf5-4338-677c-08dc556cb367 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n5mzRQeiNavCOy4PltkBCODonXwnVwS7mwITRukCbCdg2mpPJjwA/OQxilXqH3HBa+EOtXoGLkJybqt16nqj4ppL2OSKXDNQDQML/7/NLlxMKkYQoE17Rd+tYp1DF4v+fJvuzUrvshfN0xMLcL9asFVlMcGd9pEIQ/vjWDb9yb1+goEBjX5aJH5soTDkTtyHJuhaO+/Ln1TjP7I7zAAoN8sag3CoxsUvEMJtRb4US/69oq4uNwa0OLxJG/2e4Y1tlTT5rDcyH4SoPx7gAFcnQtqcIpJPhxSzkT2W3SMlfrElxmvUVf0yHfj/ZzynCmxROnegLMsXOktr6xshP6VdPzj80h+cjmrIGNQoZQeo5TtifAI1YnVCc6P9Wh2OHxeHHPPaf3RK7yuIYxMTueCX+fQUHWVJMWqVDL0p+m72YJYiO0SpvBBUO8Vs2Jl2UBmbO1T8OaY9cCAgWz6rE2RV3K6hXjSQN+cNLp5fDQahO5rjlNeue+Behc8YfuId1LhLUloC9PFvVy3cF9zeXdpxTw4QZCsp+hiVxJ/k7VaIvhdxyzmlLbOTSTd55nZtL+D9Ky8+5Gntc3LOgrJSf8V2k3bBgUkYchyDcq1wSstyv5vvCz7BgsvPrb3hTPz6s0OH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +XgdaHJnsx255NqXQI5MCkxY7Xsk4HRqeMNCDGvpPGhi5kDSxhqWAdrzyuaUle4sm618/1iBMS62NHehfGoEV1W9tG5/7uiATuM322yTZcnZKL6uDlxwA+0qiI+vRPW05Y59UDiUS229cHWeORuqWX4K5HPg4Uli0pUqklTbbA0dVKFALjmN6No4TkwZQIZMzwYs6nzU69RfaN9COnJeIfgT4CjYOlwRJPQRtkyFBS6CLk+DXYL3CrAEnKpo+VsxlGMYxtIA6fv//7wveW8wnTM+xxdDPaKZlbRbSC6oQM3WbR6upphkoqr7z16+/Zzy5AqGjBTJkK/ochMnSxnw9p4Y6IB4YzqQFeJx51E2+Cbr58TCKhhalsCfXYf4J00lr8EQ/zV4PrOuDOiih7ndeBG4jaCrs9iRmGu8POjgg5OztQKm0AxAhwzfKKoK8DHhIg61/NipKzQzQ7lo53bzIBdYW5j6MfU32fxjV7MnNCFw2RmrwXA5gmQLiTKotqcSUzG1nrz2xK2RfHa9vwRdKh6RpY+Z8gRZPbXiaf/yV74WCOnID6uMcldIEiJQMKXclOJ8vVNTV5bgAX2rZ5ElfoxraG8FF1Jt7T1w8F9r5SnbMGZVqAWTExq3LwGVSoXqCbuibrumKmLWOSUAx16latn7zjxVu7h8gKZXaJP3Skr/NVlAQ7KQsfq9FPY+iHIijeO6r0tcFGBHSCPUioXOdLj4i1pvfWB4k0yCMXBgnfEurSqN7/uR0QUVgxAWm91Zt3Dmy2UiRcbW3vQ+L8Mr+wOWqkbN1uyCmDlrqu7ai3FsOJYZRo/RlwSsI269dQ+UNkOCpc+7xfJtL0CVTUnBDkb5SqXyzDbq4szLvOTpflt9ClLVplR6+9MxHVtcRI6YPr0E28hoVgGWGLo1SR32XL2rshEJNcG5e/tL7Vf+Z2e7cBzgUP7I4Je9NbvsOmYr9W+dnr3qSqiQk0v7dZTGNXKWe055JvUlYpSnakhZHf5vadaCv6Ts3kfUHJoCNUnedS3ZK9HmPJ9JvyL1iqVKZAsVsz7q+e1nYthxv5AHjWvCD6TzsCn4LbDL4jtZfnNylrygR1J5E6N//gM+eYVsi4x/29j1IsN477BLepSDzSwmmgo/Ns1gNgvdrBouLKSRZnfn9FUqJ6Qa+lzuN4yAPJ6wCMs6WStspdgiNoH12Q1kwtF+s5AeGtOwrVomV1xg7ON545Uuldz2tLKdTkahdAOC+xDXMe4D3gklwEEskQvjnDjJ/SY5MKHbxtSpcTlo533TTY/qllJlA1z4AkAOQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b07fad89-aaf5-4338-677c-08dc556cb367 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:34:13.7628 (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: AM8P250MB0122 Subject: [FFmpeg-devel] [PATCH 01/15] avcodec/mpegvideo_enc: Don't update current_picture unnecessarily 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: UvjR2Ooughdb current_picture is not changed after frame_start() at all and it therefore does not need to be updated (i.e. copied to the slice thread contexts) a second time. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d1b1917824..0e3255c0fb 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -251,7 +251,6 @@ static void update_duplicate_context_after_me(MpegEncContext *dst, { #define COPY(a) dst->a= src->a COPY(pict_type); - COPY(current_picture); COPY(f_code); COPY(b_code); COPY(qscale); From patchwork Fri Apr 5 12:41:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp935734pzd; Fri, 5 Apr 2024 05:41:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbRUYNGqvNZXtplAbvJX4+kCA9KzSyLzxBRDGDstBNC8gSaqqR1WKiaVPHDip3SJqwI08gZQ96oJdcUBoDIs9QlLuKmza+MASs4g== X-Google-Smtp-Source: AGHT+IEd+SBr1Laz7rAV1RDiNkmepcPOveyCGCz/l4yJJ5kGLdJOQXEpynj258wmTMTlc+23Wj6S X-Received: by 2002:a17:906:f847:b0:a51:9651:8c3d with SMTP id ks7-20020a170906f84700b00a5196518c3dmr871684ejb.4.1712320919325; Fri, 05 Apr 2024 05:41:59 -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 qk20-20020a1709077f9400b00a47c9505307si672132ejc.702.2024.04.05.05.41.58; Fri, 05 Apr 2024 05:41:59 -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=BWN1xK4d; 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 DAD3968D14C; Fri, 5 Apr 2024 15:41:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2084.outbound.protection.outlook.com [40.92.91.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B6E368CEE9 for ; Fri, 5 Apr 2024 15:41:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KzC2zp7c1XNNPNbeYbefCoIx6zeNYXB6tfMhqch1CjcIzyBA6R4WS9mOzq2QCmSnRMI79ZmDR26N0Yrdc6rq9eZjRzB9DEIABavlXpfJaaLNmKiwY6Bjsze8gKQ9RDD8ustPaDTA369F2atZx8hQ9ewGh49E6tMt65Yp0TLUq7MyjuRjUdcfoBBWDbKjCH7BtuuabzTW5iMIz+FBjJWL02fQCxjaGkP0b2qBQfsLC62GzPEkb09MxxckakVpYLQOoHXfeR47LZ+MoGZCEKlF6MSQ/gJOahtKZ1FoFwXd+LJgl41WTVIFTaZ1/os4XMlM8CVwQ446+wWMtodm+NCuDw== 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=/56Z0R8lAqF1h/UdzDrL9qlbMXQyMBdFDwYiuzp+oDM=; b=gyPvqxHQvu7g87hucN19E4FaUycAfa7DoFrE/JCMqH5/NpxW4iIvvrbv8nE+NDRZrcx41i2etvlCFCSjmqIkTuL5AeDcMV6tQD4uW+KeRZd2tw3RbVb+IRrCvjQl/TUVCAn4QlX1hMjKxAA18GSRMBTNlhVB3OffMVXyLutKIBQCTPY4xa8g7Sd5pJ1YkE3XEkBNOzvG9UJmjCDpks04+BtFeuaIRDiyopzaN+AFN9sRwN/DLfjd1WdLNfsagalpb5c9pry21s7SYSVN3jh7/lga7CGz1VOaKuY8qpjRmLMe/0kSyiV54qBtXn54EV14TruTM7X6qjkne5c5x2tAew== 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=/56Z0R8lAqF1h/UdzDrL9qlbMXQyMBdFDwYiuzp+oDM=; b=BWN1xK4dSZHgs9fpJnPrEdRzRG4o9u8v0kHAqeSoslhY71NkKBAyQWwD6Y6wTpap/RnQKUgfmAMP1oiR6pAQ6KwS4P8uepvOisPxlSr9BnPk8mda+JFBktwFUTJr1K5siFBHiq/QuZ5S9+pKcmQMoOxq5IEGmMPVGa2Rte7s9yvWI8I3LmafifBE9Xt2jsUzPqxtN8Cd/O05ZFs6lLKn0ZevWtCnDejKyC2BnyodTQ8fv+N+qUMaCQvBwwGJ4wcOgVAbjO2W7L/dl0TsO817x1gl1Twu9QTQH4kEFsoLXMK3LRpiIGembjfmSbiht1ugx0QUpbIgZHaQAEZzIcZ+Rg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0278.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 12:41:46 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:41:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:25 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [NZUhVyShH8trGzwrB1b76NBjqG8Yof2wFzsw9u4pGv4=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0278:EE_ X-MS-Office365-Filtering-Correlation-Id: d14127aa-e821-47cf-80c7-08dc556dc176 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cSJlO7scltuWcs4HJ8WQxwktMxi9pgxMbztl/G7aC6PYqoJs7EZJ4wufQB5d/J26E0JDqILjPqiNU0h7asEi+B/mCYXO0f9KQxm4wz0Mag1+zDZabF4EVGomlaRv5Wg0CytmDfOPR/+9HY5bWuN0J1uc5foIqdSBdmsiVbdZ1FC28Xu+2gIKGrmdfo9io4I07jtig/xhbOPEskioeXcfGlnHYE7/ggS32KM7guLsiL9Sldm/obtLybpYuVXG+21GBQMAb5P32gmMaaTJRX09ggbHNMy7pwRppH2M7QQX/jxTqnylLnoCC/EBFwYp0YyhqK1Il6xJ2QHE6vcrRgmIFQWm8qNE98GuEvMn1InlmksL68edIYM6mMaNQo0jDyDkcnmoxApDdfwhCnraB0LIpvO1vc9xKj5p1mXHqo+3SFt/VYBYF1w1WBvuYzeymicftgC11144s+p1Icq35vcxAKf/mOFatLq2TUYD322WVMk2FDuTa335HMMscaDaudlw0JQ/B2XENJevhHR0H7wAxLaOIVfONh4ufZ1mf1JLN0DKz511CEGzOgCdjmOqVI4TGuljK6KnVvhqumlMdrAu4z0OIKEhKYAm+KiMRGiChaeSoC5CZ4nazMCZSJYd7F4A X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: R6aV6dgRfWW4JZoZ2uN+njEDrEbjW8tU1WYnZbe6fPKShVTpq1zjXe1o8uNhBTOaqzAwNNau5t4Ea6/jq0ls1qcd8JAJCAg4SIbr9U/e0kcqDykryl98RsACah6MePbUCvGiomL7wvsSjJObIw3N14b8OSc6G5cNHrKWUtEvWjqfXZifKYbdrMwlGN8DaWFZSX0NByLeDaKNN81txu/iLSpEQzu5w2BWgf0gsVsns+wwW8iZWAladjzvcQbAecwO0jKpuGQ75WUACoaayUrpael+m5FplddnLi7n8sHa6Y7E4b5NrQWnLeDpr+EmlnATaKUc/cdOTknxIFumJxBWSkd3syAvd/8rxXu4BPhrqWLwaMuIO9oYZWOIPrEsOeseByJy2miWGHl3sF4cJAVkC8LdbI28hdaOqN1DBrVXimcoOD4tzbneRu68pHblCXpVbHhiw1b022rowaspCV1tkT5s0E6lB7SGu2BVntvsmRpIUgr2ti3+n+yaC+8QUb+Kf0lsRjMz7pLk+1q+J6u7DNYSMTpCIUEBuMlraOcyKN3HlXYKRvZqp12bJ4U7x1TeOvVadkKAiSBZrn5S3/N2Nkdw0B+oPOIlGuzrXNNcMPAilJhop8DF4+e19bOTteLUCOty9VODuSfmSn2FC6eJwPJA3jJKqjO+0LqtyUBNQbK9Rfn2863Jf0pH2quVYG+gzjzSTPImFppF/iImqGj4LTV/AxlOJj4wuaCD1uTaN8DTaShiUYAjxkEUz27wxFco9fzCr2j+dRSQ87THM+AF9FzHCDW6XOLIsNQBFytEj/e7uGjbm02Anwxz2ghlAPUCm/YQ76cIO4UxAi6o6MCOBRcm11zPoMB4+G27VRcvemhe19oLr9ZQag2oRAqINFTvy0k35IsoWMf2Vnw8tR0fDuYmnXWjYSGNnSqTkQYOo9EihSMmh2aIzwoXbf6+tkjLTemlHO4Anwgmx7Ucw60Eex36oWRZbQXJdHW7PLjpGyOxXTnM4DiDHXsRkFDAYQ/mu8GMVTHhno3HNWBiLF/OpVruu0GMBx6iMt4sdQdJgNmplb2+v6TY35PQ9CTYaYJG0jyS1GLpUFOR6MIIPYCAQiISdx7djrkasFEt1TZ8l6Auu/M/xZmRqlXCmkqkOjjQ9j92bEyclCB8Fh6aPK/zejVld6DJ2Qe5c6wtqWbx5vu1DtrRBdiA8zvzGLsSUw15Z5QKswz0iZfFePdNxRDrxruWB5x6Tmnf6XniB7g27qnNkOO/Dil+EWmm5XzJQqlGmwGcxJisEgEvG+F8BU6x9A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d14127aa-e821-47cf-80c7-08dc556dc176 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:41:46.8005 (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: AM8P250MB0278 Subject: [FFmpeg-devel] [PATCH 02/15] avcodec/mpegutils: Move definitions to better places 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: VteIWzesI1yL FRAME_SKIPPED -> h263dec.h CANDIDATE_MB_TYPE_* -> mpegvideoenc.h INPLACE_OFFSET -> mpegvideoenc.h enum OutputFormat -> mpegvideo.h Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.c | 1 - libavcodec/h263dec.h | 5 +++++ libavcodec/intelh263dec.c | 2 -- libavcodec/mpeg4videoenc.c | 1 - libavcodec/mpegpicture.c | 2 +- libavcodec/mpegutils.h | 34 ---------------------------------- libavcodec/mpegvideo.h | 12 +++++++++--- libavcodec/mpegvideoenc.h | 19 +++++++++++++++++++ libavcodec/nvdec_mpeg12.c | 1 + libavcodec/ratecontrol.c | 1 - libavcodec/rv10.c | 1 - libavcodec/vc1dec.c | 1 + 12 files changed, 36 insertions(+), 44 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 910df7585f..48bd467f30 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -42,7 +42,6 @@ #include "mpeg4video.h" #include "mpeg4videodec.h" #include "mpeg4videodefs.h" -#include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodec.h" #include "msmpeg4dec.h" diff --git a/libavcodec/h263dec.h b/libavcodec/h263dec.h index 89c5fcf58f..a01acc0834 100644 --- a/libavcodec/h263dec.h +++ b/libavcodec/h263dec.h @@ -23,6 +23,11 @@ #include "mpegvideo.h" #include "vlc.h" +/** + * Return value for header parsers if frame is not coded. + * */ +#define FRAME_SKIPPED 100 + // The defines below define the number of bits that are read at once for // reading vlc values. Changing these may improve speed and data cache needs // be aware though that decreasing them may need the number of stages that is diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index f8eeb6b44e..5d34892ef7 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -19,12 +19,10 @@ */ #include "codec_internal.h" -#include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodec.h" #include "h263data.h" #include "h263dec.h" -#include "mpegvideodata.h" /* don't understand why they choose a different header ! */ int ff_intel_h263_decode_picture_header(MpegEncContext *s) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index f806ad8a74..71dda802e2 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -26,7 +26,6 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "codec_internal.h" -#include "mpegutils.h" #include "mpegvideo.h" #include "h263.h" #include "h263enc.h" diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 5bf85bb7fe..06b6daa01a 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -29,7 +29,7 @@ #include "avcodec.h" #include "motion_est.h" #include "mpegpicture.h" -#include "mpegutils.h" +#include "mpegvideo.h" #include "refstruct.h" #include "threadframe.h" diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 386110bb8c..3da1e7ed38 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -27,11 +27,6 @@ #include "avcodec.h" -/** - * Return value for header parsers if frame is not coded. - * */ -#define FRAME_SKIPPED 100 - /* picture type */ #define PICT_TOP_FIELD 1 #define PICT_BOTTOM_FIELD 2 @@ -93,35 +88,6 @@ #define HAS_CBP(a) ((a) & MB_TYPE_CBP) -/* MB types for encoding */ -#define CANDIDATE_MB_TYPE_INTRA (1 << 0) -#define CANDIDATE_MB_TYPE_INTER (1 << 1) -#define CANDIDATE_MB_TYPE_INTER4V (1 << 2) -#define CANDIDATE_MB_TYPE_SKIPPED (1 << 3) - -#define CANDIDATE_MB_TYPE_DIRECT (1 << 4) -#define CANDIDATE_MB_TYPE_FORWARD (1 << 5) -#define CANDIDATE_MB_TYPE_BACKWARD (1 << 6) -#define CANDIDATE_MB_TYPE_BIDIR (1 << 7) - -#define CANDIDATE_MB_TYPE_INTER_I (1 << 8) -#define CANDIDATE_MB_TYPE_FORWARD_I (1 << 9) -#define CANDIDATE_MB_TYPE_BACKWARD_I (1 << 10) -#define CANDIDATE_MB_TYPE_BIDIR_I (1 << 11) - -#define CANDIDATE_MB_TYPE_DIRECT0 (1 << 12) - -#define INPLACE_OFFSET 16 - -enum OutputFormat { - FMT_MPEG1, - FMT_H261, - FMT_H263, - FMT_MJPEG, - FMT_SPEEDHQ, -}; - - /** * Draw a horizontal band if supported. * diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index d7c2f57682..215df0fd5b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -28,7 +28,6 @@ #ifndef AVCODEC_MPEGVIDEO_H #define AVCODEC_MPEGVIDEO_H -#include "avcodec.h" #include "blockdsp.h" #include "error_resilience.h" #include "fdctdsp.h" @@ -44,7 +43,6 @@ #include "pixblockdsp.h" #include "put_bits.h" #include "ratecontrol.h" -#include "mpegutils.h" #include "qpeldsp.h" #include "videodsp.h" @@ -61,6 +59,14 @@ typedef struct ScanTable { uint8_t raster_end[64]; } ScanTable; +enum OutputFormat { + FMT_MPEG1, + FMT_H261, + FMT_H263, + FMT_MJPEG, + FMT_SPEEDHQ, +}; + /** * MpegEncContext. */ @@ -283,7 +289,7 @@ typedef struct MpegEncContext { int mb_x, mb_y; int mb_skip_run; int mb_intra; - uint16_t *mb_type; ///< Table for candidate MB types for encoding (defines in mpegutils.h) + uint16_t *mb_type; ///< Table for candidate MB types for encoding (defines in mpegvideoenc.h) int block_index[6]; ///< index to current MB in block based arrays with edges int block_wrap[6]; diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index 1e29782660..c20ea500eb 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -34,6 +34,25 @@ #include "mpegvideo.h" #define UNI_AC_ENC_INDEX(run,level) ((run)*128 + (level)) +#define INPLACE_OFFSET 16 + +/* MB types for encoding */ +#define CANDIDATE_MB_TYPE_INTRA (1 << 0) +#define CANDIDATE_MB_TYPE_INTER (1 << 1) +#define CANDIDATE_MB_TYPE_INTER4V (1 << 2) +#define CANDIDATE_MB_TYPE_SKIPPED (1 << 3) + +#define CANDIDATE_MB_TYPE_DIRECT (1 << 4) +#define CANDIDATE_MB_TYPE_FORWARD (1 << 5) +#define CANDIDATE_MB_TYPE_BACKWARD (1 << 6) +#define CANDIDATE_MB_TYPE_BIDIR (1 << 7) + +#define CANDIDATE_MB_TYPE_INTER_I (1 << 8) +#define CANDIDATE_MB_TYPE_FORWARD_I (1 << 9) +#define CANDIDATE_MB_TYPE_BACKWARD_I (1 << 10) +#define CANDIDATE_MB_TYPE_BIDIR_I (1 << 11) + +#define CANDIDATE_MB_TYPE_DIRECT0 (1 << 12) /* mpegvideo_enc common options */ #define FF_MPV_FLAG_SKIP_RD 0x0001 diff --git a/libavcodec/nvdec_mpeg12.c b/libavcodec/nvdec_mpeg12.c index a4603c7ea7..139f287617 100644 --- a/libavcodec/nvdec_mpeg12.c +++ b/libavcodec/nvdec_mpeg12.c @@ -25,6 +25,7 @@ #include "avcodec.h" #include "hwaccel_internal.h" #include "internal.h" +#include "mpegutils.h" #include "mpegvideo.h" #include "nvdec.h" #include "decode.h" diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 1ff209c00b..9ee08ecb88 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -32,7 +32,6 @@ #include "avcodec.h" #include "ratecontrol.h" -#include "mpegutils.h" #include "mpegvideoenc.h" #include "libavutil/eval.h" diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index d32faa628b..df487b24a9 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -38,7 +38,6 @@ #include "h263data.h" #include "h263dec.h" #include "mpeg_er.h" -#include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodec.h" #include "mpeg4video.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 2c413e0bf1..3b5b016cf9 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -36,6 +36,7 @@ #include "hwaccel_internal.h" #include "hwconfig.h" #include "mpeg_er.h" +#include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodec.h" #include "msmpeg4_vc1_data.h" From patchwork Fri Apr 5 12:41:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp935823pzd; Fri, 5 Apr 2024 05:42:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXiUouf8vavWL9hinYq2gtNyhCsuPTush8gY25QcPXcozS+MrvzistQL0d+q99Z9W9Hf4UATb1uEBmvS3Eq1XAAvjm851eLmwNxjg== X-Google-Smtp-Source: AGHT+IF+VY+ppHNFMzWYTuV4WdGt7mF8uMIpT3y5i3Sr2Ig3Ww0OF+cD9+MljGazO+qHqghVSOgo X-Received: by 2002:a17:906:b755:b0:a50:e067:e211 with SMTP id fx21-20020a170906b75500b00a50e067e211mr871362ejb.36.1712320929022; Fri, 05 Apr 2024 05:42:09 -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 a4-20020a17090680c400b00a51ace5f2afsi210020ejx.447.2024.04.05.05.42.08; Fri, 05 Apr 2024 05:42:09 -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=iQnLCiFU; 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 041F068D168; Fri, 5 Apr 2024 15:42:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2087.outbound.protection.outlook.com [40.92.91.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDFB068D15A for ; Fri, 5 Apr 2024 15:41:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q0/7qy5mYv5K9iaaJxpgcjrphmLcbs6zuQBayxto3IfR0pOUA73oFYgjCczKhzIS26kgfrAyr8ovBIlCWYFz/VyJuqFtCE6QQZs28fQp5+Lbq+/h0ejNmsc/nx+PMr+8SlVYMKPRFNASIwHiwOczdG5DVwkifWm5A7l7ZNmBbwcuLUVi/jz73Maz1xIiOY53Cb/NaoVm2q2UrfGMZcHLVxlVGZrss/DyhDtq9UsJZN8kt6UleA+wGRDJxqq3iFImlnfhBLVrLsniUr3FXieSvL1MesNMm5JZdt8z4DafK93rd9ZgOmzSE+QEAWZb9opIBv7tZ+ABwMTxcDhnHcpDPw== 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=R54px2GhnWCU3LEre6phJMNDHpXtTgJSApzYQJkj8nQ=; b=JpWOnck0UWsV9ER2rLsroAIysDm6wK9bOC7aYoaQgAQmIthCMGStRV/8RaGTlY30M6doMqzJwResb78F7tBi12KSnjO3WkUUrKIhl96TyPPWnehXqg6PJO0YP9qcMlYyN7rYMsrPGQMJIX175ZYRL6AvBQB8PA62ckBDZce7v61dYswUQU3l5AUJrWdaPwjVOCVVzWZpIEwef4Yit1/jzxk0FfJbRMEDSRK9aH3KmcfQuk+iPKUyRLdQBPHqFNliC4/FeKuA1shuSLl5vdvVcN//eD/iORmIYbSYNzdYroWzj4QzO//9IjmOsAmeNr8zfdV8Z4sClNuos/3u1wsqGQ== 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=R54px2GhnWCU3LEre6phJMNDHpXtTgJSApzYQJkj8nQ=; b=iQnLCiFUdVppABGiTEgpjx9WGhPX/ciJDGmx9ZhoVrylqzoZdLg+rdNbUjO3zxjBektSuuWGx/KvU/dEWNyvbDE96GNn/+uQJQGkVs1Dq2u/zIvdQd2TTOjK3QfviQWcjVXOVXdg2ivLODl5umuusQr7fYQxgE0OfGQ3vSS1s2RkQH/cwcyKPldUrSFCFAeVs9NBcp+h3oyj0hvyWUHi8jROz/8OYOOozC2P8ZkGTk3+99ssFhC6EMLx/pg8GIPXlPcEAFmzRvCvJVnhGFW4OySN69iz0bVe8RAoEXkhGZQqJBbAnLeCzAaz0aL5+1M3wY2MnTfbVXVu2tpA2OJnBQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0278.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 12:41:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:41:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:26 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [jM2kvhzwtvUjKGYG+VOs74TetT5iSS1RKSiaVlpun74=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0278:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bcb51c6-befa-4d01-74f5-08dc556dc750 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dj016ygait+KnOBFpjrzj8AuX0gVxDf4nFitY5nnDJaVo+V3e7nOsoDoo6LtD1+JVrVsW4L8M6wslh14QI5cMzWJG/nYPV2pHwg9wXzKrh2HaYItI7JsvFs4Vv2nulPxoCajU9N7Ble/LnudDbkvtmdrj+xLY4DhsZVpgsY7A+scIU2MT/A3P1glbqDbSG+TsjhU4IWAWBH6sPzjCbzcr2hFNWPnms7hG28tPEQQBwaunaUrALP3B/XexELn/OMgKwR34ffXrKS7yWYV0Y+t7s/t7980jyULUN7kHbGbKddQ+3saV2jZNhEMUGAN2NRquC10/ji3Luz12wnYceuAvvCtQ1uTETn4/BJRg9H3vv70QOzt+TKvBrT/yRb9b780nTJs+65iFwdAb5yyIPiJyjiawfbg9LA3TDNNhx4gMw0mVadLgCgrIbkOlElXxrwzMQ4XSJuWuHPFGEkb6my9Do6XNbrG4PWNdMNfn80ZtmGWKBe4zadnzlr+2dKJIxXJjS9D8pdQo2qPlGHnRsZ1OT2Rf6pY74jsSorhN1zShWegmqhR6jTtNnS9gEUXdkUB/1NiSsNSP+4R7w8ZxEJzoJfnG4mzEzowzzzwoqXZV2w1HTSwV90UDjA6LSxWyktV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OwUnF67foW+Ld6tZasJh9rtGFSP6r4M1kspB/s7ktOTuSrMvHl9iFMv1fKR2smYa6A7Yrdg7LqiNuOO8xgeQXxfmxfR0Fh11aD7jfm/U+YzVcMhHQhj5GgUcI5dhbdph3ebipNHk1GRveZYA+oy8v8obTywC+TM650WeT3l03Y0TN75b0fuzsyyEB9Cl8YGQU9MmVKgWpx1u1myokXd6zUeqXFj8TCYA5FbdSmoD1inUiMg5B7KXBo7GQi2I9rov8oDvgdndqXyQoMfHxu8pRL+CrQpskwZPWD4Q4j3amswt6C32VZajsoVKaBuipVGofokSb6Oho+8uA1r9wP7enM9eJzBzQK1HvaEnWFP3HTlRcV5J5xNwCpDZyfQPGv//mgyeKNTlU3SfLE/ixxF0NGgQ0uE4nZGxdmCZnzCdYp0lvW77CQPQ+S3g+3KFuYlZONFJa89poGDAm+1MkdnVrqC15ocZOb54YB1uZh0Azd8Ud1yjFDrpcQiP2cakwvDTymtYWEvGX4pFprQ2knWRWV8wZpHpLn4g20/XFdamig4HBEqOhdv2oLHI0IeDsu5caSJ1v4mmgPgm60S6vs7IdU4DhMffZu3XpWVjlTYYqDVwTDiHoinhtx3HXP+9B7R0h+oy95TbMEIRE6FQN2i8Fm3jnHcqW+PbJ3JOmzMAFeqFAFWxAvzMzQqURF0pYfiK0X2TRRY5zzlyZQ+2SvcKDEXiUrI3zVnaerRhAXovwuTPQ0eznciW2MslirnxU15ff0RQNcN5NLIt0wh5G3sRSD8pk8vfzUm2YAwT6Wcwgr6XOm8l2/1K6yVGOVz46URTZU0wBb1uF5Tk9Azb1Nn2rxN8N5mqjGtH2QQvOts+WLUOvVx6j4Rk9ZA3Ht6otCku4QASVtpd4TSZ9hzG8v+zeyiHqCL3MavjDjhJ+i3lSGeY6zFu3Bl9cQhGy9uUHgbbUixycUodqskXHdVJzhoqDr9xgqhc+YEGbmL+BkZsu8jRdJsJ3REFyo6QLmLv3lP79eG637bSoDVUCWzz8X4NZAK9BLoyq2D7BcxIxOxQnVrhy1nbKhCl/izvUpKWW58s38JGd8mKi0wdslmN82AJhWcskuaHvcytjlhJvVcnvi2OJZg4dOLgt6iwCq6oB2A97O/z+bGIBX2kfhkRgzbLCthnfYGnEfraV/Q3CJPgbVeJNFtL5PgF8q78z01WhhbABoJWov3XHdvf17hXNDsIJjBR2x816QF9glqYXVglVJl5noR7XY20dq9wPj9unQQWqZ3HmX+tPufxCxFhtq7fIg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bcb51c6-befa-4d01-74f5-08dc556dc750 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:41:56.5904 (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: AM8P250MB0278 Subject: [FFmpeg-devel] [PATCH 03/15] avcodec/mpeg12: Remove always-false check 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: smzmwifwmSNV Forgotten in 7800cc6e82068c6dfb5af53817f03dfda794c568. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 8d88820c46..62d7fd1814 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -180,8 +180,6 @@ int ff_mpeg1_decode_block_intra(GetBitContext *gb, component = index <= 3 ? 0 : index - 4 + 1; diff = decode_dc(gb, component); - if (diff >= 0xffff) - return AVERROR_INVALIDDATA; dc = last_dc[component]; dc += diff; From patchwork Fri Apr 5 12:41:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp935892pzd; Fri, 5 Apr 2024 05:42:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU74vOEG8V2mWSycjseTQSLkeWG2wx8PunTh0oI3MCWwMReaBpHig1OQ2yNfQnKVZWwTbkoGV8DIyiwUdSHyc/PlodjEUMA/BwVpQ== X-Google-Smtp-Source: AGHT+IGrWKbHHsNW06HdjnHa+MM8Q3JANslpixj6PcUCXrgekAw+Jenf4YPPpW35+Tfa+UjIz/0L X-Received: by 2002:a17:907:28d1:b0:a51:a1e8:3ccd with SMTP id en17-20020a17090728d100b00a51a1e83ccdmr756831ejc.6.1712320938718; Fri, 05 Apr 2024 05:42:18 -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 h5-20020a1709062dc500b00a471c15c9d6si664894eji.127.2024.04.05.05.42.18; Fri, 05 Apr 2024 05:42:18 -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=LHjSns9N; 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 332B168D10C; Fri, 5 Apr 2024 15:42:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2087.outbound.protection.outlook.com [40.92.91.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0273668D06F for ; Fri, 5 Apr 2024 15:42:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HwzPUuPwgK0Y/ae3ir+voQKZCcsvT7uG8O48E348Ty6I5syCvSCvPiQ5pmlENU4p+I24pS2KI1v6A12csC1VQklHgjyeYf7Q8ZBhDU2U84NYrdGH7Q3dcUTAvCMpeCycUMYQziRXH9dAMRbWU17CROKV3b5qiAJ3ZLUIK+5n1jEAs3WYCIn+bfGXx8zmZkj5M6pR31tWgjW89J2yCSp4m/vF+5JA2iTBj8p0JX8Gjwefgyj3oGNao1cBUhsl+SOejQZ4ZsKKVSEhm0YP/+Awma3ImDPVRB5DO6hY5rnRWb8WngSyn4lg37DcxvhoOt6MsmygdHM6WwCQ4jNsXquMjg== 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=ox9GsmtOQfyZqdBCLCToEA/7gPcLZPpQo+zEzzYAc3I=; b=ZNDUGhH9PwI46SDWTP3G3JBSZWGTRRACptSICd+P2Pr+g+dOxwnPlRQ0xjosNauV5uF8JqWNwreP/t+lNdgFbHsQtOc0J+ByOu8hdvF1r72YeV/sn7zZWVS4gzS+y0INg1We7IpUWi62Jyso0L4e1/ZipsVDHh8+ER34Iqf4n7ISFdG7GWJbG6+Xl22CGNuV9FIYb9eUrvvOfsVbWyunAwLfOziU+hJYRt0WoZqL+dQhfoIttNsaqPlcIJXd9QkXTwkEnOg2WBCDmEVc4WBPNy2ugwhyhBxUoq5fpGDrI/zcD39cMusil7FdFUAd1YX08TvZpzHAspaQTDrIQr7dRg== 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=ox9GsmtOQfyZqdBCLCToEA/7gPcLZPpQo+zEzzYAc3I=; b=LHjSns9Nw9P/YrIF+LS3B6o3nMiGgQXt9W4f3bcFyNBso1Qn6hBVrLpWGTwiqvX2FTO24vGMPIM71IwVcuvDJSfP6PP5fDMJPPQF3C/HhIhUr83qBcbH9Kr6IC7OWtDNBG63cY03t0eHNkQ+fuesRSNMwnso9MBCiWg6rhB3eGBj41AM4Rny619wSrhzV4s1XfhJNzdMPg077fpXA02HoVkpMPGdBFaOYM2pls+0v5lh6AmdrYb4n/QRkQ3HReOZ7TUEmV1MmwmSmpYWVa5LkNqj3jkj4gZA8lACHA5CVITKAy6jowKAX98XYqGwvWzZNKX/lqKbmKLXJznCsCGMHg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0278.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 12:41:59 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:41:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [PDNRdC7hOkKbrFMbiaQoCnQPPmd+ILlb9BgV1hsoXh4=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0278:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d423ad6-f56c-4547-2eda-08dc556dc8d9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gj5qy//rrEJ0AbLRr3u9ViMJvQhEeddgokbV8ahWqhL6kScHk+fKUrzzxz3da83KwjxeTA/UtFML80q7IUnyhYhsxqrMnAzLEKwFN5SwwrzNJDAz8BvH45arL9Hc+5Cjn+dvkfdznH+eOxY8vJGZ+aMgUGsZkDF3SxO3YnKamWwvm8xVRxIe5/5lFIQZpt5zfJk14g77IvYvi7yniwuZ4FXNPYMceJmpIgTsvVM11EbpcGCkrs2wuOd3T+3cvdLp4b7IPHBw/SAbW8Z0SstiQPl9oUKfcu2tpJypkyFrgxUaJoiY+GJRctGptdbplWArGGwwPBZcQo/CbiOGOXiBJKGPrxigHgQ6yn+9FwzJlU1fwI2u6OyUOjLO40AjWxigEYenKMWRjvdfWVOlGMkNhkBYuShEvPrWghmc9MaLhDpa13T0XrvrQaQ8aWVDZiBXViXphg7lOZGKWFnzC86cXzl81CI94kGUaHcLHpjeJun6HM4Sy63WeMJjfunkryzZK3qz1qv1DjOI2KwVnGGoY9RzO1z2+FhypBp057pkGbSdWAJcV7fa2WESxOcY80S/7rrtiE/a6QTeBX9ycjKBwsVA5teqrSJcFhe4NAt5S+A3hWd2ukvyfuw5t0FTfKtB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: U/R+Dy+nxlkKoc++TL9EmEHsqGe2JnxNBddH8FBVvP9wdGuQix+BT+q7W6bVSsTs7WtsfQ4me6ZvJSrbWSv+sAVSWNVZvFcWmIoQXFIvdF1UiEkJqGXqPnjRfvLADb+d/J8p55TGWleHYBSNprkGAdOF8BXVjekVV/zViIIwGONgUKLgqONvas/vJp+msrLS5XqRYLKFVuZ1QKyuFnUIxg8kVkSsS5GyAjVViB2zLU13B/GPMhkj4cIVo7BKi1kCUzp9KLbqwBm70PQ3Q3uFSRVf+mnXohqvk86xNW+zKaQnTCuQ2/DXdfaXKQsW70G26jvR/Ay4+Ig+PMusvJJlJ5h4XlcwEE1WJiX9VgQ9Vum3gpXsLyhvw3z+3+mdCotagqg3sC1Jb9QyUQ1lj3NyyRF8X20eVnnhvAVUBL7nY693nJvJ/jzOkAX7baulXWhv99m5BpCdUFO5/V+Cw+7W1NGh2qoZ423C4DRPBfRyBPD6917Do3Ns/GJFNfqrY4Qw7SuNKy2oPkLBZGYKFRTJBMFCk9oNHCvHC8+AXguWah7Mjvq1zQmtmcNbqvCu7WPiTaIHyYjOIJUC3dRBHjSfcK6CxrBM/D1MdRg4xssewTS8jcZFMmC3Esyy21rnWLDpWQG1NshLOlls+/ef1Bp31Md/Xh3NcqhlZlkzqSP5tVoL+vv2kY6waRA0CYqnuvsEP8YHZq3RhpENGy+BRBpqMpI23vETbfMkYve/qlqAAYkuNPCTTq35pPMG7PLUEZeTnbEM6LhPVxvzolGGG+BQ08gYt151HsfOtlur6lrb1yLZS4B0yK752gW+PQtjO9QeVwYGoxDuWBZfkZy4xiBF7HSXGTi2GmAPb8abTKXmjKorief61jOOJJGClyWkXIQQmwVlegp2EB6WLC4hotdflWheKH2jtMrIypczXzNOQ3sEeBnU4OaUxd0HgLWNmvDhjRbMqryy3AjQsFzgpa/ELgoaglROYwgrMMUrxb2Yt/aUuSssVqsVHCR9czw+lywF6GNO8zpf98jdkUayVKamzQw9Hnd5JuqfNk4ltSHJ3fdc0YNDxo/KWmCOsPokMYT9UnHW5xmzCOXp0CghBpq4fE/ZnOh6gDWP3Ug3ujpx5Ie/FosT/iTYH2ZJnDx1RHnalE47rHyWjQTd4LA8ivR9FqoUQq4Tb/QpdZtzPmQNrHxhBmLEQ+z5Du9apmBPiFSaxA1Qim4F4EL+ClQglbfNt1teqIYrjjz2rWTsj9HQtf5hHBw+x2YIBPD5+eDY4yA/i/6fcNN1F+HZzGJmSbr5Jw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d423ad6-f56c-4547-2eda-08dc556dc8d9 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:41:59.1286 (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: AM8P250MB0278 Subject: [FFmpeg-devel] [PATCH 04/15] avcodec/mpegvideo_dec, mpeg12dec: Move MPEG1/2 code to mpeg12dec.c 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: Rai3WUF0DAhU Up until now, ff_mpv_frame_start() offsets the data of the current picture and doubles the linesizes of all pictures if the current picture is field-based so that data and linesize allow to address the current field only. This is done based upon the current picture_structure value. Only two mpegvideo-based decoders ever set this field: mpeg1/2 and VC-1; but the latter only does it after ff_mpv_frame_start() (when using hardware-acceleration and in order to signal it to the DXVA2 hwaccel) in which case no offset is applied in ff_mpv_frame_start(). So only one decoder actually wants this offset*; therefore move the code performing it to mpeg12dec.c. *: VC-1 doubles linesize when using field_mode (not only the picture's linesize, but also uvlinesize and linesize), yet it does not offset anything. This is further proof that this should not be performed generically. Also move MPEG-1/2 specific setting of the top-field-first flag. (The change here implies that the AVFrame in current_picture may have different top-field-first flags than the AVFrame from current_picture_ptr, but this doesn't matter as only the latter's are used.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 15 +++++++++++++++ libavcodec/mpegvideo_dec.c | 19 ------------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 4ad1eb6572..fb8bba3287 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1299,6 +1299,21 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) if ((ret = ff_mpv_frame_start(s, avctx)) < 0) return ret; + if (s->picture_structure != PICT_FRAME) { + s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * + ((s->picture_structure == PICT_TOP_FIELD) == s->first_field); + + for (int i = 0; i < 4; i++) { + if (s->picture_structure == PICT_BOTTOM_FIELD) { + s->current_picture.f->data[i] = FF_PTR_ADD(s->current_picture.f->data[i], + s->current_picture.f->linesize[i]); + } + s->current_picture.f->linesize[i] *= 2; + s->last_picture.f->linesize[i] *= 2; + s->next_picture.f->linesize[i] *= 2; + } + } + ff_mpeg_er_frame_start(s); /* first check if we must repeat the frame */ diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 88facfc39d..1ced9a52ed 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -348,14 +348,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) return -1; s->current_picture_ptr = pic; - // FIXME use only the vars from current_pic s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * !!s->top_field_first; - if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO || - s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { - if (s->picture_structure != PICT_FRAME) - s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * - ((s->picture_structure == PICT_TOP_FIELD) == s->first_field); - } s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_INTERLACED * (!s->progressive_frame && !s->progressive_sequence); s->current_picture_ptr->field_picture = s->picture_structure != PICT_FRAME; @@ -454,18 +447,6 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) av_assert0(s->pict_type == AV_PICTURE_TYPE_I || (s->last_picture_ptr && s->last_picture_ptr->f->buf[0])); - if (s->picture_structure != PICT_FRAME) { - for (int i = 0; i < 4; i++) { - if (s->picture_structure == PICT_BOTTOM_FIELD) { - s->current_picture.f->data[i] = FF_PTR_ADD(s->current_picture.f->data[i], - s->current_picture.f->linesize[i]); - } - s->current_picture.f->linesize[i] *= 2; - s->last_picture.f->linesize[i] *= 2; - s->next_picture.f->linesize[i] *= 2; - } - } - /* set dequantizer, we can't do it during init as * it might change for MPEG-4 and we can't do it in the header * decode as init is not called for MPEG-4 there yet */ From patchwork Fri Apr 5 12:41:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp935969pzd; Fri, 5 Apr 2024 05:42:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU6QEcqp57Lep59dJGXaim7wQIaSYrgkJQ/BFglRWfhy4KXmwEidBVqAI02ZRhDqez4uf3XSkfSnL8mDXemXjr6z6cxYYpxtcjjuQ== X-Google-Smtp-Source: AGHT+IF6uiIEU7PNn1j/OOHnyGXNGaRGiTx/Mf6Q7kgayyuMERQSeSeXZOX8UStfw+kAuHVEuFai X-Received: by 2002:a17:907:7243:b0:a51:a008:ae4a with SMTP id ds3-20020a170907724300b00a51a008ae4amr1332560ejc.1.1712320947607; Fri, 05 Apr 2024 05:42:27 -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 s5-20020a170906354500b00a5196a0156dsi689136eja.50.2024.04.05.05.42.27; Fri, 05 Apr 2024 05:42:27 -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="XKZR7Zn/"; 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 5609E68D189; Fri, 5 Apr 2024 15:42:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2087.outbound.protection.outlook.com [40.92.91.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4331F68D06F for ; Fri, 5 Apr 2024 15:42:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eCDxd0QJBwg5qzYVaSjxkNF5QuU5RT4LWvb6wlJDIkJCJ6mzqppQiyP1RLJP9GTIg2CzTKFuILkPK5a2AoqQSIyZWzPYY5hkFnS2e7nWms7T1a0EaDFMTUj3289XlJ3PO0hVWGSZvULfs7CFdpMtsKRqqHqgXFU/iZreMLr5FdUrFzR1Wyr9mmRQczLdC0+IfKICPZZZFuRyPbW3sdiBru2gplLu1wJTtdLHfi9uw9HlRyN1Ay+ZOy5AjCt+rY/7VKhieTdPKaszQKjh83VJPX601f05q+Eub+FVAgRiO3LQ5cd7p62pqM4jorDZOXK/Bg1wjhZxSVIRDnFZo1cFNw== 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=NmHLfa2FjNWDSrU86UinwdXpsVn/RKgM4NTLAxgn910=; b=k7uRpig15zsM/3a/5LAqeXBIR6EdwlPNk/jk6hMJeFF9PZVO5PCYrHyzxLTx+SssRb8osbAIOZVEaCk1+MzhIYz++fk04FDvN4dgB0Pfd95mwZckveMIaPbkIL9l+05l5rXH1gUob9k/52rSjM184DvmLyG/vqnSB45d6zCT43p467JYO/775oXjx43F+dYqHNe9Z5nsBjRUn5nOQhXALfvovyy5c/vLdykCigNU5pyuQuY11geoYoNJ3NqRHiqz6RHhdbi6SRf/YojJfEnNV0VXutdLE7KEqcg8/WmG6S3XbXsqIOn8idiz0jvZZDETXq+JMi3KU9AleCO1uGDWgQ== 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=NmHLfa2FjNWDSrU86UinwdXpsVn/RKgM4NTLAxgn910=; b=XKZR7Zn/P0NR+hEG9Cd6/J9TDrnJHpZO0Hef3Ide8knGsWOT3pB3G8ia2yVAz7J3QE1Obe+ls+WUg2/SPy4KNnSMvPfjcOK2OYZOzwr66vXWsYzaC2stch6HP0de6CNquZVBC0H5QixkhrJ3OzlUSnW2YjRF38PPrH2BA6h0DHcDISg906qQI2GZ8EejS2VrQIzYsoRet7N2fR9+GcXiQmD6WXgR+oo3KuZhMoZG9s5xfY9ig5OkSg6yu3ZvVm7Ir3JmsJJihSHGPTXzUqKKN2Ig48qANx7AMbBher9iSHipHez37j8z9d0wMf5CypiPao+K1Ls7FhnVQd2q/410iA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0278.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 12:42:00 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:28 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [7HcRPp62fwjRCuY4+b8LdJ8T2aN8DcimlG9E+PzItbw=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0278:EE_ X-MS-Office365-Filtering-Correlation-Id: 63d2b699-aa1b-4182-6c5e-08dc556dc99b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ww5G9D+4ATdl0u0/xYSMz094NcDTaX8cvjKEhVJSG10hcv5/8/ZOtUYzEG/8fkwkCCjOOtU0LhXleJkTeIuzOMInamE2Nb2PtgyFXuqsN4GTouNahRToM9NJh/FvxzmUKD/nNBwmaLz/HiHNjsZ/BpbzQZsxKNd8II9klilXPyeDT51S5YHtImfJlgYmXaumgfaLhVmfTTBHLRzRDptDy1na6WZliCOpfI8r+5o9Og4VkfRGPSQB680XVezit2C7gQ/FKyoX3D2cMVPGRVuNozQCjl1nIHGgbcPlGgv/sbNDT5I0I0qvDTaZwjmkNZfDvEQQV5/GbNJ4Qjv9tQWKuT5bvza2J5oSAyCNj+uFoKKx+riIHzN/KzThxc91Dduhp8t9B8lf0ZguOwa4tjSRro1r1VSH+LjzSecmT0F+uGCJ0aB+7+AikWu88rnMOveCWkAa4GOfpaazHY1QlyXyO07xPZdBj66chVEsLGWhlEQpi/vNaMu4NyMUGMTkqiBGRRsczDpNxJIVNiQ0nSTt5TXubvX0oibb2z7UIBMpZ57ykmwumMi9J1vpBaXKswgFuNXQ1jvi63pNfuDt6I40D+N7Iqh5eN0MXEDAMqgiXUxZkqf7lai46yiHXqhFuvBj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zde4RVspUycPxYuXJk6Pk7oC9kffnHWcJiY/CJubu3d2adYAbW1aie5SWOv9JzKC7d7Ptp20za5b6AmbUD7cBjQkNtHwfdT6/RJI/PTTsNjYH+2YOo66HUaSu86psfgUGfLpmvJcbymD35GFnDKrrDL+JOr8mNmcrDOzdbG6ycyWAJUDkGa63+ZkOUh7a6PtMbXR8cmDJuJx/UXPq9cuFLZdt6VY9LV665++DbqrakelcO0Hzk72Ph/wZsah0WkDusZlPJScCTFX0BA1QvbLZQSGf7jyQFLwqqEHilekwyoor4z9/OsbXyN4r8zeEyAgTPTE6QnFgkV6j8jD2k1wNp+zt4IO1twgAHz5/K4HDNM9zLJY4FQrTvDlzeKT4K5tZnp5WhrcBsGS1cwoYyFWKiUjClUCXyhvji/l4BQH2QaDcvGjavq/Mwd0K2itjEoEkWSGyzC2axcalM9DbTIgNe+TZrZbDPOJG+s3vlwDK/ZD6kzQhEfWWSX2eNuhB8Vj01WTeCH9Z6j2xmj92cTKmRpcxvDmH/2zI27JllS/0wsl1ZFpIrrTUJ9wUrJ0xF0tzj9ulX0CFbqw1GbiFua3adbgNBHun9iyvDNttB4mjmBUTupD/01QOyfxQD0AN5lApGlZ5uJE7ZW6xZdUVkEa5pB0FibgPM7qywj7Qmt8ftxCU+5YD2hcknQ6rmM6ZbA5tEkD8u07nQbjDMn2N8AIb+o3yPw5VpuGl3/o23WfXexzQOsZGyY+Y3vUur1Sfb9GHD3qwy2qJHsv3qdWkKrOH19FIfon4WCUlHBwTi5qK5uWoz93xoFjgSzWveebYRs85MjSDg7T8cZIqntN1XEpxrIKB1V7v0yaAS2Jflt0Rq9Idr2Pl7GZBwikDwca4RktOFxe7wCCl2cpepW3jNqdNFfr04uUqqbYPx09kgRdshh7q4Kzkl0J+nT1WEqWHFVUeJ+2OkaUzDRb4+smOuyTNGyUH8YQsq2CNJyGapTktE5osD1w+ztKCKUqyiC8uSHGDF55AHv7ir/go8Qq6i1Z0KUHZYEU4kDPTBTve80Sy0sm2K7HAaEcw3CoqCIO6od2Rya980ElxMFeUuroa5P0Wmyw2xq/OwsB+lTeKThfxG21Vs9QUHL+QeuVcH2G1vcl7HB6MaJUghHqwSaPcQQ5srXu4Zi/20kqgZNMn7pt+PMLpc/TZePZB+LY7trXjzneskgA8apmcbMRIeE2fo6ampzQHN+CwE6v0RwocW3YLjJfJA98OiQh5lUNYmyp5Ug/Oel34jxDpN38bDEpj6GNFA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63d2b699-aa1b-4182-6c5e-08dc556dc99b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:00.4229 (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: AM8P250MB0278 Subject: [FFmpeg-devel] [PATCH 05/15] avcodec/mpeg12dec: Remove redundant check 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: vA61ME+L/aFE This code only gets executed for the first field. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index fb8bba3287..83ff40d237 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1301,7 +1301,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) if (s->picture_structure != PICT_FRAME) { s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * - ((s->picture_structure == PICT_TOP_FIELD) == s->first_field); + (s->picture_structure == PICT_TOP_FIELD); for (int i = 0; i < 4; i++) { if (s->picture_structure == PICT_BOTTOM_FIELD) { From patchwork Fri Apr 5 12:41:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47816 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936024pzd; Fri, 5 Apr 2024 05:42:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqR6S+vYBNdVke8R8EJjkEoF7gAX62CViVk4Wd02OWj8Zu5iFmJZ01BV4gMHWKl5sq8aKoWZ39NbF5KOgzRt5d4+adv4KWrHoX1w== X-Google-Smtp-Source: AGHT+IGtbeGBfsZVVh7BrzhbwarTvxVFAtc7/qjXgiZpVSccAzDGsx/cVqvepGqhQNfTWIuFQWzM X-Received: by 2002:a17:906:f18b:b0:a4e:6a49:c09b with SMTP id gs11-20020a170906f18b00b00a4e6a49c09bmr997360ejb.29.1712320955908; Fri, 05 Apr 2024 05:42:35 -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 hd30-20020a170907969e00b00a51a6b52948si588645ejc.245.2024.04.05.05.42.35; Fri, 05 Apr 2024 05:42:35 -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=IcaGO05D; 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 4A3FB68D19C; Fri, 5 Apr 2024 15:42:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2091.outbound.protection.outlook.com [40.92.91.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD35C68D170 for ; Fri, 5 Apr 2024 15:42:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RRdHbYUC0pW21ekSXuTtXYMVTGSx1jPNi8uOOf6M7EnlyLi/Y7Iyv6wnogOh1ECSByfG4a7xoeBhHlx1jVvLhFzXToCN9u8FizXvYTtVROjXO1UgK/3wPKq7dK0cMd5xbUGd6wa5YStNS60ljtok9pyC9wM2mKVnZiowBXsbH2OLpGNXgUliQ6ukmvH+/5D+Y5CzYkFgZfxZeD9KHK1/8LvxW/noSPQgUlis7BDodVxc6p/5O/D0tsdua5MeZbYHLGt3XdSXIfU92vPu5XpyqEJ7rTmpjm5TGohSG7sRvhnUxYPDkhMrmh2c/UNNf4jx4AINwNNiY5HotXXNN6BB4g== 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=qBMYY22aK2gSLoUnL/x7TRfeH7X1lQZSZs54lygMLJY=; b=ZfUR9VJ0LTDR16Ps7RP+EGpiQV2VZJoh9ule6OfYeEgen8SI88hKNF4UsdQYu9M95grqjQ0CZpJKKaWSr7nPBPTgM2bZNO4PJjqYOoiuf2ckzwxMXczgHjuqFVepdNqnsKjBEFengIzRTf0f1Sb2pioTws8LE4/LX4sjFv2V7wAoolmcEfafz36DOdItXko5XUyr1Nx/Sp1gpc1WJbZrPQJq6jvzJIviAcNJoid0lmdGV3CnjoZGh36xDjGcOPEN6mGa7Ww+AN/dOW4uk2EN3l8rq+9tdb3mogPzp9qCqdlMiOFpmD+BSuhTgwoT7XVDNhw5Phjjh6+N4Kw1owKfyw== 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=qBMYY22aK2gSLoUnL/x7TRfeH7X1lQZSZs54lygMLJY=; b=IcaGO05DGR1aLBndCLTtBMfNFjMDwJ/r22lqf1CCTnKUSl+ybNFxLQpkuUk/xbrp2xk6cKLIhDdKymfs5Ro/dizQ7LtYuHpdgAuLGva20amwgSQh+cTU/rfIAdPM0Wn4SGuaePMSsFnUGi//beAIboUilr/bjr/brHvaVnWG2v6ca9uCvUAmMddTWO9G5//YhEBdqyr7DAQDo3RIUqVQtdchtvS0Hsm+TVtK8Hdx28Qdb5aACOtcBQX7Nzmf7/n0LGaL/a1Ms98FeWeG0w/Qws3eFxMKiK4ridXhWdkNFwSWt6+CJ08ctYcZX7ApVyU+OMYmM7eDFM0szKRInc5RTA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:29 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [8Y4cfu1M5QxJ/NGrI1OQk/4TFKIu5AeZRh7vWTyjsTE=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 81a663e3-a779-47f8-b780-08dc556dca56 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qVvH9XlXl3rVt3SZA60qi5A/k9vX7WiRCTPovm5eAgHLa2rhXgpVFjKJ+vKXYa0pZStkUrJxlBYgY+x0DraSe+ywDrUTxpjhXqotMgoWPLsvh6TTckH2Ej1uzsBcQfJvSmAgGhZgp0qm8iue792bshJpb2V026pIWj/KKjXG3jKODaVrqmOalBiIUx5tJOyxiMZLGAwqt1wCX/SY2lUM5PYkIEvzehnTIMcWQgLi0wwflX/EPLQDulO0q3bDnYyuKGiF/ec7Ou4tripUNGcf8LgRkUa+NbnEWQKacliUnyr29oinkWlwiKSu8TVK5G7nTUpEZraM/MkqHkQeE5uJixCI8qPvGoOr+Ws6Per84mPja9+hEJtr9nj13Y+RFFU9QOsO9ytgzDKJPHQSW7KOqSA/pkIry/rcS7ufWofVAfBRrbEVcfH7bUr6ZWAS3Hk2NqRzYbck1oFNBUHBap1yfEf8LIANLcD7XLo4XA2g3dksxWjHAX+V+WTiFVaYmNsGN5dxlj2Rqfaa6v/K3EoSQUjFUpuOnbbVTsw4Fw1Soag+gD/sERIqSbyhgHvMjUJ7CeDCL9TuOp3C4PGsTMG62scS+OrVvZ3EOqJHG2ThTCV/NCawkSyZvMjfqx0glGR1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EwLswozmKcRDG3oDiIvRqacjcL/c+kE+53dShHGxCVxnXsFYZiDoeTul6J0zvB9PGbgjtYNgq+p0I0NGhpP9ihwEcFixhffpS+UO8i8cfnHOVuCM0xODWJ5na20tF54xUq77f78VcRTgf84DUfn67y67voctrW8cfZUjvB3LpuoTCGlB2gtbcPOI7pblTX1l4uhZYJupH8lQCTjJK8UdnyT4SbJtnOLBvEyVsmkDHLD96Xk+qDehuKEVm8HVqbYrKwt7UzQzGPPtET4YFvb37MDgWS/kHjqE9+ojlbvE0ZEtEYTbzZ5px73UZEylpHn0iGvluvzLRWHV1zJWR+RkxLp7RP+AF0yCeCssWs3zmbZwgK94VtoSSMegaa3FovvnAzZIRXw3yhg8Ge6VU6wedw/qQxydjqgbRGOumdcBSXKIgEDV9OKaUcvIdveMiGysNFjSIgLcdoBEGejL2cFgcghaw0ZO2b/GG/BoHmKI1/rD16CpyKIdel0IP84PDv1ONa2d9f+w8V1wz6tLAr6rbC7LiRlL+I/EgESdg/DRNl2004dof76NshemZM1Ik+8cZYmWLobRIPnzWMG6MSyZplHic8XGeEBVyZPGqGigjGD2Vgbp7WbTYYJwLdgV230VGBJG3NnneMoTxtHpDK6MRyKXzS3eov+pJut39sbmr0Md3pI45dsqp0CVK6jKZ1mQ6TgXW5/kmRYsJSWkaMqShzXQ7JcqHbGAI+99yxxYMgKNFCXPjVx7ehnFgjC6uSI7HYbS+4VV5fiUyM1jKRWc5o7NhJct5oFUiZsF/0WWJPLoZ2AgVBBmdsvJeicyp7I1Em9OqFCIuJD7kKJ6euSC1m22sTrhIYt4iqIII6Kvw9L/JNPR19Ag9DvU3JEaMN5A6Aog/DV7Pd8djp2VjJD2tbqy3io51/hvh3oV5EfrkEfnhHdKq1272WTIAUN1JDtcKLhYqvMZAjLH2wCrJPj8fsRWvV6Asjc9zO7C8qW5tx0+frDLIvJfhulFpX18DngI5516L7hUm3lROk5DsMOvBR7nnKZWTLyj1+xRjjfYIJj3plpMnBZCreWO2zSXJBzUI3r8X+oBjdnMLYt7VgZ3C6OWFAqhrQtINKVse6cOUYdZ/Udhl8+mrwApuPwryaDWlE0cz7a8mLC0/hVUPfDy/YcGFL4LcHqlX8q5qxJyE2RpoQw8DK6zQ8LOkJKr1l1ZuClW+PyHPsA7I3zamYqimVC2LOA8pr7+dot4io4WSSALOMm1vHR755m9guFP4Tx9QG+qbq8BcrW6YH/J1mKaMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81a663e3-a779-47f8-b780-08dc556dca56 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:01.6405 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 06/15] avcodec/mpeg12dec: Don't pretend MPEG-1/2 to support alpha 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: JO4btPGnnnbL (FF_PTR_ADD has to be kept although MPEG-1/2 only supports YUV pixel formats because our decoder also supports decoding to AV_PIX_FMT_GRAY8 depending upon CONFIG_GRAY.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 83ff40d237..337654c88d 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1303,7 +1303,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * (s->picture_structure == PICT_TOP_FIELD); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { if (s->picture_structure == PICT_BOTTOM_FIELD) { s->current_picture.f->data[i] = FF_PTR_ADD(s->current_picture.f->data[i], s->current_picture.f->linesize[i]); @@ -1368,8 +1368,6 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME)) ff_thread_finish_setup(avctx); } else { // second field - int i; - if (!s->current_picture_ptr) { av_log(s->avctx, AV_LOG_ERROR, "first field missing\n"); return AVERROR_INVALIDDATA; @@ -1383,7 +1381,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) } } - for (i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { s->current_picture.f->data[i] = s->current_picture_ptr->f->data[i]; if (s->picture_structure == PICT_BOTTOM_FIELD) s->current_picture.f->data[i] += From patchwork Fri Apr 5 12:41:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47817 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936094pzd; Fri, 5 Apr 2024 05:42:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbp9aZnXlZy5c5YQ+9JCUoXgv2pAqKCG1C5l9uSmhiAWjFEO2YtIAWFXXcBlQXrL7D1PCv0iBJsRiRfKnV6yUUUofO/8ImlJv6wA== X-Google-Smtp-Source: AGHT+IHmBhuQ3IpJZqerdvbsS/Rxc7A3dvSUxBHub1yFF1rd55U1q/PtZZvsoS175NFGyjwA+bR7 X-Received: by 2002:a17:906:240e:b0:a47:3afd:4739 with SMTP id z14-20020a170906240e00b00a473afd4739mr2071333eja.6.1712320965429; Fri, 05 Apr 2024 05:42:45 -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 xa24-20020a170907b9d800b00a46a6459f50si650052ejc.783.2024.04.05.05.42.45; Fri, 05 Apr 2024 05:42:45 -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=H6xJV7jB; 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 4CA0E68D13F; Fri, 5 Apr 2024 15:42:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2091.outbound.protection.outlook.com [40.92.91.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DCF768D06F for ; Fri, 5 Apr 2024 15:42:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R6YTlGrA55iE/pCRry75P7FFxPfKZu5PoDfErkHAdM5uJYGQrkF77+NkJ1TmnO10LD4icJk7rcfAYJ7Bq6p4jmqHDCzPpfNj9dGytttMJN+NWZ11ioQTMLvYtB4ZjC7DgjlpJYCqWkR4lwkzqq0Zd3fJEjLBugSzIdCKj5NDYzIIxddbbSDgEWfn2HV86mAPpwxS7ItkOuE477dlTdDFUm7V+w0KPE5ILNMgkFVnmr/Jy0tBdwVo8b1NL9tfIe1syTipfZqBInlhnsx/27OC+If/CvHrR+bQ3EDvTDGvkBEjVRXnwJ7j/V5/OFFLN2OngrncJLU2vJaz61p1Fm1h1w== 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=j3Zao5AlnJ2rkjE3UlUaBrcEHtXJcZkXSOHE0uvEnmQ=; b=KhQLjhB5nermw4lkeen13pgV7qoqhZwFuOYUmPwLR5weTF2dg96Znz4iUV8G/ZMnSedVBlIijFibooPemd0mgJCILLOD6cG2WvIxHzcJ+a095K10CywY0xeS1lz/acKIZIFcwp54g4HAcMEO2KnXV966wNBD7fUzAuJZeEPaNdHjTtnRTRVAfHd/OL5g+AjdZVA+CQL4zxhIBqVZaeqJ+WhaWRczGUnKE8Fwcja4fMBCiKhllFThb0ivna5599q1t82IbFtuzKC9xU04HvN4yoUuLEjsyswI7y0xnCdDTx/Xd12nW5BC76LlIcIw4hNUnKVw/ofqrMbMovqsaWq13w== 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=j3Zao5AlnJ2rkjE3UlUaBrcEHtXJcZkXSOHE0uvEnmQ=; b=H6xJV7jBuzwomxaA2f+kXclXCdaNHzQDSBUOdmJLYVSH7gfV1QE1tEBK6idqfc5BsFFCdO5a+hvEHtfCDL94ZA+Y0rhz+rgSD7f3zW78gGta1IHCVaieocRnaafuAevtV83TVZ/uIDWaSg8P8fJy0yVKdYleVpTBMTrV9B13w3yRYr84u3OXPpIs7XYK6RzOwnMQsow6a8QND/3Gkiqho2OtBXBGcDnujbAm2zH+gqWWNWSWXH0KuEivDIR3aDpja6ob6KAiIQflDXu2Jsd7dTq8TiBbHA850ocKQ7/6m11dbzykDd+JEj5o+3zww/8QM+Wgh1rZYs5dcHFL09qp6A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:30 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [DW1fTe2J6oGnCcIk5vuXe7H1MZiKMMHGmn6Dj/UJwOU=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 40aa5f34-dde4-4f98-5916-08dc556dcb26 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0x3Vc+tONk7/Ola/ITG/grvxIdXLNklZRj1Xc+tefL+wUPiDa9DDGbWdC54aLGcZyBm6GlCLM7nJ7GguQvXmRYjMWf9+mOJQ50B4WMUjtVBpO795XF4I4oZLHn9UYmeh+mTaCfB/ykJfVQPehLW3LU5NQ+4a9h8n2X/YUe0WwpMfc9jFeelkfDIcpDD2OzXQqo9PA3BfPD80xC2Jhetq6WBgSM11MAovbk95TK3CqekEpT2Ig0/HsDbZrgQeX1ht1za2gRWooXIpof5Kwww0up6O5qm5Ei6p4Ak19wAqF/S+41sb1FjTzEQmuvLE0bcdB0TBg3zj26pgB4/cE4B63LtWbIPxqovfXjSclH4bW/VLpe7hcyfUywvTeVSYyjXmKdmKh+Jdu9cYSzA0GoPV8U/l3sM6T4d/sOOOiE51Gz6KsHGCsouKOAvwzoE2hUEzsVDzutqKHOkJaHPH7EhDNQgT7L4xWKRgHaUNSGq2vDgnBQTx8GLRxly0a9JaYoa7YIj56GDWfZnb9m0FpZKnxzkpJQ8bd2yz/M5Yz3OEesUJsOSjdmFPXIc95+d+zOCjSFcbWjRdkc4qrcEJq65nNVZch+QPnQabqc4SViD0o/MK6vCc+cxH1rn2VnQrFaRr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lLaDwDEKBOcSMYlF+zhbOtKDAaMC0uYSSnB4YmOvfoAikZjAICHKQaduCAyS6mdxeW5ptDYJM9I0aPHUcjVzds4AqDtg2U7gepusL/+IiOoLf20deq3SoSrko+ENQ/qc8cszw/0KTPX9qVMQkx5n/JvvaT2c5c88mPnFUwXB3W0liPqKFzyCGKO2D05sCHm8kS5mvCDQG/bDDOi+2luQ0KQ6VFvn+p21IJqQOGQMBj6Io/krkCprg70AT2+yXlV640EZ+wRjoITmH8hc7PGX+2P2wyY0g0uwHR+pwKhgp4Cvkwp4lKAI5l9YrTiLAWF1JPYEoHHFGdOs0bgfLgF24lRhmV04dU8aY0AFu3oUH1Q4tySPcDCdN6N9RhIC8R/7oztr2S8cM60LLjp2KX384QhTNQ0sRtHA8LIXLyZv08xOVTqdmg2kn10iEPrJ7TJpK3WzKPVUbccG0a0X76DLuGKUyBSNh0tcunrg2wCNUihEK6gI6M1YLSGNpSIZyliTg/Ch0o4QF1xKhpUJx0jBxr4o2lX1gakQ+oqSTB0W4SB6+bNz+Gi9fQPSxwevqv0XhI0oHobxiUDfvG6ZHoGtocR3YmsZgqvI20BCeILWmqse+HngrpgzR01VLh3NrSj/NeINPCOwTwZN5CZo+bEVVfSQvmixZMQnbj/AyFpVVywa0t/GR6yB1PdE7hzeE5LGHoYYDySb66mKN0sN8C0OyjL5LCQaXpy5oRn9ItbXQVesBTOnJniZzbXbbQV16xVbHZNqaqkDv3yR93ae+9xmLJGkq58HoukE2GhBWy5JcqZykM1zUnfVsdFd66minKyDvYGMS2I+31cfE+PD1hNX3emYe5C8zcjdb9mQAJKBKF9yksi+6pKdIXmX2dpRVHsTyg6LKU707QH5gUTBtWtMtcRgEBuRN17n1khdWIdR7orTnUnZUVB0BrL1TUsF1fJacY4NUiQ+eFCuctRPVbKDjAb34FiQiH7z4K8jQpr11JNQ6ojM+cILyHjb4x6nC9kb9E2YX58egc2WQMT0mBG6fSMcarKPsh+dsIoad2PoiD1+piWEaPX7envDldqkk+dE6yPS5Wvp2rCjcaZq+ZxhUTPFYAhowwKzvsBlH9LnUU24yTUPcWrXQNgfa6R7CiipTyIy1a1THSqVYd2kcZeiRTxpEosPZYLfCO+ltJ+OQt1MDFKEQ2T7C3G/GpY8KSH1QjkmEg4RVYElYNHGDatLXM4CyLcoHUEDg9rGkR7cd0ErZ+i6ed7armmUcZTkoUwUjsKtW2646H1OvlavTtqtjw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40aa5f34-dde4-4f98-5916-08dc556dcb26 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:03.0542 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 07/15] avcodec/mpegvideo_dec: Don't emit non-keyframe warning for H.261 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: o+WbigZGU7tu H.261 does not have keyframes (or indeed frame types) at all, so this warning is not warranted. Also remove an always-true check while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 1ced9a52ed..1059aa9825 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -380,7 +380,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) if (s->pict_type == AV_PICTURE_TYPE_B && s->next_picture_ptr && s->next_picture_ptr->f->buf[0]) av_log(avctx, AV_LOG_DEBUG, "allocating dummy last picture for B frame\n"); - else if (s->pict_type != AV_PICTURE_TYPE_I) + else if (s->codec_id != AV_CODEC_ID_H261) av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); From patchwork Fri Apr 5 12:41:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47818 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936157pzd; Fri, 5 Apr 2024 05:42:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXU2p9Rk/gJBW97sW1DfRIJm9aDmZvnXsk/vPZKkNwbnOZJud52XXKKEzS/8QNLlImhmHUjIir6C+R734Nzhvjd/NXJ7tu+qOlEQ== X-Google-Smtp-Source: AGHT+IHHS/Xy4bELp/dcP69Xi1STJeOUncoJYVAkvLsnp7+JViXx2Q8G8hEif7lNoOOkwfwZDtcU X-Received: by 2002:a17:906:4e93:b0:a51:9d6e:a77b with SMTP id v19-20020a1709064e9300b00a519d6ea77bmr842626eju.0.1712320973932; Fri, 05 Apr 2024 05:42:53 -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 cu2-20020a170906e00200b00a517fef05dcsi675091ejb.138.2024.04.05.05.42.53; Fri, 05 Apr 2024 05:42:53 -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=vWp3IuFE; 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 3845A68D19E; Fri, 5 Apr 2024 15:42:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2091.outbound.protection.outlook.com [40.92.91.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28DFF68D16D for ; Fri, 5 Apr 2024 15:42:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rz2CyybP0U0R6ldP02K3KfwUmGGXW1MV5J3W4yGk6hMCHullyPTA6U8A9AQyMuIyxUqFJdwtgxDrK47V8wSPycZIc7RxGb/4egmC+dXR5GNBoMzuLJAdkVkbVWYJJ/WOftZhYwbmflMayIK/spXxIe9E18H71YY0+r7WeRGJQJhw6PhpwEnzuH/VwHew9uBXsvUyZOlhmjK+9/Hj2B1+CIBRhze1a1LDG0q4cMr7lBMapUj3rVtQ5rCtFQQGy30BgTDePgMjRcCugHwxpGncxBWhk14ORcLY4h2pK6z/FQWv4T4BldET8BfrOuqTXz6tuyD+AZXOuh5oEcjNcJ3BEQ== 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=fXci6+4Uz2pM2btGQ5PxgiaH6N5iWBGQaHbXaMKLmk0=; b=UG1S6nWKmZGLvXzqeiwzF98F5J3/vwAr7iGYOIhMBBcfv9UOj2C9nMVHszpJu+0rEuhXileD1C3GxUCYwxLqwOkDtPhejBlg14JMbv31/mz9W9jJIkwQkwEkH9ObdDcbK+PN2eMia4OZ7wAtQIuKz8I1B8QpGtuP+dkB51Q8eysAWB00br16kPVr6oVsLk9MVofmzTGY9l7+jMjGx0GYeSG7g44tvitivKGM4o+Q/y68jh5U9Bi1rSmQLuAP6efe72wIfHukXx/jtWcul8Y4jZmhN9nKY8tGOKmCcWMBERaYvNhMcL/c3vt06nJSDcVe2bgkIDQuaPgpeHBeWShOVg== 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=fXci6+4Uz2pM2btGQ5PxgiaH6N5iWBGQaHbXaMKLmk0=; b=vWp3IuFETiHiFMNz/x+kzxL9jP/uWoNi4eY4CF9vPqIf9vAx8TTEZ3mJETyy8jHo19IRJAH/z5rgSpOH21AnsWRZomd1SyPfm4IKeY5gvE3Bje5PO54HVdQRbn/2hz1W/om55PF5hJRQ6eMhdZsuqXQY8Z1Rsn5mSAGRAvYnVUZWSGSBkb9r453SQmzFX+kOxy/ogtIhLAmNPJm9IFsng14KHFjvHO6QDACMCK2K0r90yDPE4ucoD9NUQDnZvzevxnbzAwJFfbB9WMRb+DGSU33K7irNsQdyGGir87fRXiiv3eoDqaE66Ztb9YlpbdbIlYAVG/OkLGUgkxqQdWPshw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:05 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:31 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [SS4wQLBVLVVrubOBmoVQhJochmOrVUkSDPGjn/PP7Ps=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bfb2492-e5a2-42db-71b8-08dc556dcc71 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eL0eIR3BTc+TRqY/QwoTls8vWc6MbVM+3SFAEeMg9YI4BYf0F+WopWip9QJeck+OuPyepiXY3Vp6wIiPafI73WZJfJa40BrTAbqv8EvEDFG1uzJgSm4hXwVqowtBDwUv9cPywO1QMWhUbogk3e59lt5mkDFVgY4ytdm1yQ/AQfczFBqfg978o3DoyZSZqqsH/0i8u9+humfvdsTdzjUgSDDQRnGgIAb3L8zojkq9iP0zJC3X7OWXhMtyVkN9MgNhMfxD51b1ICx3y1WgD0WG1XX0eSMUnDRXBnv8kTNNYsilFLuoEWq7Mwh03e9RVbcmwzJwF4tEcoMbJO5TXFvcG0zQOFJIPEp1xRXGFm/lbvBGJZOWroE1oL1XSse8fI7+uaPnh9it0k8UPcXRVsaJ92PR76j4geh0qIhaK30AakKPIN2QYiB2HDrBfc0JeC9DyTDX6YlffL5Mb7Wa6kTK53QkNl298uNGWaOY8Vep+kjovzD4tXTEXmfE83BL/lsSkuvzl5NSQZEk+QYXmrhH88ex8m+5aRQ/CeAKzcInF0oIU9qoBPl4gK/YWzZm0usIVZU+6f0nGLCDxmduxJ1xqd3bJaNLiR56bFmWstypUjmwtFJoCWiZQxr+SPXj1JSZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kSsJ2BZE/f0WCTPeVbFUsBG7M18jwQkG12Vm6IxFufL5WSxCfgA+3fFo5uBQvVenAW90vrmV47z+SZGtzo69K+oouDzrkwozMxLCxHm141jrM3l9wBkQChTstAaIBCLj1xjJb8jU5rP7Tfl3dhuNzV4A/A6IAMb5QQzPNTiSV8/QDyrs42CRvE7Dhq2DYeChkM8lDmRMQ95G+nbShfBfffgisvFg4yhC90PZ8e7gKkzRB9C2oE5Kf5rBdukjlQ0qPq+iMnUj+NTrh9GeDgWdH0mb3I0Xkhv4h0DQEb7WW6S7cOM8wK+jv+gco/b1TyRzLKmSwEWYPMu1BCqvcuFtNzw69MiFzCtPjFIRHmwCZUGsjXXFiixDsD0iNUQCGiQJ51dHsae78iCafEMr5OvVie7NFJ+c0zOc3PSmGrCn3hEzcx0sPfcKRiYqxTxsIk7l6/sTo9fLS8BXBNcHQ5uYJsS/GkzhT7RqJUZLxJg9Cwg47jiGisM24hssuU9JzFv5t52S+/KBzUCPGtjcD5A3FWh9VM+jBC12MgifvFRkFQYsazb9z0RbHD2fMl4ArIsKDcoI5YstwQ+GBIggQQeB9/loW9XCNScVGrzYTNulRLRsRB+QTb2Zebq4/2i1r9EktPgQii0b9XyfnLkixReIa8f6inLED0rhI/L9oRJLX3G//PaPxSsy1kNrpcXlR0lHfYBTQOrV0NaTvsnl8b7mGqit7H7n6cxyM0DF+IhLxHOYT9zfcwS7y5YA/j7tCj9Ef5+1zSCCK5fxfK9bceEz4t4SVCLjAikQgIAqLMYvkWABQkZOGmnVf7Cb1hyrafUe1jdG28VSB8H6bpFoowMkFcRvORoQjGK36YMJD7MZAeG4frdsUgeu1debYqt9UnHmtLLqZxa+QrBgDAHILnpElW2eReDoZTttfOR0EoSpQThbiXWrfbkD55AuA+Rt60mZSuSrFz/LCPkeGd7NrBCtYyFraZFYCtwNOxQUF2eop9NTaDT/ESnhFxncjRhRSopYeD3OxlmQAbphAYvRoT5qXVsRqU85MvywrlpuE3rVGUZCC2E/GpBOzXqDELWKIHNl1aRPCSkFE1YiPmIgQfE2Bm7ECQ//mstXv6yTx5oFG14sjerKEEUCpS5QsA8ETxvBb/LSaz3umLhG5DparMnOAO81vLUujVbzEU49Py7nWwgUFWlD9uPpxYEZNkVpT7B0SmAt3dLSf9FtfH+rc1e2l4PhdORUseLV59Qy7J9MbDPGgya6xEcJjG8PBLBxK0lLLVO2Hd8GTV0icARhy/JFyg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bfb2492-e5a2-42db-71b8-08dc556dcc71 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:05.2087 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 08/15] avcodec/mpeg12dec: Remove unnecessary FFCodec.close 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: s2g2AXOP0kBE The ipu decoder never calls ff_mpv_common_init() or allocates anything else that would need to be freed. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 337654c88d..45627e702d 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2868,15 +2868,6 @@ static av_cold int ipu_decode_init(AVCodecContext *avctx) return 0; } -static av_cold int ipu_decode_end(AVCodecContext *avctx) -{ - IPUContext *s = avctx->priv_data; - - ff_mpv_common_end(&s->m); - - return 0; -} - const FFCodec ff_ipu_decoder = { .p.name = "ipu", CODEC_LONG_NAME("IPU Video"), @@ -2885,7 +2876,5 @@ const FFCodec ff_ipu_decoder = { .priv_data_size = sizeof(IPUContext), .init = ipu_decode_init, FF_CODEC_DECODE_CB(ipu_decode_frame), - .close = ipu_decode_end, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Fri Apr 5 12:41:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936240pzd; Fri, 5 Apr 2024 05:43:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWdrSG905cc1GYH5b3Ic7KVU+9mATx0Xd/3Vj9dUSbyC3q4o5EUnKk9E6U0W1TpIVe4xKGW58pAQc5NPnLiicYS/5ObRA7q89V1XA== X-Google-Smtp-Source: AGHT+IFFOFGzO4R/Ousrmxoo4LmlFRluJB1H68xi1ESLoO0lF4APVAP3J93CLAZIogc7X0znBxHA X-Received: by 2002:a50:aa8a:0:b0:56e:7a8:5db8 with SMTP id q10-20020a50aa8a000000b0056e07a85db8mr1333617edc.35.1712320983355; Fri, 05 Apr 2024 05:43:03 -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 q18-20020a50aa92000000b0056c3b60243bsi691075edc.308.2024.04.05.05.43.01; Fri, 05 Apr 2024 05:43:03 -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=gN3oFc7C; 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 39F6168D1C0; Fri, 5 Apr 2024 15:42:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3503D68D140 for ; Fri, 5 Apr 2024 15:42:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CE2oLKKIgGUuHYP/0ukuqrb3hAhxnKdAErVIMDJgW0qsS+ywiQl8FYryEckZSiUI2/wO5MgKydvmobYa0Uj6ty55tGPdn4TbqPs3dOs/BqVtpZgrMVa7dKpahfgP/rVzUnUwsFYQK/tRV9e5dIr2D1XAe/BvMVn8KZTmIq07swqThdl3OWd+C8idEvnq3wLPBaylRVX10e5R8u32AnHgXFecoXU2jPGe0JpV3Ukj7Uv02kwdjcRDEJw6A2zHWddZAnqeRWtW51H+lw49a7JZJvd1C2UZyPlfkfaT26H0AAsQyUvxGVrcx7kBceEMtt9J2T1qQW6X13IWFIDOAG4BYA== 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=lcEcWX4hKs1VAo14S1MmGo2GVCzhwm3pr/5RTgDJQi4=; b=C+uvm5TRUudCXGV0Y0iVvzdQ0NDonN09lIwQNGiya9DTutBvpQdt9Z6+yjS8LBgbqrwyFttb5Tzrr17FfmYzUCGiWc+61cKFdQbr4TucNYnxyhp5r5aK08awsbk+fNBFvSQL9Pg/FC4zp01JnmbhBcenVHrfdAlsamklRBnqN+lDU4MhOU7zRq7Q99Zn1+7DLzCjqHVd2/E5j5/sXz8TpP0PywnWl2QigoyGl8J3oqnGjUC+15fwGM68CnlrKDH4QZgHJzV1fjuKXwmXfCASgMmgoKA8sYsIdwv67Gwfo9kSkOgI4p/aUR1H3CSpM26dsG24S02ScKzOffF00sUn+w== 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=lcEcWX4hKs1VAo14S1MmGo2GVCzhwm3pr/5RTgDJQi4=; b=gN3oFc7C/LH0bHe2Uqkpks9JjpIx5R9kixfFLLZ2HCBop1JjEe/sDtbLj4qrnSpLjpqjM76l7ce2INlMrMOG8M2GLLUymmkGGZZDezxBdMwvIX5otEvIBD71hA8wOUgww8zf/12kn5PRReVoM4EJTbJ7FDhlDeqSQD5sSfKE+26oyoanwr2KHVZzezxSqM0fHxVP1SE+uFaZyuWtU19qMoF20TEom0if9a3kA7l0BPA5dxTJ06b49aLRoq4I1xXTKH4h8zPCnaeoS0O9mOEaRd07aObG4VTIn3gUTviJ7JIcSNBQcjlQZZYtJwv4fnSBYYO0moXMhzOdN26ZVCXjrw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:15 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:32 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [rITMPvw7Q2G0Dl3wnIu5xWFK6q/fbu+Vl2HURwRQQN8=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a563678-abc6-45b9-9d79-08dc556dd267 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ofUiZbQI+sLT8IkCYXMyCPTi+zKh+rox3FR+YgfGzuD1mKIoRYfI1Sh1CISv7UXHNW9SJwqyU5vOMMsQwd1nyPXNZpKA4wpEy2eJWqTBBNekjUCVViuAQYa9DPxVHcIsvUeZYS9GZbsygyiNqq84yEP2afG4GLSP3zxQ0MqNDnCWCfA9xpzyqHVmkL+tU21dyyEXgmtsYRhgzwwscwQiTkzUMivhC224xg1tpNFxjRSE2YwJnctAgKzkGJ0X40I894jK6pdrec0JsWzWnFp4ZaF09l1w+fTqZz1Zm3tP/pd4D3BNVYfiG01+S3oLFUku7UrGtLSXaiwHHlMfgTOlRkSTBdl64c+G3H42dsvpogzguN8gvKJcu0p8WpPhriDiM+bfcX+JaGjmEkCYdNjAGsR3xRDD50bU4UDxBs0LgrAp2qeHQbXedg8tYlQjtJHmGmHXe9EFCguLxM1RN+ntbwjvAuwoJgjHJVo/ZN4qgwS7jVDUeRvpjHVmZrRo7wkz6CiQrRgaMuwAonVYiDDOAbqZwXmqj634HYoFwdKbPW6jBxkNjLdxYusDF1OdG+sdSOyCxIqP40f3Lk1Av3gtrk3BbQqT/rXEUFF8UqE5KTIHCHurryezdLoPkpmhlO9h X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HWOJZHNYk7HinqyqK0JsI/bqblmMH6pOSo2VlRr6tKqj5OvdOzw14vrnEFHR1Hw+hHu+DaKhTx29w/d5KC/mDbxZo19BrdDNwmeJjsm5Jm5otwXIHippMcF42/r4LLs6vvQ810HV9BazvSguD3ixG804s/okiIQiZAONl2ZSblQ7S6H+DAvtKWh0i79FPbRjCJpTv4n/2RzdziEIIZA1+9VOIxiPQ1AwnAaR9Egbe1ziBXcCmOyU7IHAmx/RMje4h7SptpQ9JTPMiX6BWV1ctA5EK9XKzd+Py68BS2DZMlPmeze3s4IrH5oyj4tZF1T0il1T36dNqMh1LIIu3Ng6xW8nLsRJ8oiNFGCW1MTOX+P6FrcvLGGNK0jMZMHBeGjDIOUi3uaGOJnU6ofMNh6qEEGatdPf06I+TVvwadQbnaEI3Mlvp9M/u3PyEBnXBcAKI4qvJp8kgTYqvM0rX36fr2zhNkQbZ+Ic9ENgE2Sd84PfLRL++zsBQ2K7xmcWvCcEENOxHAIpzyluDYRiSBYekTOxY/PrexIaTAz+vKicpTFvbtqySfm0MGJIH/pAmYrVgQGcUYeaKx4x2Ag6JLsCkrPjjYXFTHrQHeInXUATAZBgWX954hKqKd+4nkUwXcfB0qLxGOGLLGxB+GY40zliVLrGQRIG7nmKd9kYFAVLJ449tNXbEm69br1t+RylON0jQTkO/ylK2KoxGk/nEZ8BikKbOzLaK5zenFroTs87pbiVWPB7QW27Puay0jH8EsQE6WZK9WMn93IHpW1FJnkA/Nzpkj7nP6ZzHL/f9jkuvmZGaoLYb3tYwyCzAxmnXDUx6ABOLRBYvLesFmOaK3yBloQZod2Q8NhrLNhAzDKGlCJ2KTp8IFTGC/a1X8teQP6QUKIs8XJ8MTgjuHII0XeSi0Jdy6wqZTfmtakDkKVjHLqveaqDNhh6lkFoN1BitlKsy8TMe0CJ1BFWz+mLYINItNXEda5U9T7424jzZfOuncNtbtWHyO7/8GCPRhlJBmiSic8oCfRF9ZPUrC45T7DEdm6jtKawpXoeacrBV4jQnFCf95vRq3a/QW9ccLijoGt4SeHg8QHlK1EllCKnv6Ui2onJ6/WSe1fN/K1+xWMzZX0Xzpn7Ab/W0nLkv/XhJ7fNTbHafZ3Di3c5/69pNYW2hPE3Qh6WplcRO94Ta8oVMMirudZS0cqxWZG4Ye3VN5BXNaDpx4dJ7RieVzH84SERB0K2cLKHq+bI4qdBfQ0fuxLmP6t5uIObtM7Zyyi8Uu6VXgVXRzUVhL5i2glVGMFO2A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a563678-abc6-45b9-9d79-08dc556dd267 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:15.2117 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 09/15] avcodec/mpegvideo_dec: Remove obsolete current_picture_ptr reuse 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: DI1wBQpIuSdP Obsolete since at least 74d623914f02aa79447df43a742efd0929dded04. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 1059aa9825..9f674488c0 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -325,18 +325,12 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) ff_mpeg_unref_picture(&s->last_picture); ff_mpeg_unref_picture(&s->next_picture); - if (s->current_picture_ptr && !s->current_picture_ptr->f->buf[0]) { - // we already have an unused image - // (maybe it was set before reading the header) - pic = s->current_picture_ptr; - } else { idx = ff_find_unused_picture(s->avctx, s->picture, 0); if (idx < 0) { av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); return idx; } pic = &s->picture[idx]; - } pic->reference = 0; if (!s->droppable) { From patchwork Fri Apr 5 12:41:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936303pzd; Fri, 5 Apr 2024 05:43:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRzDJTlQ6syTmFXH5FZkin3S8EnhmPQe1rcpJ/0WOgsihTN0hXD8ben7GsIbdCQ/j50a0o5BnHIOkUggs1wk8xDFPul4AP+O7goA== X-Google-Smtp-Source: AGHT+IHKJQoPzlgOADSlA4FD3vQ1v5MPVv31YOnxQlZw5O4TuTSokCMIwPnoru4Q49rHFBbFilLL X-Received: by 2002:ac2:58ca:0:b0:513:aef5:b431 with SMTP id u10-20020ac258ca000000b00513aef5b431mr958036lfo.4.1712320990869; Fri, 05 Apr 2024 05:43:10 -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 y21-20020a056402359500b0056bd18934efsi741151edc.439.2024.04.05.05.43.10; Fri, 05 Apr 2024 05:43:10 -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=ABUbs+iT; 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 52B4F68D1C2; Fri, 5 Apr 2024 15:42:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2091.outbound.protection.outlook.com [40.92.66.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BDA168D1AC for ; Fri, 5 Apr 2024 15:42:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hxLmH4Xoy0YFRZrEjzMaHgk5sd1sP5kNr+SaiqQ2dIf6dAwZK+j4CbZOgxeHxW6/HM6D0ht1Suc1XxaV7bdDcZSxTrm8bRXpZFkEspyuJNXEPdDxTcgYK51U/NMUfkIXcQmzYIrpBueDV6prJiFTyZ5fbanQfMGCTJ/Gwt8pESl1XeUrCVE47GvjPKL2Yfi8buHFzOCAqZc8EVX6jye+E4aO5rQX2QSnWCnxIMF/jveFDVqgX/8T14JY1YLX1KOYcUKr6kObeFax61TeaemyVVa4PemhIqp/Ijh+IiSVM6iMQK++0CEfb674NpZtsg4PnYECITGloBKDseLjB0o0aQ== 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=8Emwc9RGBdRBrWB5+N7CERh+OJ1Z1koDdPVPbSAgP2M=; b=oZ2DJOgnqlqQJR/tvMBPCZ/PDlnSkjjcua2huao+eg/1fHNzeu2mXIkhDdNsIoCgJkloHOR61DuQxyc99e8SB63PIubXWIA+iCq1H9I5PFfpb+aI7f8ehKaQ4QMIwlgZIVnlmpLbs+WcEyQVbNKKd8VJJuNgIpPe8ykTBuapDE5HZ5lKtQipm7w1PQ7Yuzf+ZhEYvN1zqjGJ6oR7XqLvup7VVhIA1Ex+utrPJGOf5ohtW4Qe/0GUefLCYy1gYZzQBGTrRTvJTy8p10+h4VbflpthM4h312/UkXcR1oXAlEBmDdJ4mYBggYi0snqw0ZcYl3nmbP3Bc8H1PCWmd4oP+w== 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=8Emwc9RGBdRBrWB5+N7CERh+OJ1Z1koDdPVPbSAgP2M=; b=ABUbs+iT/myXZuRbH1iLdQL5wjxecX3i07+sNCLoaK0Oe1ymFV5js9N604PUWlOPqiRBcpXGkz8Cd3g+sYbd6bm5FSV1SqUg6goe1L6BgsX7ryuCBL7sOdFY8sA9j5cOspm++rK1ByPM/f+I+gWximgyO21lV/ljx7aqT4z0dsTVkwAo+m4+QzE2DADteIM5pu7gS6204AHj4OM8eaZogROPQYhWaB0fskocqq/E28MCYp7H5sp6S9s4H7AIeBeUyT/VmiMeIolUeh1HOljR1yhrkiKHfCggPPqXFZn47oBT6Y1/8oue1utu6mEqBpoeuKp50FHRnu5v8pizeOgpHA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:17 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:33 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [mSBCaC3zvoAufPwWzd2M8ntlo4gpTn+O16HhVKJSVOs=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: b7d5a264-0821-4ee3-9e8e-08dc556dd3b8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ilsGd85WxSFap6AnoXMFIM4caYb9svZHYNb1pmaHrY+iHjkg9QaSbPEtYr4ctKSN5ow9gOQ7CCx0RJWC9ITempiS+Y1zmvBaP1Lw6OQgj/iCgP2Z75/OpyWIEXLN7uTEpzEEJAjYeEVq2OoERmMlh1gWppNBJAanNkoCdQYKE10A8gl/Q8bpK3ezGDf2Coom2GttOMI3TzvZCuJyxOK2QaLc15T4zLdAt4OhelzGuv8u4VF4DHP1+OkHVnge40TVDLHDKmHacYhZwWCG5NMhgfuPdekEJ4h3jymHOU1QYCoiIoeA8aeD1V1MwUkScdAm1a3KLJ/XDoXE8dH7bGA7nqu+4sdRfti3axArJdtop/iD07hd0IcOGnYKkINgGDSKXLY+XJjK4lmcqZ8NPpQXYPYiN1yDllFQCowms5GNGc5p6Vtq10u1BVRG+BeeMNVX7I9cPZQ8k+3/0tdM3hW7JnYHQszK2qpULyjoig93gNtcDeYQnmVnsoWu2d6X3t02AhpUVLz/cR6hJDRSnwYAtZy9K3rmPeTi+TCFyc16a6376BcSgb8mTBfNeGXn/k6UELvA2Szm1AkQwkxqNMYwHRdVUta1I6MWPbqmlQZEnfm/6XnMQj3tZ5BwFI2tnCOz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LEtnQ4G3mEJrdn2F8rCNk2blbAYatmo6RxZI78uQUj9/PjYABz4sZsyx9tJlR+Qj8Ru/PZ2kX79XOq5zsGwbmQybrsRdQXO2YfbOUshj2PFrUgFXFa6Ye/zLXCNF966EfwydXmHbLz933GJM0IoMbo11A8CLbg8XVniMbGByDB4GIwW6bkJdoEaLk3MOQgJticfkDhUVMqsmwJgReidJOIG3lq8w8m0SGtDEEp3741Em3hVnVb/fSdYI+N3Iq9zNNFSsw8GxTM9KtiZSSXY2jgn3CI6E9Dr/ftX8KB1o9m3epQU08shkGrY5KDpE3+GyHFSPQWExUNOkBVlWfKCWchLD+4r6k5b5ZxlK3Ce3tjPwmhAxV5/kCbh7sQi5xFfJI9zIMtIIm4s6neLeAdjKav6Kd0L3OPaInZlpFJEpQHGIMRcGXKx0oXmMi7y8hpF40oBTFeN4O1cKJJ3Ig3s6W4hNxW4VUz5TZumuoxRoBfwk0oHJJ3pylmPBgtpPFovcdrCPohh8YB/pbwdPEj9rLgl7XIWh0p3YdLo5bUFOCGKAdofq2aobz1VQ2keBMXGl0moAtj0sId1UGKo6Yxdhc2zDSBU1bD/ruIre2axP5zJBDU64HeXYUTFHH8rMmB5YCj88nlM5mnqQZgnqbZDD2BXmgn6zowGUY5s3PiaqHmFxghmaLdkznF2dGGOOktYxrOrAx6hwatroy1wvD+MyvDmgd7d4dUhyJ/yr65fL05TYjCfRN1rNzxc+72tgXzgY9wa0HHp8+a29Ohs6Pnhu7fCcrnXeOsKhXvVZ4bpav+tY3PAkgkqtZ9+1RZxKZCZDjzCNVPitKSMXni69i5N5ld4LOqt7jtXf4AWhr2ap8bNNje9Gn0qBXx1RcfIXpQ9TxgKglDPehFfvkv3F6DoQQBTR3+5s8Sxltyc+8oF3XeoM5HEipbOc7NMmIDo5JW0nLdnxUItBr8mjrRPfuPQIL1lyO2dERLPeFwt/kasR8jACOiEssPfhxf2rTANke9kW6w+BZbIDAKbqnNHIn18ddxQjPYZ9ZJ/L/6haGc+RgRDaxZcP45RMW0XZVH6u/STAu5tpk1oOm6XgMQwsG5wnUMiMudWSRMCQVX9hZ3zJnJiJIfICadxy1w2LLm/xc9UT4M9qVadsPUZI5jjIot/UiJ+4Kv2gKMBs0VaPyxttzAJ+ZkNNgu1oBTI+SB0fEjRK9VbMUew+3H2kc81YV6oJlfod9A/yrX4Ret3FFId+AQBJwreV3RTjqCkt6lGrGFlrPGiK661jH9S91rIcDmCBHw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7d5a264-0821-4ee3-9e8e-08dc556dd3b8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:17.4095 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 10/15] avcodec/mpegvideo_dec: Remove redundant code to reset keyframe flag 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: xuIDKYqEjT/u These AVFrames are blank and therefore the flag is already unset. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 9f674488c0..4fa89e4aef 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -387,7 +387,6 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) s->last_picture_ptr = &s->picture[idx]; s->last_picture_ptr->reference = 3; - s->last_picture_ptr->f->flags &= ~AV_FRAME_FLAG_KEY; s->last_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P; if (alloc_picture(s, s->last_picture_ptr) < 0) { @@ -414,7 +413,6 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) s->next_picture_ptr = &s->picture[idx]; s->next_picture_ptr->reference = 3; - s->next_picture_ptr->f->flags &= ~AV_FRAME_FLAG_KEY; s->next_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P; if (alloc_picture(s, s->next_picture_ptr) < 0) { From patchwork Fri Apr 5 12:41:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936369pzd; Fri, 5 Apr 2024 05:43:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVmX70hdsQthNcZlIcYVcc/03afcx/wNFT2MlVksm2sJ4W88Fn3Rkiz8tlmH1MXLy74MXLxPhkeypPYPrDhddv7CFWqhDRvnYUmRQ== X-Google-Smtp-Source: AGHT+IGbcWrSAL7xSsJwZEUqqSpR4IErjgzkZ1YMBbom1QY/W0/PrEdOSjXOhXL559svMzReoFWX X-Received: by 2002:a05:6402:35cb:b0:56e:2a2b:7326 with SMTP id z11-20020a05640235cb00b0056e2a2b7326mr1107618edc.0.1712320999167; Fri, 05 Apr 2024 05:43:19 -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 x22-20020a05640226d600b0056e3147ff64si562725edd.638.2024.04.05.05.43.18; Fri, 05 Apr 2024 05:43:19 -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=uziMoIHL; 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 6A4BD68D1C9; Fri, 5 Apr 2024 15:42:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2061.outbound.protection.outlook.com [40.92.66.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BDB268D16C for ; Fri, 5 Apr 2024 15:42:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=acVoIQqXp5v9aK2hqQ+ckIjjHpOvqfnYgdQft3Xbv0FtJTPMnBf2Udcv2WuyJ1e8lLKyNJHRjj03AXpvrbaRglNEDhIKUVUxDlYVyFTEb5qWa1v/x0AMaJNKrQP1vPOJwf+tq0NtL1Ao3+sg+vVPhW2bx7ioVeV1fZ3iXxkPn/Tw3c+9VImlx8Z8rsdymMzmVKb5f5kiZpmT9by+7CBj6QAC0tesjkFY1B/Kj1kJPyWZm2ApuZUL0/x9A5ygm1M+BGdBJnDeK0YVgcpE1SCk1ErufvA/5eEto9aeqIHwIBKPHsG0obolj9JfRJ1zgaEANjeWd0FcKsmOk1GtU8CuyA== 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=H6M/nFYxN9xTMzovnzB4TA4XC5mrKPBBrD2WmyiX0Ao=; b=ByeHehmQhepD0Fb/eQ9SYVdlV8qnp3i97I3j1QAccFjEaFsPHFSdmYxay00JyBf/IsUAj+t4RWBhgWVj/DAnoyn9lZT4LIOsFNO1BF+51PXvk4LryzTjhfG77Zx7IKiPLzapGsoTa9VP911IQrg23lx16Q4gmVKUhoG6Y3xsXHEfOLxcbaOCOFD/WrqkkZMHADumo6zUXwCABWT4BOhAgAVkOkSMSWCVbhcEy2NJ2YSSzXdGlnFRdBsYgppMMyY8yVyFWiD1Md29n1pd9NUnRJGKX0W4d6B47LH6snvPVEmhOaFgKnWW9QM7pai/5x6ReMs9/4a8DrkBUyOQb6oigQ== 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=H6M/nFYxN9xTMzovnzB4TA4XC5mrKPBBrD2WmyiX0Ao=; b=uziMoIHLiAI1zDe/kRDnVsFDIrcuXj8YXNRvTgGZIqQoqh3RFGpwtfRfU99mAN4Z7d6xRPMq2n+TGKcDL/64TNDAPa+Dma7R2+k2TuplQoz4DcNl3V07J8wQFHOsf3fwlypl4fYZq0IxwqF3Kqr0uzrLUu1oV/T5ldllYlX2v26z6tdSGcQ2ImjD/TwSXMGeGF3a43QUGn8Q48Vdj9oMwiIsQeME6m+LlyAawvodPg9QKyFxrQ73K1g3Zp3FD/I9uXf8ed0Ey2AB/w5vMV75ijrAE4dpb0PYdvnjweYIfxeG3yyrkVPFcSiu5OeutrRqKgUc51zLtGLLv2HWKtQ91w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:34 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [LNji7NMZZVBVZN1YlNwehv473KvzM8wNTp2LIyDbr6M=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 2f489578-5f54-4ac6-445e-08dc556dd8dc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K+k3S3yzeBk5kbzfROH9KdvsvbR2VfkbZwnSh4u5w7vYlahwIn1p3R6z4tCTC4/9K6YOoMVYblfC8NQ5oyHovQHjUJ27tKT1vbNOzL2YTjoG7eCNV9ienmUL/2lFgPBeBqkP/4gYBBfZ3HLojeZGwmN6B2zW2Bm0rcmWwhdcovZoLGddJCDmuVAEL83Ofs2XQQRWnDCbFYNvwR+aW4cX4QVH+k7jTsaNLynguHCKpaP05Zz13pTD0TuV5MRmYUc1bEhlyYD9h0bY9S9VMLsBjnIhYkiQY6GBOu2ijz3/QVUqgQ0+ghIG7B8zbv4ufsquu4O6714pyps9QweF505zebZI4RPg5yuOEm0QNjgKva7aduEQhZ7PNd6cw+smy92s+I34VdZNQ/8nzHtVkPMnyOQ4TIaHrRNCXMagd3OLXliWiaz/ZdD1eJtNt4cva2AVD7rq+k5Yrx9mwhAC2rPwJZdFDjbDEyEAEKkbydTF6p/q3w0en5a9lfTFizCBd8tJbygF24IaZkmZLP+3cXRIWPb7RqzhIIJjAXkA60u8jx48XHvKnbHvjsMd1HMJtnG/f2ImU909sxa8mgjjX7f59fwlHqhyvHQSZeDmNgZo+4V6coRUEgswLwHtWGtfqN33 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: f2rcE49+z/39QzBlsQcjfV2mZa8cdJhpn/lSRBQbEe+LOHar/JkrP5D+AmsrCOHLae9nDcIdkCoybUkxw7EFsVQWtJVA+fznw3xfwGX+AQ3OklavvAEmYYzwY5IL7zJi82krEO6e7MQYjgA1GN9rOagKlPH3L4wHUOMwuzzkVgMa86w5PkJi7zMX5k5EelVPFfmRmUUhsW38saFeV5i2vJ/5xfRPw1V9F/HOV99zbnYlYY61Pq2AGI8yzL1bAr+6DmK4vHgJ4q5t0Pprp3hI5v5D/kBDtzmnQ0GqImHw+cPP//f8ux7zeoVGZ6BVF8Y+u1YMqxgh/QNS3hR3NqUroFSzJ8JTTgckAYjpAVT12FaB77QOskNWWDlCymhmFY4VjQiyK1Q35X1xTTQfdYUi2IAYLjjKKQ6a/SXX+O7e2iAoL4Vr4CX/4OQdHUZtAhXW9aTzljJ3abgmhClJD3F5zgZny/Fmb+Mn/OKp+vuU8cj1Ms1p/wCr/zbfVdX5cYYSyThCTT5aovs3eHOOhL4nlGcbebOE42iyxiDUDELFP/T6QkUllSP4/a/jiVrwhEqfyUpuEWCuevNMnxXSoxTcr4Xa1P9GLAGQtRGh9LzcV2qhUBAQXoaxLQLRf1B9OQvwaL8Rge8dR56+J1auZwRTczT/rSutxHBQDueh6xJYnns816ZNzAv4ENrjidlhiWCVqeIh/jfCgAzfKnUcnQ5iA62dvQcYbp82iAMWiayWMIegQ7FCRz5I3ToVmXotgDbc6gaO8YfJGufHSpZgnhs5DeKsO5dlTmQfMzhfzbDn0lBQ/d9Rbst5HYWOeBdgmNy1vgl2cCCqEbZuL6wINkDZF3ew6KnYcdGXIF/zo+GLSz2bjHM58EgZ2lkbcgW3iHUhCmuEh0cZpI1ZpjLP81xqkp/h3ubUzb5wbiYo6oFoaHLhyKDfedzJbjfFWiGYcgQZUzS2SJHXx9Y+DiPA02xHrZVXwB6iR1YF32BQ9/FFOMEeGYMmGAZKVjEnn7/ZJImif4zElwLRfEvA/LWSH7WB4P2cPZriNY7I7RbINXy0r40pm6ewlo69+irLK01yyuuMxrKtO1nZKJBYlsjWt1fa2s0L5xlcNazSyhLcjiTrO/ujgKKVA0lOIpcOyBNYfd6568IhmcBXqCvzebev+70Ff55on/wufvTUaOgVRgM8+pumQyomPJEUEr1ZcAvjocPixVKfVsaF0azoaCGx1ykmfhq14jKMT2aEmTCBH/LGiTWa4icbulR+6Ff+FHx5mUFtBsOxqt401ZSw0XDaOYo3Xw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f489578-5f54-4ac6-445e-08dc556dd8dc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:25.9939 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 11/15] avcodec/mpegvideo_dec: Factor allocating dummy frame out 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: XeDFy//ARI1U Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 64 +++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 4fa89e4aef..b6ef4e5582 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -270,6 +270,32 @@ fail: return ret; } +static int av_cold alloc_dummy_frame(MpegEncContext *s, Picture **picp) +{ + int idx = ff_find_unused_picture(s->avctx, s->picture, 0); + Picture *pic; + int ret; + + if (idx < 0) + return idx; + + pic = &s->picture[idx]; + + pic->reference = 3; + pic->f->pict_type = AV_PICTURE_TYPE_P; + + ret = alloc_picture(s, pic); + if (ret < 0) + return ret; + + ff_thread_report_progress(&pic->tf, INT_MAX, 0); + ff_thread_report_progress(&pic->tf, INT_MAX, 1); + + *picp = pic; + + return 0; +} + static void color_frame(AVFrame *frame, int luma) { int h_chroma_shift, v_chroma_shift; @@ -379,48 +405,22 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) "warning: first frame is no keyframe\n"); /* Allocate a dummy frame */ - idx = ff_find_unused_picture(s->avctx, s->picture, 0); - if (idx < 0) { - av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); - return idx; - } - s->last_picture_ptr = &s->picture[idx]; - - s->last_picture_ptr->reference = 3; - s->last_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P; - - if (alloc_picture(s, s->last_picture_ptr) < 0) { - s->last_picture_ptr = NULL; - return -1; - } + ret = alloc_dummy_frame(s, &s->last_picture_ptr); + if (ret < 0) + return ret; if (!avctx->hwaccel) { int luma_val = s->codec_id == AV_CODEC_ID_FLV1 || s->codec_id == AV_CODEC_ID_H263 ? 16 : 0x80; color_frame(s->last_picture_ptr->f, luma_val); } - ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 0); - ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 1); } if ((!s->next_picture_ptr || !s->next_picture_ptr->f->buf[0]) && s->pict_type == AV_PICTURE_TYPE_B) { /* Allocate a dummy frame */ - idx = ff_find_unused_picture(s->avctx, s->picture, 0); - if (idx < 0) { - av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); - return idx; - } - s->next_picture_ptr = &s->picture[idx]; - - s->next_picture_ptr->reference = 3; - s->next_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P; - - if (alloc_picture(s, s->next_picture_ptr) < 0) { - s->next_picture_ptr = NULL; - return -1; - } - ff_thread_report_progress(&s->next_picture_ptr->tf, INT_MAX, 0); - ff_thread_report_progress(&s->next_picture_ptr->tf, INT_MAX, 1); + ret = alloc_dummy_frame(s, &s->next_picture_ptr); + if (ret < 0) + return ret; } if (s->last_picture_ptr) { From patchwork Fri Apr 5 12:41:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47822 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936435pzd; Fri, 5 Apr 2024 05:43:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULeAM+y8f0eXbcV8XllNUJacy0+Qx/DeKFSokYN69aThBhA1ZQfLuKZd5pDBereTilbb1nV4juYvpxYbQF2IrxfUMjheRKbErTDA== X-Google-Smtp-Source: AGHT+IHZa7Zv/spwy8QA69GAF8/6U87QRXKVWJ0SkqWlBJohjTJ7HKTjJD+d2fYSIo04OBG0q0iu X-Received: by 2002:a17:906:af97:b0:a51:9ec2:e06d with SMTP id mj23-20020a170906af9700b00a519ec2e06dmr753469ejb.29.1712321007623; Fri, 05 Apr 2024 05:43:27 -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 e7-20020a170906080700b00a51a25bcbcbsi690266ejd.187.2024.04.05.05.43.27; Fri, 05 Apr 2024 05:43:27 -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=YDVBWdn9; 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 863A268D171; Fri, 5 Apr 2024 15:42:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2016.outbound.protection.outlook.com [40.92.66.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 228E668D188 for ; Fri, 5 Apr 2024 15:42:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=djFxGPX1H7G4AHd4NTQHU3sY0EaMFDcsRS24BP8dhWCQ1awVx7jbD1IkIASxYFXVX571z4r290EmSEVDEpl+isgPi3Jov6QdNL2s0tc8yr981EtKsHPcesrLlh1mp00xXJnT5BIabpI9gp7C2rsh8eeN+/mf/kPH+5QqhbCwcMClpb8h6zLaHrVkvgrK+2fuF3rssTd0Up29W0L6rV7HCTMioWX9wB81e9ceIcMIGor0y7uOQYfyV6z5VxIfLyzeqEmgSgOUZbeHY9VKbZJ8FNY/OW3lpad1PCiYdZ01NqNXDSMJyZrNrwpCp0PW9auOCsd09fu6qtta4z8hE4ScAg== 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=ZI5pl8FYsWWoOyYGfoXuLmxhM8qWuNME98A5Vul4688=; b=LceEpM4qWfiux+YQ+LBxcejXRqPmdek6+xgHOQWef6Br5E96nabiRJrEg/WlT6QJc/oRDoEghWUcngRtApFgF/E3Khw0ryXG/J0pQ6PmZ8vjNNrrGnfYP9UtbZIHhrQ4IwwKPF7eHGbAILxuasXJA+Y4zFmDHUke1pxDpATNen/1RLRPZSJBXHK/aCnpIXsy269/XUsFxDdutcd2Qag81BapdwVDA7g9zM+L2v3iuJ69FM8e4AwuA9YzWqrjvIYG4JNgKSiScDrW+d7IlVa5UNqkgONGavDtqNsrTVpYoNu6Zf2kBlPD4dVJDnJuoKQgEuT5gTCi9M08+IDEwqAylQ== 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=ZI5pl8FYsWWoOyYGfoXuLmxhM8qWuNME98A5Vul4688=; b=YDVBWdn9dwRwZ547ykfYGyFLf+keVcyZGcowZF3W1Ltf+pqr694PpNspEi7YoWbcyS7FeCmRKtf/QuHFZ7wIyfDPjsLLgZgHdgpKu83QEWadVbuK/eASEMMC+LPwP+x1Wl2cHhuoKdRpfoiarJwHxRcDcvUn+B8Et++7JJNXhjTcX7zzT0niNbCr1Y1K/ATnenR9oyJQUYDEHGT3GdGgkAA1wfuelbtears4gNLxkIqe9WyQfAU2P3ZW+QkrUpFAAhkV1GaKmOWk0ElEB8U7Z6cYLHHRp3mURwOotdYzIt+FGKPfHxTzN/ISYJvXa6HAEM1qypw/BZBUoUUQnocNnw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:35 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [4iKVknsJ8UN1oc6TLA1AToCNx10x6pjjZ9/98BQARBc=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 53e493f4-6924-48dc-9ab4-08dc556dd99e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: of3dJhicM/vKECXK4/Fup38i4HauTQP5eQdAXjd9NlPAwrKKn04cy3UKNv0m1zh+vmFY3Az8WsWjn1MFmrx/3GHOsRR1Z+PXMFpB9poWSfV6TynE5kLOubzXlVcKtF1HBK9KWxEkMJ9x2PeZOqqyA8Lj+DfT7z7zyTnNkyL0nCdFG6uH2ObhX1QARSQzquiRSXehUs/ev70o+fgmqlgmJBDZ9xpGV3hVoQlRmzu+X8PkXZLZLKhIq16vhP5U1wZskfqsK1xFlMw3X0jsNCI/iN4jWDUcq7t671RMImlLYEeYgi19Enua7LV0PchWuINw+VnFc0+1rGinMltAamWQXvapUaTiD++26r//SqkprZSE7dji5aE/SAFv2wcVCkGQ+AdDAVmRAMeu0+Ncwquf4OUdT8hMmVQknQazVY4k897Cx7/KyBmCqPYbMk2FNFjgBCPOeDQWeYDeyUkHjsPIpEzGQN/WSCYM/1f5MiqsEL+aGM9hCYwtq1vGJ7TtYdhD8JGPi39zGbCrEkv2ip7/98XKN/IXnUvm/n3hUsCqtFsVvkNhc6ord3wwyyuv35tuiuVuYliR82nmHF4+v79gmVObgP5FdUyjNFk6Zpiy5hmHiw/l88R93FJKm3fXAm2J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2TFpcSoa3kVd90L6uBpMB+YMXZflwBm6oKMUfyqrp0A8ZEfdgAf2Vd4GTxCynbwynGMoxyUToMi0fZA8B+Xfx4r4vOhDt+vW97zHssct8gdqGbaRh58IeXHp01oeEtVziR+SJFOuNayMaQH8Cz69QNNbO5n321MfFdDejrVIwLj2zX1Ks8BMB9RyKNchxFb60UY9axkG7QAZ3ElMMjTDTVtcJlDkZm2rSnGJtxIaPKJdaTAUJ4POmvqJjO8ZYoGCJzbdX05kyeaWQNErvM1+wTuA2gf6507wTurgTz8f4JdTeS4Mt2LTfCOVWvVGqyW+xBMUDshgpNkGhJVzqKR68dwK+AsB3Sx1YYyZt91/ZUIncJRkvrtyVH9Ijhj+shSVscuViVwMaaq5WDiOlyGJy32RPqPxL0Vt/MINBxEsiRmpJUbj0KkMj0CaOOmiPcT5XbEN4GIZePg1aFY6ptp1OiOm2yWhRBbhACFfQ82TRhe7AVz4ryazS7GU5SavoRQnKo0gE2G2/961SNON7zz4Lzr9nrPHTQ85Yu7MEtErbf/cYyiewlJ3MMA6JHG2dHnHnMYom5i2eGxHzI37FQFWNfGAzbUZ73MSozcP2yrHuaGr6vvU1hia7MnjeJXDs6AHikhbirdsWiDvjYLasWAb7WOLOXK8+mJPkuK9RRrtKtxzj0K4hF7lFWqJ9/t3O0PPgc9ZS+aRWXG6So1AXpuMpWfueHhbHFgP5aTwJbm3FMF3d03C+WIDuPe7mBvEwfIUmCNukl5frZQuoB/wYoVzAZHvJYdX7grVsa40OtH1sylS2xjIc5Gw5pexRQcojXomqFeHgRFbjCmwrz+0VIGbdfx41hWpfU6mTgO331xJI5Tf6cRedXe5eEzZmb6TyB4FU2KFQ+yXPMHr2QrCUQCESJzqapA26kw9JjGcoKBiqMgAVVOcldDj0EzQ8XVXXvoCOaQYCVZT8AZ8ZF3gIgfmTNNS75uGTt50Hu4lRhK+a7su6fJhnuRRVF2/GHcL9eg7ryQM5AdWEGfTihso8IOUjQtgdKnnZZQWrGyA578l/gh13goCaspmlrPMzT4/gfSPwbgAFhaf8hIv0PDbDWOm4LtYfPqQ23ODp0wrT48A48K5Abxpqz96KQhwt0bQulQ16lnCDnEAXV30Oz3fF8YZq1LVXyNZd0sqCcX+ldZ2MKmpnhNAZJhPeSJkldiX+kNyy8StRkKd3AZpi6OcAPxexI93pxNjG9oyE2wmXgYBVMAjGjtIYr0flHplumPVI2ldiK5CbPHEPozuZKMFLwBoVg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53e493f4-6924-48dc-9ab4-08dc556dd99e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:27.6452 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 12/15] avcodec/mpegvideo_dec: Move getting Picture slot into alloc_picture() 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: z0FVPYRQgUmq Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 63 ++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index b6ef4e5582..d337a6565b 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -235,12 +235,20 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s) return err; } -static int alloc_picture(MpegEncContext *s, Picture *pic) +static int alloc_picture(MpegEncContext *s, Picture **picp, int reference) { AVCodecContext *avctx = s->avctx; + int idx = ff_find_unused_picture(s->avctx, s->picture, 0); + Picture *pic; int ret; + if (idx < 0) + return idx; + + pic = &s->picture[idx]; + pic->tf.f = pic->f; + pic->reference = reference; /* WM Image / Screen codecs allocate internal buffers with different * dimensions / colorspaces; ignore user-defined callbacks for these. */ @@ -248,7 +256,7 @@ static int alloc_picture(MpegEncContext *s, Picture *pic) avctx->codec_id != AV_CODEC_ID_VC1IMAGE && avctx->codec_id != AV_CODEC_ID_MSS2) { ret = ff_thread_get_ext_buffer(avctx, &pic->tf, - pic->reference ? AV_GET_BUFFER_FLAG_REF : 0); + reference ? AV_GET_BUFFER_FLAG_REF : 0); } else { pic->f->width = avctx->width; pic->f->height = avctx->height; @@ -262,9 +270,14 @@ static int alloc_picture(MpegEncContext *s, Picture *pic) if (ret < 0) goto fail; - return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, s->out_format, - s->mb_stride, s->mb_width, s->mb_height, s->b8_stride, - &s->linesize, &s->uvlinesize); + ret = ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, s->out_format, + s->mb_stride, s->mb_width, s->mb_height, s->b8_stride, + &s->linesize, &s->uvlinesize); + if (ret < 0) + goto fail; + *picp = pic; + + return 0; fail: ff_mpeg_unref_picture(pic); return ret; @@ -272,27 +285,16 @@ fail: static int av_cold alloc_dummy_frame(MpegEncContext *s, Picture **picp) { - int idx = ff_find_unused_picture(s->avctx, s->picture, 0); Picture *pic; - int ret; - - if (idx < 0) - return idx; - - pic = &s->picture[idx]; - - pic->reference = 3; - pic->f->pict_type = AV_PICTURE_TYPE_P; - - ret = alloc_picture(s, pic); + int ret = alloc_picture(s, picp, 1); if (ret < 0) return ret; + pic = *picp; + ff_thread_report_progress(&pic->tf, INT_MAX, 0); ff_thread_report_progress(&pic->tf, INT_MAX, 1); - *picp = pic; - return 0; } @@ -320,8 +322,7 @@ static void color_frame(AVFrame *frame, int luma) */ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) { - Picture *pic; - int idx, ret; + int ret; s->mb_skipped = 0; @@ -351,23 +352,11 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) ff_mpeg_unref_picture(&s->last_picture); ff_mpeg_unref_picture(&s->next_picture); - idx = ff_find_unused_picture(s->avctx, s->picture, 0); - if (idx < 0) { - av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); - return idx; - } - pic = &s->picture[idx]; - - pic->reference = 0; - if (!s->droppable) { - if (s->pict_type != AV_PICTURE_TYPE_B) - pic->reference = 3; - } - - if (alloc_picture(s, pic) < 0) - return -1; + ret = alloc_picture(s, &s->current_picture_ptr, + s->pict_type != AV_PICTURE_TYPE_B && !s->droppable); + if (ret < 0) + return ret; - s->current_picture_ptr = pic; s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * !!s->top_field_first; s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_INTERLACED * (!s->progressive_frame && !s->progressive_sequence); From patchwork Fri Apr 5 12:41:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47823 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936494pzd; Fri, 5 Apr 2024 05:43:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4B2/GBUKcOJ062roNp00xvT4TKkDaWrmwzON50uljMgkUKc+9evG1emWV+b4hi9EW2zJ5O585v9FRsF6acjfVDS38+oFJHHi8MQ== X-Google-Smtp-Source: AGHT+IFOq71lXJ0Mon3XC2g4G1xxrUibnoQmXZHYPmle67306MSxakyrg45+BONHQVgTzz/gcu/x X-Received: by 2002:a2e:7a06:0:b0:2d6:ba1e:a54a with SMTP id v6-20020a2e7a06000000b002d6ba1ea54amr1328383ljc.51.1712321016123; Fri, 05 Apr 2024 05:43:36 -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 k19-20020a170906681300b00a4e97320807si695287ejr.399.2024.04.05.05.43.35; Fri, 05 Apr 2024 05:43:36 -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=gwsfrcz9; 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 89E1B68D1DA; Fri, 5 Apr 2024 15:42:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2016.outbound.protection.outlook.com [40.92.66.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EDBF68D188 for ; Fri, 5 Apr 2024 15:42:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZOHE6sG1ag0DaRJUfz1NsTptl2ASwNsl3IiRSeJfFCF5AhPEy7QRZYtIYueYWChfCFX7CvPElxVImLTkwBLe3evdppIaD+Y9RutsqW/uVIgULEyQ83U648DOTq6DTzXp9kkW5cOqpWbsiPUNapbQed81K9XExRs4Xm568HwObGTfEz+6LCPppQTTBKhIlaLPS/AFoCcRl2IUJBrxonRvma5VPKj2tXrRh6o2mOPkxKmn6WFESe3DuiMysOWCP1wttxwiNwTZTyE2ZqnzgxDgx6+pwp5syf/QbeiADprljYjcQ6NYY5vAG7s/eRVANgXpgmg356Le4PuF3wcnmVlQUg== 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=X/fmBgAt3Ft8zXhDzBTZkp3FLLp38SJ3qNO4SKy7ucQ=; b=MkuYvvA7ATcm2KhtUcA3blTwzXtwdfGDF75V+WD6voKu8VK29x/9MIVaQz1FMAzo9t1y5LmJc+iLP5b+qPVZkBHpHldjNR+Lv9zqt00h93ghww/+TkxtN2wNfPh4DWbUN70FTyoahEysuwRcxMhC2xom5YNcVpYECAVeVKPOXOIo7yyj72Gjyai8ygoMV67QV9srMTmKVqkaF2Q0o1MCIRWpYtUqyuGZKX7lfWcTPAzGfBPCPUqQvgvKhGDC9JIv8UoE/gEM1lGbYbDpW1HMHLLcgqAM4X3hnyBaDwJlC753gxy7zx3dAcD7usZfj2BJNTdgmx48Tt6RhweGESOCPA== 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=X/fmBgAt3Ft8zXhDzBTZkp3FLLp38SJ3qNO4SKy7ucQ=; b=gwsfrcz9CEIQvteQdBereKLHhPyV/S9SiQ3V8tui75dnuFfexAA97LDMepxYmwU2GwbG1sDSuPVNAcoEBNPvT11ztQIQa8GjYf28nPHYCj/QV1pRwyU36WdNWWHK6Ov2WdvOHeYD/P9hybEUjnKVn3KjZU6dBCsY+zPKf9CD3d4Ukcsn6NrE5qG5nT22gXWCQCABlFWNWl4deJ4RFgILviB6Y6etj0rXrfcCGE54nvcAiQrymT/1ohLY5FAbcc2KqVc0Q99QS+vfN/lz6FJWz/oIPYeP3w9OR7iWRj7MHKWYcFbw20pNalkm0WCMN7MDtjomgWO1XrH5eZszOgXEWg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:29 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:36 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [cWCodnyLocmFsF3Jf19BLHpFgxCYVYepHuXN2hGOrSM=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 340e445a-a4ff-43a1-a0c6-08dc556ddae3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1hCzBkzcLhjdJglukEru0xPypxMtZjxyWT5CJpk7bwTdLMvT49px3+owfo1fpq8XK1e9+gZXS2yzLOje1R+YCf9Q1L5znkdrGNDZrleYw/PDSN/ib/mKPJREJBbkYIqQdps4m8CGFYFEjBuLDrjSJ6FHiWXkBYGkWjyPkzz9By7DkRrjBJisnufXsZsbGoztpNQLLYjdZrfdzTaG5VIn1pWZ/N5MOIiubroYoqTK8j6b8J7YNb8wI2qnQ6vcDOUNQtvNh1sfoj0m5EG/kjlLy3PAiZPuaWddcA8mJjORaftFx0ScvrILeUrc3vVEcHb9e8APNZxbQHwBiD2432X7beTNeNfRdYUwliVHuzWsxSX98aR6HucXp0idhInnbMcZzxDJhAd2bIsKju9rziV/h/pb3AbuuGDBk0XHGEbQs+HjP9j4s66s6sCU+bk6MKT38CIHuXRgTIps6LLWZUVzPTR4x2SxGW5P+LvbnLgIGP56ZfTgNkaC7kMgiKNNCOPeYCtuWCsJ0jpXwf4GqJMqzdM5cg8tEeLc695TLU8059xcve1ST7xjYno33dziB3yprzUgshJTEKPzq9Gp6+t0fok1S3G7NGYu1zgubw7/rPso8d45orSzg5IHfDhZxFZk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fgk6V2/u4zKytsC3Q5iXIIhcm9KXJ1okG0e8WkT/LQ/bQ8/3Ap+SvmWOUOdPMBrTi423MJf7ltjDOsHmI2kR3fIXMzwsg0M3Hwm4UD/pO+GJbFQzCJldpt+bL5b/UScThUvdipC5FaW5FF25mSgcckgDesVuEF9ksfzZ55ioy207EYyNNTGlBHH2MUDV3aa/fGvjMd0EHrmqKD+IY0RF2ubKmKafQyRJYsNSyxq+iERSgs2gc+4pGjtEYBwPhXZ2EvAyhQDDP0iYJi9kHBCeCU8MLObLHQlJj3LqmI+j1H4q/ScqKaJ0V9GBh9QtQO5U/1dg1o7Dxv2mKrBAFbqiIuAvFbBn7rx+zokJl7I5OrCc6nHNUZvCSkcljCKBbZfik7g9EuAbP32ALU2VA8021nC9Apk/EgHl8k3eViEKKsFJNyCCujlzxoQRao+LNpjrn2a/XY5bWLBBC0hTr0K4Q+U4oF4SY7LI9Oc/pFOsvEmOtlsOfr9d+sT6wHgWfvZSnzwtw2eHNmliouGvU2v82LZ5IbGZ0WdFvqL7rFLSrJdfac3RltiK6CGsaQENf9qJHPnRnGR4APiDO9xBNcat0uxB/s3VN0nNI0Fzfu5Tl72UqXgWVpjHB57M3zaGuQemIMwxiBlyK5nQz5w1rUJo11YagT7/5QQRpSj1aKgmEEbCgFutkR5DS222rMwTbe75N4C6TzfGWu0Xxcg7jkiy6WLwe7BLnyviG2RiCsax8NLbIZp5e792CwqjxmFOvdPf0ZbN0xTWxlmAs3iqB+c/x1j/DcJgY2qBbvRklvpiUuy5msot2Dl8jF7lSqOd2H90mmA+9ST7+Xnjlg18MuKsyPs9hUSotpML1xCgKUFmK48jBrGyzvZzqfCVcsZbp8BeZyM6hnu2FzcrpVs73yfH17jmGzXsI2GP/KEeolFyCUAQZ8X6WeHxmCpPDGuDx8Mdu3oL/FA7KaA4sW/tXra411wrptxcTu8CRuCCMfu7kJbSCWgZxkIHKb5ccdnlqcrT/7/JzMVYChlHvwxk1v6v1QAl+sGLm7YchMxRZuu5a2jbcj6QyxduD++7mcfdEFpM4SEpDSp19R0AUdjytPYOdyOKFEWsowNsXE/SN86wOztaIyjrxcPJc9Yck/asArNloZCV9uu4h23WXEL69uqDYSZ9ckBgTZDyQnkG1f/BjQMcPP98jDx7smfKv0JDE5awUoQtw7IORRrHAVxpdEX+T7g7kHwsT3yvB7I7RKZjDZK3yp3EcIi6uizD8auJriN9viY7wAdQchBGFeQy7Evp0A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 340e445a-a4ff-43a1-a0c6-08dc556ddae3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:29.4506 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 13/15] avcodec/mpegvideo: Remove pointless check 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: goKPvpZdX9Dk Possible since 315c956cbd14f021e49dac7fc0b906fad1672aad. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 8a733afdb8..7af823b8bd 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -789,9 +789,6 @@ void ff_mpv_common_end(MpegEncContext *s) av_freep(&s->bitstream_buffer); s->allocated_bitstream_buffer_size = 0; - if (!s->avctx) - return; - if (s->picture) { for (int i = 0; i < MAX_PICTURE_COUNT; i++) ff_mpv_picture_free(&s->picture[i]); From patchwork Fri Apr 5 12:41:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47824 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936569pzd; Fri, 5 Apr 2024 05:43:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJX5uhB9tC2+SaYAenoD73Ui9Mi1kbW+LUdfrkQi8e37UwtXjZNCO0+hV7HeePaepZ+MTnuLPagYLkCm0xoOnNLUY9Hi/TTTHaHQ== X-Google-Smtp-Source: AGHT+IEbDT+Z+x5PzKpFQGMhgI0AFnRkxy4V31Uhxe11KI7AaqWCUpx18xpbbze5n56/LUun+QYt X-Received: by 2002:a17:906:6a1a:b0:a4e:5641:23d4 with SMTP id qw26-20020a1709066a1a00b00a4e564123d4mr1192016ejc.1.1712321025051; Fri, 05 Apr 2024 05:43:45 -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 xa24-20020a170907b9d800b00a4e252cc23asi674753ejc.691.2024.04.05.05.43.44; Fri, 05 Apr 2024 05:43:45 -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="mdN/Gw6o"; 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 D1D0E68D1CB; Fri, 5 Apr 2024 15:42:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2014.outbound.protection.outlook.com [40.92.91.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F26EF68D1BE for ; Fri, 5 Apr 2024 15:42:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kHbMo0q2F/HETUhdKPP1Vdy+bDvHNrtzugZQrEc50dzP8mjV7ZnqoAjZBAQs9wTjptz6BRDE9UtsQfz6k251uP76tNRhQdH1a+b2755CLQ+K5oYErl6klBkJbfdr/hWSWqm6BGaTdgrMYmq6GBABmDQoSxUBoMABOjwYgwRg/EvdfFnozSmnGAvmQib2Lqf3ik0VqHz9n8ywyb88sS/P4yk0NDkIA1z5vWbRzAiwX1tcs/NqlbmhyF+Rkvaq7cF+fvbQebOnY1Sj2H6Mc7zF47BSSwrlY/uszP9uEP+bcokF1HC5uazhiTazfOcbPbQbMaqp+zQBrK/gwJnvE4dmcQ== 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=Xmv+0ZEyxDUm4fvffrNLvKYWh8rZEYX5Ag8ZN0Z4c6Q=; b=fduNRtjTFRirxLS5go+rh5hFG0cMjdTQDcWJ3yXpn7M8I9GdHVHFLtWajQggSqo8KJXHckapqYEf5mo1Mas+549HyJ43bI+IQerxm3OsgijRKTE9MLQMGotItJaHg2x0vO+qM3z2AMKyWbWvakQf70OLBWLRzHJyzDQluJPkvoNUuhpY0UHqx89hlnjMhucU5pdHp0xqPFWIemUjmz/QiuIHSF9SB8D/Sw74tUurTCzDMRkbsd0doSpfkJVr1CfQNjt0w8R2+gDG6qUfrtK3ih86QWiojEwdX0UvuTBvGxhk4ttgI+pJAsl8uorgwu1cZ097v1tyNfT+0+adoLlvAQ== 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=Xmv+0ZEyxDUm4fvffrNLvKYWh8rZEYX5Ag8ZN0Z4c6Q=; b=mdN/Gw6oB4INHd86FDMcVu/6YZkOBdRLMtqnduGUn9kQs9LrS0CtOgT1dxSdvtcb5mNs6sojKzBzsjd2cL1dqYxjD52wrOrm113mhwz4HF87AJ0qyDjbiaGC1Gs7GmEAXZCWGj6XDGxJtK3pINzZ9tvEzyCx8Xg8rzDRS82eyX3CTrJJ3OpE1cYUUNFLY2B70MqphXIjN483iSUcHu2BgyRYZW4OqehS9mcr94tK8qxvnVn69J0LtrKAGjm9LXV6WCWfuQvD4RRgsbGWQxfaQNf2W93YSL45QqPV8lcP9Eh2RIGA4MdBx082CGSNhKk2WQDviTzWH7n0wt4+DBOu6w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0278.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 12:42:30 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:37 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [7DUa0oF7cBsniJ0vmhSKAza6xgzM43b9wYsuZUDBUwo=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0278:EE_ X-MS-Office365-Filtering-Correlation-Id: d1bcf08a-def0-4971-4ab7-08dc556ddb8f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ryfmJvVPohyi5t/Gpdv/uqCYptYxevpkR0RoVEzcVBD00ov0vew0YCG9D7++Hlgm8YlEgeEr4o1UxXUUQWLyaB3QhHMjxR6Yttc+ZBmNDwhDOvu1dSs41AtIDzUsWUrGlIyr7m9aw3ql5S8xQFECIWd6pJtzHOL4kFH/i/1vvrE+TxEgLORI83D6VWmMwxip5yx9jfd+19sbpSQdilQK412RcG4fF4r8BRqFLtP/Ws1JdhH17+SE1T60COJn2NXd4IYk4H5fqktOhsWrAnhhQdusXYp//ma+nNhxT0xpPxtMZddGIlMMRdb2f8KDNVMNSqbs2cM0BR5YRdp+LYkgrUqjss3Vi9/YR8/263AwQVCLHoB1/ZJwPDui3WBmu4VPWo3dictMCgOUTF3OiqAVLK9plKLLmJOSgR11s6rJqWhF55P35egHnUEMq7SvwNKO+ocBo6TQeyUpatVn7W6q7CwigzuuxSMzWhLu9zbOAUk/ePUK4dWZ3f53Cv6ldpjVQcBcNWpQtGvCkMoWRbzUMz1ZOjgJysY/ZEfIx/Ss1MhI5iEBh2VCMMIpO+M6paV2rndQX8VEcnQkatVadlZFcNy/CVQUkFgzj5+s6h/CpYViCtQinfr+fNHDpx8uva07 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yJOBS6sFbst72K1Ot9d+jg20Oqw2IvT5rX1V4hCtl0fS7XipkssBJ88onIEjTrLOADuDjfPxa1HXzHMxIAO5lPPP+LhsV3EoseV3zPmm90SLeee+JY4guUIeYhnn9yXmriq/LmGZ57nMDsDh5509dFBXO5gzjKL1KXYukCef6aChYAb7q4CpT/d9L+r/4NlPPt4j+3GUhqTKZTI8R9ECAAD/jyovTkVpM14s8ZbbayedsoF/ofKvuJP6LWrSjtSKuqxTmdxizIv15MEfwvLMcKkFpO4EjyzpjDkff8406mWklWQP1oH5s0pzJ1b7E6bgwYCyLpO5k/8RMilZH25hFDKcxr0Vm1S6iptc+ZLmDNZaIN3XATYewhKRDBAtd+zlUFZGeISyDoKbD4jdgwg8EXqVYGv8KHtX9qyeWkM78PiiMzYK2HlzVVTNJvC43BRZBX2FoEVPexKiQtlcVGOLfFx25ATRd4a1OURBFTUFTQ/jnCWqWYFwAcMG833654+Rc44e5ausuJBwQaxj6n16KHH+9C0kvbmMxz4Yq4r9NfKqRydDbOecx9+LJ985MEjrOuZsf2KX9M4EL5XsBpA+s69MWsO2M+G1jEX/D1do0CWXwRAkAKjjoLy/fXmYtCBMcax2CN1qcRUley4jx2xnsRvS2OD/ekBxStgvgASTdCSEBKG1RJl9ZAUfJPQQV/s1Lj5oKmTdzKXlITEhOi4vQIUtXJb+04AzLj6JWqtvKUEGNaQPoEsJCK2Xh9Yvd+9BSuZFyd3O9jYv+JA0X8AXYiG33fnA+o1XHffDpPA2+Mbkx7ADMIzrIGpybFitlY3WoVbI73eH7n+WX4unQb2uZ9ycKTxc0/KcyIsM6JqwoGbd4qla3bZqE119hMQmtyoPRLAOBkHFZ7i/zS+8xWTsQ6kHoHLj1nsHhBVFHtfUZG0vW1gLWHO+PWZuVbeLwuHbWkl6w7TnrSd6DhZ9gfTPxYLTZHeV/3SD0COioGCec7vLpOVxhc9GWzlsr3tkIwHRUT1BK22EJMi6YlUEbtJ+YywAvdbYhO2xYSL6gz5oU/n16cSi4rrU8HcyV5hRwHBd40MLF0SSZtkzrUhlkYik6oFlrMj32wtXwIpQb4DaMQ4GXr5IzMNYrnDinKmprbq6oDvYXHXjB16KVyNOGCNTGeaKcYZAk4kCJLBS/BUR71jPcp+knuAQEpxlkpT6VtfElVaO1wY14pXUws8SJ50Zjzj3WL15eQ+1o34IBrnuMPQaCkqV2ag0/ejZCn9blR2edDJPPVQ85XdJ6PMCKqyHCQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1bcf08a-def0-4971-4ab7-08dc556ddb8f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:30.5375 (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: AM8P250MB0278 Subject: [FFmpeg-devel] [PATCH 14/15] avcodec/mpeg12dec: Remove redundant mpeg_enc_ctx_allocated 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: xENU2hrJ0Z5E Use context_initialized from the underlying MpegEncContext instead. Also don't check before ff_mpv_common_end() in mpeg_decode_end(). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 45627e702d..21a214ef5b 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -71,7 +71,6 @@ enum Mpeg2ClosedCaptionsFormat { typedef struct Mpeg1Context { MpegEncContext mpeg_enc_ctx; - int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ int repeat_field; /* true if we must repeat the field */ AVPanScan pan_scan; /* some temporary storage for the panscan */ AVStereo3D stereo3d; @@ -803,7 +802,6 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) ff_mpeg12_init_vlcs(); s2->chroma_format = 1; - s->mpeg_enc_ctx_allocated = 0; s->repeat_field = 0; avctx->color_range = AVCOL_RANGE_MPEG; return 0; @@ -817,16 +815,14 @@ static int mpeg_decode_update_thread_context(AVCodecContext *avctx, MpegEncContext *s = &ctx->mpeg_enc_ctx, *s1 = &ctx_from->mpeg_enc_ctx; int err; - if (avctx == avctx_from || - !ctx_from->mpeg_enc_ctx_allocated || - !s1->context_initialized) + if (avctx == avctx_from || !s1->context_initialized) return 0; err = ff_mpeg_update_thread_context(avctx, avctx_from); if (err) return err; - if (!ctx->mpeg_enc_ctx_allocated) + if (!s->context_initialized) memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext)); return 0; @@ -961,7 +957,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) avctx->sample_aspect_ratio = (AVRational){ 0, 1 }; } - if ((s1->mpeg_enc_ctx_allocated == 0) || + if (!s->context_initialized || avctx->coded_width != s->width || avctx->coded_height != s->height || s1->save_width != s->width || @@ -969,10 +965,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) av_cmp_q(s1->save_aspect, s->avctx->sample_aspect_ratio) || (s1->save_progressive_seq != s->progressive_sequence && FFALIGN(s->height, 16) != FFALIGN(s->height, 32)) || 0) { - if (s1->mpeg_enc_ctx_allocated) { + if (s->context_initialized) ff_mpv_common_end(s); - s1->mpeg_enc_ctx_allocated = 0; - } ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0) @@ -1029,8 +1023,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if ((ret = ff_mpv_common_init(s)) < 0) return ret; - - s1->mpeg_enc_ctx_allocated = 1; } return 0; } @@ -1233,7 +1225,7 @@ static int mpeg_decode_picture_coding_extension(Mpeg1Context *s1) s->mpeg_f_code[0][1] += !s->mpeg_f_code[0][1]; s->mpeg_f_code[1][0] += !s->mpeg_f_code[1][0]; s->mpeg_f_code[1][1] += !s->mpeg_f_code[1][1]; - if (!s->pict_type && s1->mpeg_enc_ctx_allocated) { + if (!s->pict_type && s->context_initialized) { av_log(s->avctx, AV_LOG_ERROR, "Missing picture start code\n"); if (s->avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; @@ -1740,7 +1732,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; - if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr) + if (!s->context_initialized || !s->current_picture_ptr) return 0; if (s->avctx->hwaccel) { @@ -1881,10 +1873,9 @@ static int vcr2_init_sequence(AVCodecContext *avctx) /* start new MPEG-1 context decoding */ s->out_format = FMT_MPEG1; - if (s1->mpeg_enc_ctx_allocated) { + if (s->context_initialized) ff_mpv_common_end(s); - s1->mpeg_enc_ctx_allocated = 0; - } + s->width = avctx->coded_width; s->height = avctx->coded_height; avctx->has_b_frames = 0; // true? @@ -1894,7 +1885,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx) if ((ret = ff_mpv_common_init(s)) < 0) return ret; - s1->mpeg_enc_ctx_allocated = 1; for (i = 0; i < 64; i++) { int j = s->idsp.idct_permutation[i]; @@ -2448,7 +2438,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, break; } - if (!s->mpeg_enc_ctx_allocated) + if (!s2->context_initialized) break; if (s2->codec_id == AV_CODEC_ID_MPEG2VIDEO) { @@ -2546,9 +2536,8 @@ static int mpeg_decode_frame(AVCodecContext *avctx, AVFrame *picture, return buf_size; } - if (s->mpeg_enc_ctx_allocated == 0 && ( s2->codec_tag == AV_RL32("VCR2") - || s2->codec_tag == AV_RL32("BW10") - )) + if (!s2->context_initialized && + (s2->codec_tag == AV_RL32("VCR2") || s2->codec_tag == AV_RL32("BW10"))) vcr2_init_sequence(avctx); s->slice_count = 0; @@ -2606,8 +2595,7 @@ static av_cold int mpeg_decode_end(AVCodecContext *avctx) { Mpeg1Context *s = avctx->priv_data; - if (s->mpeg_enc_ctx_allocated) - ff_mpv_common_end(&s->mpeg_enc_ctx); + ff_mpv_common_end(&s->mpeg_enc_ctx); av_buffer_unref(&s->a53_buf_ref); return 0; } From patchwork Fri Apr 5 12:41:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47825 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936651pzd; Fri, 5 Apr 2024 05:43:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWecBRYEi5hPOL04ewR0mcK+f/xNEn/iR/AjC0dNQARmDrNSZ00juze3zU/3tFKPxKSV8/RA1WSibSopNjJT4XugMy3N4x7bZXxQA== X-Google-Smtp-Source: AGHT+IEPBB0BRXeGpX1XvyLd/7+CdYAqYU1ebpD3JLEd583JNo0PQZ9LNUsB62b4gKQt0dxHmbXG X-Received: by 2002:a17:906:cc99:b0:a4e:7a8f:2101 with SMTP id oq25-20020a170906cc9900b00a4e7a8f2101mr899792ejb.2.1712321033751; Fri, 05 Apr 2024 05:43:53 -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 dr19-20020a170907721300b00a519e1b3663si711687ejc.2.2024.04.05.05.43.53; Fri, 05 Apr 2024 05:43:53 -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=igS4hKrv; 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 0276868D1E6; Fri, 5 Apr 2024 15:42:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2014.outbound.protection.outlook.com [40.92.91.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D23368D1BE for ; Fri, 5 Apr 2024 15:42:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AOQ/Z+Er/q6OIJ+AoDYEnX7VStyGnfurI/h4ktDotunvB/C6gMmniaIWOlyCeJfBOrb74e4gEWRFE81UDEf3/zLGjxkJfNx80Pnfb1Ix4eoPc5S8W/El1zdDOmpCSCI+ofMZ9lUs1cKyFoCdFSGQMsAWIcRA6M+L94JXDms2TlE6/ev1gPZedly7Pi49co84KTB9peP1f+ceqXIuwl3PLwM4kyEVne/nE7jeyBDT7U55Mm2hCS0zQl1rg4FDtcNfnUWHelhUqhuyUBPoguGEcP5AujO0KIGu7uDXSSiC6zgwSU7Qz3FvmJT+FirxLG0YomG+xbCOJdK/vlnyD4hRYw== 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=ceEG4Bf1pQV7O6f2USclz6BdWfzQWREczPNZczdQZ/g=; b=WB5JPdVIQPSb++DQ8HU2GkcDQQWSZeviQTJEdQaNp9wMbajElhkK15TGbXf4P1BQEhX0wFgW9Dq4XKHGHerQqilvPHaeYXHRCsRteiIy9nmeI3TtBPKeGNq5NcK7oPMPsWXgoBrGTU0EyBN7yG6CBlCCultnsfKguIMg43E/tBiQtvYHVJiThuDbINMAGTfMk3RDluICAZ4bxUVlzMWVdkA+djp9OU8//eFgIbUyCfN76y4vrgiw6huzBJz0LgATB6gKTb4EUutZnTA7xxzGhqpYcDS2pnwIrl5latdZqTdXaH8QQpfBdnYdBgsvkq1AB4Gge6+iph+42Bi7HXq/ZQ== 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=ceEG4Bf1pQV7O6f2USclz6BdWfzQWREczPNZczdQZ/g=; b=igS4hKrvkYSMjl5WgLHajVB0rahwiy4m+MirzmBvWPymjbbq8YM7dg3CaYbm2YaXrsADRICHPP0CCEZbAjiksOtf+ddblUhHDvSuUT1JM852+gLEvyLw5bpmitoZRe81nlTwEFetBAJVMN4CsJ2oPNYJniGDoBRJvupD88j86aAIDCEVb9Cdn/+GIs5vheTyKpb6T+wfMr6OW0BzSbjK6m+EM431kd5X62YJpgOUFMMunHKObCmH38Nq04XIEg29LXIqWjeFqqxHkXB+BS1+vK6scnoEJ3IRZe6mRVUKEdXU+Uo8HshEdfZQZZWqp80LBLTOWx7/lmUdO+OFGTQy+g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0278.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 12:42:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:38 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [9u25umQGMyKdw3uk/krxNkwDdL2WK9nUBiaHqsUNWg4=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0278:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e65b9b8-5515-43cb-384f-08dc556ddc30 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: adO6hTO6/vsexP9myL1QADnGsG/9+yp3EAO1UzrJZktstHIhCDtJGmZBVgx3gMNtwA1P420FQ3k0jiDGCvW4qIfoJcTYnJMyDK4EZ6YcOmk4BU202fYGKsOnNZ4Lmyol3cvq4uI993mush0t29KCoaCjQV40O2Hhwe741ATvSsU5n8Vmw11JL4bbpxjsc8k3XVpFkkgdJ5VzmWEsFtTe5Xm6KZfM+EfHeCRnsZuDoLjWbo7QtlyQnq0+JoxKV4gSG4FWlSTdZgXzVuyj0tUHA7r7qj1T+CoXb781w3vbzeWC7pB2smAkBT9Na11tVmX96g7NRwDfThTOwjTZU4Lz4IqJ7x8X0yDso+zcu9zoCkclgT+D4QSBComd2zzFTeyLHdLRY7qU7b3CRkAayyMjW7KCml5HyYbnGqNsqT38r28Me6tms/URjEpUSmPPKNbuJIbQqvqDrk8JTJngtzJJ9XJrV/absEcVaKfMSvZy3vM+WZaMOy3CpYG8VJUAh7zFz0+yPhtnMKLT2GUcKRTLiEM9z60D1EAWaP0/tdIyaes2SzVs/wiGwd/a2OqUbh0Nhme41UZyyHiAF6Ae2eC6F6m8SSNLz/pl5SV8DJ+rz3wCIuB5TsmtKAcKdlty/QMD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZnjH4wSOAJUCrfGSW4Xy0fCKex9kmdia7X85RGZPNPHEz4WZTeYWWOIdknt6NwcJRAVKzk93/rEbEFueSnYbCvATlll7wY36NyO/ElWIAbckNPLZ3f5JjDS+1fwgjGUskK/VYsxKQMDcsplXdepP0CxH9xoTBhIBNW7mV/FIPz4a7PK1jMmYuo5su6kc82NwtfFhi2PQBrWKc7R6IX2JHyOKOv5I0LzGOgWU6YMKOZPhWzCmcBuTZK2imFW6+nANoNfsZBAaywFIoIz4MJsEqUKL9Ri0NGsrzEu1HVnJfq3VtT6BsNp1XUc2OE6hMjhCGYveZx6/DTdYqg287Iij0OEsjcazgsGZ2wsS4ppc4WmrjifdrWEgR34eRElx0gO/mDw/OXAOCcGErb+NbCdgqACV1bhvwPKLIOaI5HRgbGdqlIcxXrXsK5qmjbjXvh85eMosm//fHUdcgmvY6gwx6slkj5mo9AOt9mC8yDOb+rj2SRl6pvExWuPChb7Mf4t7Um9Sd5HGrCczMbC8nRfXY1wMqk+rRXGeIfgciVcblahPUnypRV/D6szPXrJUt9hNNfeP6qFCbcFe5dx5kxeARYQNTw8Il944OnTEmL4X9AmQ0DvJR8cmxNz8GL7x0/2+79Q0dzZK5qZJFPcR+Znw/crk5Uh1HV/qxjPjXN8OJNasG3tm35SbS6uVZFYqcBaeDf/+cQ3tntnxukPUjSuyNVZNnV2gzrrnkJtpx7iJ4uWwUWRkC4jXtlcWQaCNnLqh4N9Yf3cGm8Z+KCz1ilVSgvVGZ2Pa1BXWpjtZKGRsjYlFGfTkqIbeGHueCbdBFaNlyM6FduU51dT2QdMcgI3yubZ2/qmnUr0/YdukDpdNN+zPcp24koh3EKAOjrD3ckiMCR11+ZIhKxGKN84La6+WlMy1/Q/A7qzbDpxeBEFO7Kkx1LY9I8Qqryxqp0Y7PCkKNEzdfdraZdTdJPFpNAUmT0TrbjrYPZ0MqHdpzLopBbWnNDA2PKiNPbW2RHsqLTdCsqWna7jXOFW/nfYwUvjlWO5pVjryJBDsGBSZ6Ld/zlLqekGGi5BPxSsc1dErsihnvV36aqtT8HwCUJ+y9VoyEobElxK9gC3AjWQhEtii9i/D73McJYqLl5262CJrH4AOguNTeLHJf4vzXYWtkj7+cNc2bnoHdv6uGNvWc/4WrxlOoFSoaZuEKX2WMhdjkHOEZAc3GUHLFYNe7xwJusxG3xMrcuiHUXcW+f7a0PlmscqQOgSXHNTej4M463udrWHltkIrwLAET8i/eq/fns0vqg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e65b9b8-5515-43cb-384f-08dc556ddc30 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:31.5949 (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: AM8P250MB0278 Subject: [FFmpeg-devel] [PATCH 15/15] avcodec/mpegvideo_dec, h264_slice: Return proper error codes 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: ijHXf8vz8re0 Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_slice.c | 2 +- libavcodec/mpegvideo_dec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 4b01c54147..a346839902 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -483,7 +483,7 @@ static int h264_frame_start(H264Context *h) if (!ff_thread_can_start_frame(h->avctx)) { av_log(h->avctx, AV_LOG_ERROR, "Attempt to start a frame outside SETUP state\n"); - return -1; + return AVERROR_BUG; } release_unused_pictures(h, 1); diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index d337a6565b..4353f1fd68 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -328,7 +328,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) if (!ff_thread_can_start_frame(avctx)) { av_log(avctx, AV_LOG_ERROR, "Attempt to start a frame outside SETUP state\n"); - return -1; + return AVERROR_BUG; } /* mark & release old frames */