From patchwork Sat Aug 7 05:02:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 29330 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1099165ioh; Fri, 6 Aug 2021 22:02:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyS0jRfchAIh64TeaPJ/Ih1yJudIQaaG3ri+JzDYf2ZSKFuCZPM7wS5mMxtQJbFZfgH0j5R X-Received: by 2002:a17:906:6686:: with SMTP id z6mr12878221ejo.539.1628312543952; Fri, 06 Aug 2021 22:02:23 -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 o24si145490edr.546.2021.08.06.22.02.23; Fri, 06 Aug 2021 22:02:23 -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=@hotmail.com header.s=selector1 header.b="q2o5v/hF"; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5A28680BED; Sat, 7 Aug 2021 08:02:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08olkn2081.outbound.protection.outlook.com [40.92.47.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D1CC6802C1 for ; Sat, 7 Aug 2021 08:02:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PmqIcNKN6EZt/CTJPaFOOsXtc/0cmWZJXHHqTRySJUTufOx+1Zn+nSOpNzX8aP8rS9BFdu8xGA/QZZF5ZLjLMvKNwln15sI4jii8BtKUkxhGA7hmMRwSKHJ2/rxKoYC4YF614VzldYQaP+vMwlT/yJkmquZdvBRP8OXZFJF2n6Gxf73eMwwRAPYftNojBvLeETDwudCPiOdm2u34YuxaMiUHijirwIETCtjdTj7ixcEY05UuOGgCl9hunwQxy9gdCw+dJw1eSKVJhPo9kEgukOizhpfKkZ0zSPMECRYtfzY8ao1aafhavAepGNg70C48Ymn4dyqTICjzEfNgz1cr7A== 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-SenderADCheck; bh=SZY4ivSmMK4Wgi3C0NQbtMIeqt0o195rnmJeg2xt+tU=; b=m3sP4s9xJEK2b611+XGd735fNkZkHyN5nsQd8OVUlERZmGQ+kJHU1+/JpoF7xtPPOSdQqiALDOHIUI3paMpSdJwBI/0xWqcmTUfJzDHE057dA+AvmFqxjnYIf/P4B/Mu6j5ZCjlg+Q/jDKtfUWa5y7IFLPbfyPtci07wqUMN+FL5G4WYTYuiQe/SD1aggURsRK4BUf2cnCs0gHMldGm5Hm2J7KzpCnQVLGSKMn3WM7Ct2FBTezvkmpNQAxVpNud990O/LjvJ/Z9CcmN/YTb+mgXekYKXCyUqAMTBu26PGRy7/v5E5xEbtF8bSgjABcIEUbA9UOaKY9sFpRIj9dAOPQ== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SZY4ivSmMK4Wgi3C0NQbtMIeqt0o195rnmJeg2xt+tU=; b=q2o5v/hF1csFVDVAVCehvoag9POy7KHV9+YPneHb2Bd5vNek86PLhJSA+26DwgMf3jvLEDQVF5LmKkKE5kM7IUmyfoVDDKmvRmtygDoKku9jsmgjMW3v2JO6MVr9X6dmqlPfFyJarmYhZucOZ4ruNumcbAvbMi5GLxHmNGwsRa6Dp+GL4AGfvFj33lzeDg/PqBgr8R5NWvePI4VXlkWqfZ54g34fZbXk3LAACzTvIrPS8ApzQxeR1WnhMauA1Q2EL7ACHQjfteEsCLm4RfRxGQwreoVcylA0Y8kjgYvIpP6uLWCcqKKQSI9NwyTTkuD8HEgBQtKAtvYjdpnLQq47GQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6144.namprd04.prod.outlook.com (2603:10b6:208:e1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.19; Sat, 7 Aug 2021 05:02:11 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::5d83:1c26:c2b1:3a30]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::5d83:1c26:c2b1:3a30%6]) with mapi id 15.20.4394.021; Sat, 7 Aug 2021 05:02:11 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2] DXVA2: Add ARGB format Thread-Index: AdeEjuMJRjwhPjMSSm+oe/GklOFj8Q== Date: Sat, 7 Aug 2021 05:02:11 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [eSYkqYv7WsKwfQ4fUM570PTbH0vbNJNM] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 51a3f5dc-2b81-47f7-da10-08d9596083e1 x-ms-traffictypediagnostic: MN2PR04MB6144: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PGwDt2KiBZIlGEdOpy+0QnW9ekZ85k5/up/XqCBz+Bh8kktwc01cm2TykhfbGm1teqMBep0zhtZ1VhJ2tNgDU9yqI16N5DdcnRhfT6ttlG+YYEnCS/jaQWREGtRZiEsbE0lizybHU9fj7dK/IkW65lT6VM7aaYQ0AfKtCLNgPo741/wDHyvPHPt+JHshl358GtYFEvDVNbkHQasgiR7tQSRnru+Ww90uMjSjCx7B3eZB5AWmqt05ikBRqXNJhC/0n4DOB5NpD5eh/mEkJHWG99szPm3J4u+/4m4UIv7uqFtOvMhZ0bBEMgHde64ozxzJ6p73veipo+Tt0XoV7q82NPgcyTiB0c9M+aT0YnR7Fa/aik+a3QkoY+bazOBf7ZWGPIZbZfpiiVdMU2StzFC1EMJvHdGgngPNPsaiCleLzx8V90cU/UFw/cDkGXSYxff2 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: C4JoGjOxvdxwpmbKwDUGHG+MBymWo7Ct2lfGgOtAy9jheMjkteLbPX1S59jdqj6BASVJnXQkhe+UlNSlwexqCsJPm8ZOB4bQDmNzmfWm/aecwkp5RUBQAYOmraLu7xkQ35+8YmPylVXPDs1KFsGzMw== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 51a3f5dc-2b81-47f7-da10-08d9596083e1 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2021 05:02:11.3215 (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: MN2PR04MB6144 Subject: [FFmpeg-devel] [PATCH v2] DXVA2: Add ARGB format 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4+ydJq57NwLN Required for uploading frames with alpha for qsv_overlay (v2: remove tab indent) Signed-off-by: softworkz --- libavutil/hwcontext_dxva2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index 63b037da4a..9987cdc578 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -83,6 +83,7 @@ static const struct { { MKTAG('N', 'V', '1', '2'), AV_PIX_FMT_NV12 }, { MKTAG('P', '0', '1', '0'), AV_PIX_FMT_P010 }, { D3DFMT_P8, AV_PIX_FMT_PAL8 }, + { D3DFMT_A8R8G8B8, AV_PIX_FMT_BGRA }, }; DEFINE_GUID(video_decoder_service, 0xfc51a551, 0xd5e7, 0x11d9, 0xaf, 0x55, 0x00, 0x05, 0x4e, 0x43, 0xff, 0x02); From patchwork Sat Aug 7 20:29:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 29335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1590676ioh; Sat, 7 Aug 2021 13:29:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1tKOosdRc36NBAgrP4O9LM+NtPJbbRy/KglSm+NXojWEtV5BsLQQ4G9JahzMYN7zX1jQR X-Received: by 2002:a17:906:b0c5:: with SMTP id bk5mr15401650ejb.428.1628368170796; Sat, 07 Aug 2021 13:29:30 -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 w5si12938318edl.176.2021.08.07.13.29.30; Sat, 07 Aug 2021 13:29:30 -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=@hotmail.com header.s=selector1 header.b=nXzsMALT; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7508A680986; Sat, 7 Aug 2021 23:29:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2020.outbound.protection.outlook.com [40.92.19.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA02B680986 for ; Sat, 7 Aug 2021 23:29:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a+BabYelhYk0I9Da86rWOWVhQrxDtLmnxRhwtEZZ9yn1RUJYww/e9NgXYs/Czo41tliRt1rKyrYjIg0oMr9WDACF/H0/4gKE2y6YcHgZOEdUW2iqul3l5JLZLnj6YuNfNEJ4RIuUZA7IjrGTkkigMnwnOXHP7lM2Sw7fO27dCjYbFPL7QA4Mi0JNHI8+gPKahh6Msg1Mo8fD+ud6RsmmQ/SusW2goZILTMThBqE8BHpQXni/2TGibEzK1cfMUe0bIuRvl/Tiyx1ugb1m1a6suKEUs18S5JxxVaMdEk4SA2q668ijJ0aNmJXoDwd6IKNWtkI4Rtecs9wwusUN7ttRuw== 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-SenderADCheck; bh=Y/zBrEm98Bz8V9G/Xre/HR2NyJLAxLbvk9YYaz5u12Q=; b=Ar50iLkZ5T4NvqlmSvHGhvx+fok7PX1Ysnb4A76/7H9DQVVCp9DXikUGIlYUMeRSu5ffnYgAHcExe4CkLcK+d3zlgor0Z/2NqDRY7jv0sRl2wMUruqFF+d4MVJi7x2sAZ0XxGIl/IymYwK/Be8LY24P/EtzgFukPWaLC3neTkoGUWPN08YLfQVSPFP2MNiWbMs4AwwzVc589WYdMjz8mW+04uQkf4i/hoymBg73v2D2kt9M4woM3bfJvLqwkOeULnqZ0lMRiynGYXZEd5HDLgFfSESEcF5cetMzAy9OsV4pOzzed1kfrGwQUcucFQ4pAr4yQ0KNlNEezWf/aRpe3Gg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y/zBrEm98Bz8V9G/Xre/HR2NyJLAxLbvk9YYaz5u12Q=; b=nXzsMALTB/nBx0lEmJOA74WZfjt4dBt/I1d+rqDoSWQpwZZ5OAVMICY+jj7WMBk3lrPlqDMbrPZ9/L0v6XBhxodVTkRqk0GXgMQpVqWfAQtWUouJFcbGMO9nnJIBovgr7+WDWyo2KbZT6HRXhyFx77ZdSXO2GUIh5Ex7qnOjoU44O2NRuapoPFNhk6S8bVJYZAWT4zUS26k2uoIgWhfaBBArpWyuCdc1wJ1tp6QSftVxWZQ1ushgElBlRdFN36qQQ3QHJ/7ikfQ1o8+sRN1Qa2xrKoG36j+6N1U/KHPzHkA7ejWH+AA/NNxE0pM6xQhX3J2wDxGrxW7G4oFhBxxLHQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6205.namprd04.prod.outlook.com (2603:10b6:208:d5::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.18; Sat, 7 Aug 2021 20:29:17 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::5d83:1c26:c2b1:3a30]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::5d83:1c26:c2b1:3a30%6]) with mapi id 15.20.4394.021; Sat, 7 Aug 2021 20:29:17 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3] doc/developer: Add description about safely sending patches via E-Mail clients Thread-Index: AdeLR3kEDGz8o+hFRkOynr9/uJ8bbA== Date: Sat, 7 Aug 2021 20:29:16 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Ec+RxdNgUGt8b55ePXk+EWytQrDU/prE] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e81612a1-b282-4099-5f35-08d959e20768 x-ms-traffictypediagnostic: MN2PR04MB6205: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: x9JwVde5LmwIinxFZiReykIeBS5hQx79ZrUSnHhgs4BT6taod6RiQYHEMqCR4RV2NvbFsymtEIctqbSSwVN2Dy36P7uY/BVyWbABetMu5DOpkLC/S65XbS04Mgz7doEKw371b3aG4bHNKQg/o2h+9JtO2Rsw7mHMHX9VgQo5vMacHyf6wRs5mk7YuBLOvOsDZNGZrg6iB/SyKWfTZQ1igFuhwN+0BNb+A8DX3mG0iQDZWT0t/fk3hPfKQHHVA4gvQ6n+MsLolLXLzfBPWa9hA7IjNJoebZRvmZYHsa3UN7OJfQhi2St5woxwkgVpau58DVXlGg7CLnyYHirJo5FQYsgx9CwGi66txf3FWkQ1QGSN9UGHX8QiyL2WXYj54pS36ynY9LqT/h47lRPgdmrZlP/sQY0Pb7kJ5zCL7smi45p22+UHz7XEDuTS6fexGdx4inUIBhFNnnYMtwfBS10k/rwobozhM7K/XA22QUgyjic= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: I9DTL8PYghmf0A5VwfoukH7UkS4WQX8Xluj7copQsvak48rb/5Ku5bHrk/ds6/7gVrl0/5XAdBIg3GZvgT9BWqAQC08waDQmRd1Q3xC1QxavCNU0gOcq3JaQkr86lV+mR4F9S7pyQ1mgl1xol78VSA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: e81612a1-b282-4099-5f35-08d959e20768 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Aug 2021 20:29:17.0727 (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: MN2PR04MB6205 Subject: [FFmpeg-devel] [PATCH v3] doc/developer: Add description about safely sending patches via E-Mail clients 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wTyFsAiT3A4I Signed-off-by: softworkz --- v3: fixed typo doc/developer.texi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/developer.texi b/doc/developer.texi index b33cab0fc7..86f63c49b3 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -494,6 +494,22 @@ patch is inline or attached per mail. You can check @url{https://patchwork.ffmpeg.org}, if your patch does not show up, its mime type likely was wrong. +@subheading Sending E-Mail Client - Example for MS Outlook. +Using @code{git send-email} might not be desirable for everyone. The +following trick allows to send patches via E-Mail clients in a safe +way. It has been tested with Outlook and Thunderbird (with X-Unsent +extension) and might work with other applications. + +Create your patch like this: + +@verbatim +git format-patch -s -o "outputfolder" --add-header "X-Unsent: 1" --suffix .eml --to ffmpeg-devel@ffmpeg.org -1 1a2b3c4d +@end verbatim + +Now you'll just need to open the eml file with the E-Mail application +and execute 'Send'. + +@subheading Reviews. Your patch will be reviewed on the mailing list. You will likely be asked to make some changes and are expected to send in an improved version that incorporates the requests from the review. This process may go through From patchwork Wed Oct 6 06:00:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30921 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp54536iob; Tue, 5 Oct 2021 23:01:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsiGjuJYjcGP0Y08rgdkl0WRAQycFtv1aKXUH90m/STxwbRvz3hVzOgz9C5M0oWP3GoSNK X-Received: by 2002:a50:bf07:: with SMTP id f7mr32025741edk.288.1633500065928; Tue, 05 Oct 2021 23:01:05 -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 j1si17500080ejm.506.2021.10.05.23.01.04; Tue, 05 Oct 2021 23:01:05 -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=@hotmail.com header.s=selector1 header.b=ZIup7B3Z; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6771E68A9FC; Wed, 6 Oct 2021 09:01:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0ABBF68812E for ; Wed, 6 Oct 2021 09:00:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J3t9nkx5QlIXmF8g577Y4/fzVgWBKE5ay0nGTIZoP3WIHkqdTw6jUDMMwIAHYVC8FMSMMDU+AgIJLWmnAy6IbYg/Hk6tLyIG8/jKZ7lGpj8BuqNOWNXPo3LDQgActfTYCjnm8xkIrj+poUAO8MSIIA+8ruWRLylNW/vIetEQtu3QzqHAICVlobDxQNYwNhIB70bpgBjnYOoc9Id89UXWnb4yMcA3uXpHWmsv+Npx/L+9NK2gihrhkQXn02mKyE7qBplAOGxzADFUmi4+97Gkiget7XB4lhXZJlwKtldo+ZdJ35kgyQgovOCLtzhMtyAzO9vQCfI66kgjgJTwN4RS3g== 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=lMBaZfgYofJC8CSKB4cn3MrUIecONBNKfZ9712zhPLg=; b=ge9I5zCAPNUzW6jcrlucVCspZtXhQXyv8TRs1yiKMXIC/64FRDa/ZOVh7H93hCXLH5mK7tS14BBhrwIgvSLMUDooDJmFR7LmuBbiwCBn0UvzWwHh+9JrEOjoiwNQSu8iKOFqxkTh9JTC5U+0eOXEkgIyt8/8cMM08c5tEaIfkU0ikmg8ThL6z/0UIV6o1tbJ8NDnx+KkTgZywuUvPQ+fiSdd9caWb9djjtDUysqULBxfQIOEcMGFLLevMEHFbTX3L0SGdBU2CZnAjMvRMYmPVtybTGzwX+lq9ztoaTRPlKGKDLwRrlHDN0LtrVNAjSJUMHKR9hsghRtmcKtrUCoxgw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lMBaZfgYofJC8CSKB4cn3MrUIecONBNKfZ9712zhPLg=; b=ZIup7B3Zr+8yS1LBP76wQaE7mRICY25y6lTl+XHo+i+wUDxMsmQJgGgm9BybdLb6+X9c6NtRRhWoPhltmsfmjhEHv2mKt+nibNb+cbMaGH5o9GX/tFV/GBEvkQLyMJMUw9+/ZTqDAFdRuJFZkNO1NjFo1sSN1F1XPWrZKk9lL/g9TTkqTnAU8XefSfqV2JGZR31HFROtFe93AogyET67RjrhL/PknpAlD/6JBLxSuDDdIsH+qwwIQZqKV1z01hd56Kb2iQFi3xQt2k4ExHv+6NJZWWg1QIY1eLPMUlgh5kBkkjUPVFtgMi+SvPTnmboi+1wYLSNkNeeWHVHDz2UZYw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:00:49 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:00:49 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 01/11] libavformat/asf: Fix handling of byte array length values Thread-Index: AQKUuelGysaiverbZdmESUJxKhLX8gEhLYwH Date: Wed, 6 Oct 2021 06:00:49 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [85IRBL5FxeqMPZqnll1Gv8nr6eYAI8g1] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f2fc248c-5d77-4ece-c2aa-08d9888ea594 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: IZjoOqwbITkVUtcPAHZLC8OFIysw8TB08+2glEBcmhIcDnAq6TjQnhNTjqVfwT779NRrFL54f8JXZUcjXlHI1Wj2Evuma1N4FoLyoS3rwRKhMkJZ9IOnMM+rqj02K+B4SIZWAwNoHxZFFZb5Aqefe31P800K0nQAHnG3wwv7ZJhvqqWK0rJi0CDZG2DXUpzKkaNaIlZPf0DyWV0TVbmw/itJrNpcYWt9enWM9eYzrDuujFk80KYy0oQIUOublOashGSWSq10t7aw+ek1FmWqJjOrEWPNRZTWzEWqceX8tuGTKPQLmhG/Zt9ycumgzYOpz59gjnIlnuhxMDVUVeGNlpr2h4qr7RhYKONuKmY4LzcW1cClWYQXA3K2JtyDM0HBWNAYH6uJg3diW/DLXGenrWZI1siqxni3WK98cVLA0LPX0wKNkJDMCmY/LXHc1W3i x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: MPTAPAJtv2ehEmJ/sz0EkMUOdm4jm1BEqlBvRmwcbbSZvCvQ0H8WGTm9bhm/obvQyjdBjcVRwiYt0Xvj02J+9C+V5+wDJFgZilKfdXu8wVSoek6HCrovWF9b+6IppBCIwj/U1JTmA1YzjDiOk+9kyw== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: f2fc248c-5d77-4ece-c2aa-08d9888ea594 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:00:49.3539 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 01/11] libavformat/asf: Fix handling of byte array length values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4lbrTydHHSsU The spec allows attachment sizes of up to UINT32_MAX while we can handle only sizes up to INT32_MAX (in downstream code). The debug.assert in get_tag didn't really address this, and truncating the value_len in calling methods cannot be used because the length value is required in order to continue parsing. This adds a check with log message in ff_asf_handle_byte_array to handle those (rare) cases. Signed-off-by: softworkz --- libavformat/asf.c | 12 +++++++++--- libavformat/asf.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libavformat/asf.c b/libavformat/asf.c index 1ac8b5f078..179b66a2b4 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -267,12 +267,18 @@ static int get_id3_tag(AVFormatContext *s, int len) } int ff_asf_handle_byte_array(AVFormatContext *s, const char *name, - int val_len) + uint32_t val_len) { + if (val_len > INT32_MAX) { + av_log(s, AV_LOG_VERBOSE, "Unable to handle byte arrays > INT32_MAX in tag %s.\n", name); + return 1; + } + if (!strcmp(name, "WM/Picture")) // handle cover art - return asf_read_picture(s, val_len); + return asf_read_picture(s, (int)val_len); else if (!strcmp(name, "ID3")) // handle ID3 tag - return get_id3_tag(s, val_len); + return get_id3_tag(s, (int)val_len); + av_log(s, AV_LOG_VERBOSE, "Unsupported byte array in tag %s.\n", name); return 1; } diff --git a/libavformat/asf.h b/libavformat/asf.h index 01cc4f7a46..4d28560f56 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -111,7 +111,7 @@ extern const AVMetadataConv ff_asf_metadata_conv[]; * is unsupported by this function and 0 otherwise. */ int ff_asf_handle_byte_array(AVFormatContext *s, const char *name, - int val_len); + uint32_t val_len); #define ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT 0x80 //1000 0000 From patchwork Wed Oct 6 06:00:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp54692iob; Tue, 5 Oct 2021 23:01:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiGO4YMLGeww4L87LNONEznSda6HApvv3HSNHKsTyDnnl5On5ByQXxEDWV86xotxu0M6NK X-Received: by 2002:a17:906:c7d0:: with SMTP id dc16mr30809080ejb.555.1633500080126; Tue, 05 Oct 2021 23:01:20 -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 n22si2473333eda.113.2021.10.05.23.01.19; Tue, 05 Oct 2021 23:01:20 -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=@hotmail.com header.s=selector1 header.b="mgy2Wj/F"; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8679C68AA54; Wed, 6 Oct 2021 09:01:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6148468812E for ; Wed, 6 Oct 2021 09:00:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JhSGxQqubW6OhLuvOR88gidJGNSk/P3y/BJOjl7MH+lPzFqjBAZzAD+OyhPtQC+LWau6Lt+h6E9H9NALijPlWt1tVTnkNdOe+ahh+9CfdHduMcR5UQKU023ZYv1GnwVl5BZNLl1CUWHaekRmTtW1FJJ/GxsgeZ9rq9YH1Fk45KzwiUYs2EaqrpNp4lJrzvPz1ZD7D8GoveQ6+ICTa5W4hamzHRzgd/0IUcCwH7/r7DO4/PorpLswGza3MWZozvW3aWsftxiAScP+SZpeUVsdepV+bl/V8lXUJgHPASwpFFj5bCmzoozuzIuCeECWQgFWHvGS0JSb5mI/PGzdCYBNzg== 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=LOlnfkl3v9wMMmrS/GM3Owj6lZYimq3sTXViLGAwyV4=; b=kTZKnvt+rHhAsvslGB2Muq5KDlh6hZcCJ6B3ekJJLW9hV8BkHuW3V0DGt0o3Zs3an2bmLXc4HdWNtWniCKjsiIzKibOy4Ug+K2Xec21j7ujASk7YNi7wqBcPGIZh9VM6AfTWgvs5Wj6mwg5x1fryETIgXh5PJHx6s6A+3ADk3wuhDldoQrSDe7m3qi0r0sJhW42h08P24edqd8Xyq3Own5JxjF+ZHf3X9l+4iq4hxy1XkIpmxJjDU1nev9ZSVNS6O5WzIN6pA22neJhc7cfZhN3Rid2MYWEt5SF57LFmrTRnP/eTdOBJ7VnvYghh9yIHkSLlnK1HBpaBTtoZ1n1FfA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LOlnfkl3v9wMMmrS/GM3Owj6lZYimq3sTXViLGAwyV4=; b=mgy2Wj/Fx+3VfSJk2bUbJDQmxMCDu630HoM+dob7+eKs/EzL3rqY/IgVGz6GgC2XZw/lndgMh0a6JJmv1M693/Ina1nyB2OIAuhNYRDYNtBEcr6d+C4MAJGARlKfDY3rHRUhSj8KPe7/kCb8ZL7+N37F/Qb3r0HiPU3I86UeYDmprzhBPb/9FLumiHM34YYkLo4Q6c8YxmTntlXtTYtTPRYxkyn+cjWtgfnq5tZVhVN43QWmLHasMxYxkNl78mCGrDAoD/XLuMTJvuE7XyPdagW8PO5yD9po+iT0PvRSDlOjnKmV4iY3LQUtvN+N0nKqgYrS48T25h4YYmj8xDKwiw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:00:51 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:00:51 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 02/11] libavformat/asfdec: Fix get_value return type and add checks for unsupported values Thread-Index: AQHXuneEhvpKpv9330GCLtljmq5dLA== Date: Wed, 6 Oct 2021 06:00:51 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> In-Reply-To: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [kZN64998EfqCeT7s2fhXNSC/bOzkySJW] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ca38bf1a-b1ae-406e-16df-08d9888ea6f8 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: AztzBqhzZcC1D7/BtVK1DecizgA1bweDxJvKmeBCj+CDWehd6wZHQh7VpsjbatxtfyAXC4MD60M2F5L4hosc3yR6fcVnAk99nyVR+0EsTHBiL9vqsz9BVDnrPd/hnaJwz6EVhtUVwljbTFRKNn0TyB/HzglK7qm4kstCFb0cKIOw/nrPTDpsA1BjR0r08UKHXCHgYTWNIYvpimT9BPR9aftWbZpZ/zrOuRLP/qBNsKd1+dM8Cwgi7rxa9h/fr2fTOxLpraGbYhA62ScQWzPzMT/6wKufwpmoBHmOEqXwdVqS96yM5R3K962Xu+DpPCYaR0dbIod1HSTwxkf6+wTCwDfS0kI5ptoPDNLz19At1k3mlqL5xp9xXuAfbafIn8i5atB7ai45BcefC58M+lItz00mOkzHG0fohJDZTcq+auv4Y9opiIC1PPbtgWFRrMw1 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: zgZLJbf5QbZZs11CmKaF0g32445AaWnrkoNOKx0CYzIz3g4xGv5zwbfE/z6estSEk76dPc0iDgOl4bYa5ZMZVv9WiTPkwlqVnoTrZuMGQC0R/HU2rPzXLh1J2Bd7wOjCF24bhQRxt997/T+MaW04yA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: ca38bf1a-b1ae-406e-16df-08d9888ea6f8 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:00:51.6646 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 02/11] libavformat/asfdec: Fix get_value return type and add checks for unsupported values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7CA9//boU/Dp get_value had a return type of int, which means that reading QWORDS (case 4) was broken due to truncation of the result from avio_rl64(). Signed-off-by: softworkz --- libavformat/asfdec_f.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index a8f36ed286..d31e1d581d 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -202,7 +202,7 @@ static int asf_probe(const AVProbeData *pd) /* size of type 2 (BOOL) is 32bit for "Extended Content Description Object" * but 16 bit for "Metadata Object" and "Metadata Library Object" */ -static int get_value(AVIOContext *pb, int type, int type2_size) +static uint64_t get_value(AVIOContext *pb, int type, int type2_size) { switch (type) { case ASF_BOOL: @@ -567,10 +567,22 @@ static int asf_read_ext_content_desc(AVFormatContext *s, int64_t size) /* My sample has that stream set to 0 maybe that mean the container. * ASF stream count starts at 1. I am using 0 to the container value * since it's unused. */ - if (!strcmp(name, "AspectRatioX")) - asf->dar[0].num = get_value(s->pb, value_type, 32); - else if (!strcmp(name, "AspectRatioY")) - asf->dar[0].den = get_value(s->pb, value_type, 32); + if (!strcmp(name, "AspectRatioX")) { + const uint64_t value = get_value(s->pb, value_type, 32); + if (value > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported AspectRatioX value: %"PRIu64"\n", value); + return AVERROR(ENOTSUP); + } + asf->dar[0].num = (int)value; + } + else if (!strcmp(name, "AspectRatioY")) { + const uint64_t value = get_value(s->pb, value_type, 32); + if (value > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported AspectRatioY value: %"PRIu64"\n", value); + return AVERROR(ENOTSUP); + } + asf->dar[0].den = (int)value; + } else get_tag(s, name, value_type, value_len, 32); } @@ -630,13 +642,21 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size) i, stream_num, name_len_utf16, value_type, value_len, name); if (!strcmp(name, "AspectRatioX")){ - int aspect_x = get_value(s->pb, value_type, 16); + const uint64_t aspect_x = get_value(s->pb, value_type, 16); + if (aspect_x > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported AspectRatioX value: %"PRIu64"\n", aspect_x); + return AVERROR(ENOTSUP); + } if(stream_num < 128) - asf->dar[stream_num].num = aspect_x; + asf->dar[stream_num].num = (int)aspect_x; } else if(!strcmp(name, "AspectRatioY")){ - int aspect_y = get_value(s->pb, value_type, 16); + const uint64_t aspect_y = get_value(s->pb, value_type, 16); + if (aspect_y > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported AspectRatioY value: %"PRIu64"\n", aspect_y); + return AVERROR(ENOTSUP); + } if(stream_num < 128) - asf->dar[stream_num].den = aspect_y; + asf->dar[stream_num].den = (int)aspect_y; } else { get_tag(s, name, value_type, value_len, 16); } From patchwork Wed Oct 6 06:00:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp54895iob; Tue, 5 Oct 2021 23:01:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwL9l+n3G1tYduAi517X21ICWejKaLb6rKrBy6BBEVVKsYDq9AqvWWWNm1/qrX/jYLXerkU X-Received: by 2002:a05:6402:518d:: with SMTP id q13mr32092071edd.143.1633500095495; Tue, 05 Oct 2021 23:01: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 l15si35556354ejo.264.2021.10.05.23.01.35; Tue, 05 Oct 2021 23:01: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=@hotmail.com header.s=selector1 header.b=gH+eexkA; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B70C468AA67; Wed, 6 Oct 2021 09:01:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B768268A8DC for ; Wed, 6 Oct 2021 09:01:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FRrI8Cq1YOeHiW19WIYDMVSJlC/s3TzZSkKfpS7yU1d3hv9pejLfJBW+LzUWc1fLDrAPEHZtviQs2b2DuflrU7adWMB/8qZaImOtZ62O+is3xT/Q131bBzgoPeIGgFEgXTK1WuxQ/Ag/QB8oeC1KSYriS0Q5a+DQj7GxPCLiPc7KPjCSl1qblIZscj1t42fRGNYjcSD85dtiVp2Nf7AUzs6QLiqTKFz0AvM9ynJ3r1iS6mSkVxc0Um2I8rRv83vmzzCNxsPwM+HBJmCl/jWDdTlIv+f/fDBHDQns94Ay0yzfjafIBIyhh+c83v/gLrmrpAHyJQzfzKMB5gIhNOrmpg== 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=8kPkMQntXNT0PISGQgRT8PKpQuCUQ3b2VRvto/x2KDg=; b=WehKYoxMudf/2zG6pl8vQ5gBDJAqADH/zxCMbaBFN9HEcwoDezcs7UxKc50XxoEqPkA+ppDphWMz0ikZ11spUcXVBib1365GCP6fAEAzw1CIOFmg3727+2VGsww2LTqpsVFN36U1ix/3KVJ/09weClVrGzd5QCU4cCXgvZJbapvyc3Vc7VLBXH3Y27/VMLx2UUMBKT9Nh8Aq/LTbh24P48FO6G54hFR3S7Sf5XzlPMeExrr463A/k01vqDQ8uAsOsJEx6B0emQ1ceQiJWrHG9SnUHtVraKVCo8W6jQ+wrqKb3EmSZ8JZlg+YrfDYUOtm7gzP/wc48hAHhR5OPAaWJw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8kPkMQntXNT0PISGQgRT8PKpQuCUQ3b2VRvto/x2KDg=; b=gH+eexkAZiyAkdTrLKpFo89q3JGJG8/5h8zKSsdiFvKdYybtR/ufRifqbkV1jhbp1GPXqkmMgJj7kd+A+12cGyBY9/lEmvXwsr2CZDokpSTT6+G1M8hLGHYdlhbVnI0vx86BUrrUqDymrtfPWX8umde0j1t3T5eRw2ALGuU3kaFpi8R+DRwRUwQvTFo5Um8E0I55vlrC4dw7xVrcvEpFm/k84K1HP639d1nOLen1ZF1kNqatNuHePfccUSz0TvY+PNUZDJ2pWw7qc8fuWiG6MFOMxw/QeJLxAtvt4S1cBtVi1PFrUxYQU5K0clcc4ikhZ9j4tefV7o3FUE1MJaJKIg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:00:54 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:00:54 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 03/11] libavformat/asfdec: Fix type of value_len Thread-Index: AQHXuneF7oZqfqYBNEqQmFzTAPeCbw== Date: Wed, 6 Oct 2021 06:00:54 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> In-Reply-To: <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [SCkpuVSk7gkvCEBGFLqBD8wfx48UcE+t] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0ce91482-5fdb-4955-6422-08d9888ea881 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kN30xQye/oIb6OaOXfjnQ6k2sDNZgqt9pAit2GLV01IXaNAJhkp6w2vd12G5ZVp4nT4bCMtmnv+VZpW6KdFrpIY1e8tv01Yc6T7oy6WnGqUHrvnDcPc9nBruh3IKa0dZfdmqvX/gITalxjYVTYlcv1QleP1z1Vjyc/tF3vJW5uAAry5e7Br6HS1wwVwm8Aqi/10f2uJtFLqOd7RLjMvge0IBzPpLVh9xwS5BJ4rFpUZ6NTKydTIRMbKYRids2yxY3/s26wm8N7J2wIikG0z0xBY8C6Brw1tO+D2DYqWcxGYDgcO2MxdVr6BL5M0lEP2ZX7wXanCpqaIxwt5i0ccMz4uhjbxBU5c4i/HI3xG614lVG+4b6P92BhZPZm/X05HmkvAp/wr0/xKmDsYyd3qjqS8rOJmxa2urmdjSfkfRRu9osx6GmO2tWh/PWG696Am1 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 23v1xIP7Di5tZkioBkjkJoqihBSqulFErHwRQEWqWqhL04O5SVbqK56xNHfaEeTDstUupeI7Ih8/SayHXNpShJunfp2QvzE1PB6NKNYd46s6nz735+0H54A6apQc32CBxgDChFnvZHKYW0sZ28kKIA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 0ce91482-5fdb-4955-6422-08d9888ea881 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:00:54.2691 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 03/11] libavformat/asfdec: Fix type of value_len 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jknZibjCBzg0 The value_len is an uint32 not an int32 per spec. That value must not be truncated, neither by casting to int, nor by any conditional checks, because at the end of get_tag, this value is needed to move forward in parsing. When the len value gets modified, the parsing may break. Signed-off-by: softworkz --- libavformat/asfdec_f.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index d31e1d581d..29b429fee9 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -218,7 +218,7 @@ static uint64_t get_value(AVIOContext *pb, int type, int type2_size) } } -static void get_tag(AVFormatContext *s, const char *key, int type, int len, int type2_size) +static void get_tag(AVFormatContext *s, const char *key, int type, uint32_t len, int type2_size) { ASFContext *asf = s->priv_data; char *value = NULL; @@ -528,7 +528,7 @@ static int asf_read_ext_stream_properties(AVFormatContext *s, int64_t size) static int asf_read_content_desc(AVFormatContext *s, int64_t size) { AVIOContext *pb = s->pb; - int len1, len2, len3, len4, len5; + uint32_t len1, len2, len3, len4, len5; len1 = avio_rl16(pb); len2 = avio_rl16(pb); @@ -614,25 +614,23 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; - int n, stream_num, name_len_utf16, name_len_utf8, value_len; + int n, name_len_utf8; + uint16_t stream_num, name_len_utf16, value_type; + uint32_t value_len; int ret, i; n = avio_rl16(pb); for (i = 0; i < n; i++) { uint8_t *name; - int value_type; avio_rl16(pb); // lang_list_index - stream_num = avio_rl16(pb); - name_len_utf16 = avio_rl16(pb); - value_type = avio_rl16(pb); /* value_type */ - value_len = avio_rl32(pb); + stream_num = (uint16_t)avio_rl16(pb); + name_len_utf16 = (uint16_t)avio_rl16(pb); + value_type = (uint16_t)avio_rl16(pb); /* value_type */ + value_len = avio_rl32(pb); - if (value_len < 0 || value_len > UINT16_MAX) - return AVERROR_INVALIDDATA; - - name_len_utf8 = 2*name_len_utf16 + 1; - name = av_malloc(name_len_utf8); + name_len_utf8 = 2 * name_len_utf16 + 1; + name = av_malloc(name_len_utf8); if (!name) return AVERROR(ENOMEM); From patchwork Wed Oct 6 06:00:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30930 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp55099iob; Tue, 5 Oct 2021 23:01:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwd3WwmybiK3AeS7wLSLcFJ1iHXlvyolG2uunRpod4kO0aN+gI64HBG5ZcmNzYSEZVV64RU X-Received: by 2002:a17:906:38ce:: with SMTP id r14mr29613375ejd.268.1633500109265; Tue, 05 Oct 2021 23:01:49 -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 co8si14655070edb.289.2021.10.05.23.01.48; Tue, 05 Oct 2021 23:01:49 -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=@hotmail.com header.s=selector1 header.b=rKNpgxsi; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DFC7368AA6E; Wed, 6 Oct 2021 09:01:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1925568AA35 for ; Wed, 6 Oct 2021 09:01:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mUwSTg2KuhaxiRnWkDlE5qFeM7sOmtrYog/xvLtkDt2lpcD6U/IzbbTsUuhrCtIiTLo1u8to1m3KAwTaQFU4iIBvvwg+EeyAczuETmG7x/xQifuNvCw5BM/PLkz6Y5WFCqYePKMlmqm8vP+mbprNtoQn7Emhndda2R//ow22GioPYhxOJbcW6rx3gRz6Mp5xYhKdkMICeiRRxyFqvshu3VIrCPtsclsmBRaRaNyoPk6fiTVCTEZL7TGe2VZy5CAwJyMfWkJJHStTTubhCRWqMUi8SmckylaefyJfBC+RO56FfoNYk75hvECf4AIWNYystZss8jTzgfg2P1JXPzNoMg== 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=8/1qVnyEWCclIJGrC5fz3zmWsKjgmjo/UCTIclcZ0u0=; b=oTUF/5hOqYC4Go5AhXOnMASNGjQBc32ipHPU5RYhhpI5Ld8WsGOkm2Fr78F57TjOhpEF/hJTaDEeVYZBfeWrf+kZSMXfOjTt9+H8sVDaSbXaVdaW0S0l9L7vixrSC0Qbp1xr9OknRC1cHOIAG9NpHUxDTWfTAl0vQL1ttv1EwxulKfcpLyPjFhdnh0Nv9w2KMDrijfztpl5EyAYMxnGURnPhZWz++Lu4C0KLAd4zDHHnXqhRr3HNWb4rVXZa6/RM2XxXnNug77bBCX+WBNjpG9B/nmxxgHUuhQowBKNn/zgQIgfCoIzN02I7DrM15PYfluZajVH0qkuEIfLzNgPSWQ== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8/1qVnyEWCclIJGrC5fz3zmWsKjgmjo/UCTIclcZ0u0=; b=rKNpgxsiDCOn6qZdnlQC/6vJ2RkrJmkgKHoCnyjAJMONgnLW7UHnp5pYz8Vm97/PQD0seYsipjc84CocPBNJFXNoCUSDIIA9yeV7f913csqdv0uKbz+qyfOcjNheZaUMeq8zUzAGXzaESTSVG9p9FjD9w/DktDj4e6A72NWqQhXGZNDkHm63AiSyhcajvinHHKzFrG0mwDqJxm69OqCrO59nSiAfBhtV7JQ0JhewQWS2EFsiSWptcn5oCcG1W1G3qLGSgSoAX0SbTCRG4hspa49C74Qac4KngVWts1At2cyd424Aj+ZmE5h/aQYmFUVcxW1GO+JS5OeDoA8/ZfLtmw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:00:57 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:00:57 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 04/11] libavformat/asfdec: Fixing get_tag Thread-Index: AQHXuneH1LUrVoSWM0GByKev5ll04g== Date: Wed, 6 Oct 2021 06:00:57 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [bTiBb1ArPXZmDzeza1E/OqqpCNw/WhMc] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 24277f1a-c215-4667-5824-08d9888eaa6f x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: U3s6pS/jJ5czUo/4B3qNKx3PS2OrQzdVgtW+1kxgeYzFbewSDqfKofn4f4GXBRPCPyt9drRaIV1wFrH6ERRIgUvx4EtnWjS8Y8a6Y3+QBjm9ks7ZnmVPKHYueOTTxhnxKfYlptaF/IviKFhoERGCSacQ6tEWLqaXlziwjiYyZxt5uAV9ynh+ItsTMpiu85Zsw9r9KQWIJuRhWgjUdmN4uDli0fwFNipkZBhuc6jw8NQJJoAH7pL7Pnc2RDmpQSviZjvdxjYwc0+iPeLUwDPv3Fr56HHw/UBm6lLi7iQamecUJpttfUPVwAsr/yvqoaJBsW0ivT3NS0QnS5F9z/TiFbOcm2XokQUeRSjXuuvJVL6XzL4P2AVJUIqSoOBC27QhIQXQzvw520y04Gth3AVcm+MLIWjAqyPIy79RKhWnUiwqYcPh+IUs6AV/VNUgdHrl x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: l0OYZT1wWL4WN0U2d0fbimK+JyjNPlSdjIfG7HZN4Ta3NpbnBUNdu7bIXVZYHgY7i10jIWpxkvdixEbncywopGonPVZcMCjD0LMymb3gZNtJ+WnMfRbySZt2e11JuLobCo69mBHIKna04rCumcKs1Q== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 24277f1a-c215-4667-5824-08d9888eaa6f X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:00:57.5063 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 04/11] libavformat/asfdec: Fixing get_tag 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AtBm3VkjtH+0 These three are closely related and can't be separated easily: In get_tag, the code was adding 22 bytes (in order to allow it to hold 64bit numbers as string) to the value len for creating creating a buffer. This was unnecessarily imposing a size-constraint on the value_len parameter. The code in get_tag, was limiting the maximum value_len to half the size of INT32. This was applied for all value types, even though it is required only in case of ASF_UNICODE, not for any other ones (like ASCII). get_tag was always allocating a buffer regardless of the datatype, even though this isn't required in case of ASF_BYTE_ARRAY The check for the return value from ff_asf_handle_byte_array() being >0 is removed here because the log message is emitted by the function itself now. Signed-off-by: softworkz --- libavformat/asfdec_f.c | 54 +++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 29b429fee9..58c424b565 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -221,37 +221,63 @@ static uint64_t get_value(AVIOContext *pb, int type, int type2_size) static void get_tag(AVFormatContext *s, const char *key, int type, uint32_t len, int type2_size) { ASFContext *asf = s->priv_data; - char *value = NULL; int64_t off = avio_tell(s->pb); -#define LEN 22 - - av_assert0((unsigned)len < (INT_MAX - LEN) / 2); + char *value = NULL; + uint64_t required_bufferlen; + int buffer_len; if (!asf->export_xmp && !strncmp(key, "xmp", 3)) goto finish; - value = av_malloc(2 * len + LEN); + switch (type) { + case ASF_UNICODE: + required_bufferlen = (uint64_t)len * 2 + 1; + break; + case -1: // ASCII + required_bufferlen = (uint64_t)len + 1; + break; + case ASF_BYTE_ARRAY: + ff_asf_handle_byte_array(s, key, len); + goto finish; + case ASF_BOOL: + case ASF_DWORD: + case ASF_QWORD: + case ASF_WORD: + required_bufferlen = 22; + break; + case ASF_GUID: + required_bufferlen = 33; + break; + default: + required_bufferlen = len; + break; + } + + if (required_bufferlen > INT32_MAX) { + av_log(s, AV_LOG_VERBOSE, "Unable to handle values > INT32_MAX in tag %s.\n", key); + goto finish; + } + + buffer_len = (int)required_bufferlen; + + value = av_malloc(buffer_len); if (!value) goto finish; switch (type) { case ASF_UNICODE: - avio_get_str16le(s->pb, len, value, 2 * len + 1); + avio_get_str16le(s->pb, len, value, buffer_len); break; - case -1: // ASCI - avio_read(s->pb, value, len); - value[len]=0; + case -1: // ASCII + avio_read(s->pb, value, buffer_len - 1); + value[buffer_len - 1] = 0; break; - case ASF_BYTE_ARRAY: - if (ff_asf_handle_byte_array(s, key, len) > 0) - av_log(s, AV_LOG_VERBOSE, "Unsupported byte array in tag %s.\n", key); - goto finish; case ASF_BOOL: case ASF_DWORD: case ASF_QWORD: case ASF_WORD: { uint64_t num = get_value(s->pb, type, type2_size); - snprintf(value, LEN, "%"PRIu64, num); + snprintf(value, buffer_len, "%"PRIu64, num); break; } case ASF_GUID: From patchwork Wed Oct 6 06:01:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30923 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp55304iob; Tue, 5 Oct 2021 23:02:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2iAQX+2TS+2Xzm6FLd+YsUcqXCa/HtsVneTwQK7IsF80ag0bI8ZpsfFbqtMcfVtSpNRHS X-Received: by 2002:aa7:da1a:: with SMTP id r26mr20787470eds.229.1633500123238; Tue, 05 Oct 2021 23:02: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 r19si27987507edd.309.2021.10.05.23.02.02; Tue, 05 Oct 2021 23:02: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=@hotmail.com header.s=selector1 header.b=Nq2jQV2t; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D3BE868AAA8; Wed, 6 Oct 2021 09:01:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DE4D68AA68 for ; Wed, 6 Oct 2021 09:01:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QoeLpHX3LfxD52D4Cge5zIm4OBk91YYEqOpNgfuz62pLlBjEhTIxhr6Bm7dBI6uIcalqulmfqVcVYOqbAqg6DfLm54kTN+J0lcbOjk20ROy5wdV6Rbzecixf7E7KhVhBUCmLsBuG1d5hAKlHn/z6CrD4mFsnNONuhjtwLB1aIPXl3w4Ej8KtqOWcAzAZqtZSWNkTt+KOUa8FevZkXXWDV63hit0t6FizRGviEmDFiUi2wYSaXI55L2KvJFdfACBVoA82NKbRsyHlzB+bFtE7ZEZ+eiRBG74hSkbQ5H7ne/hIRPdMfhk9FwbXpk0YO2zmcBE3VhF0v4Kj9owr/YbMyQ== 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=IqHvW9pXB0uGuQyk+m8ATahmhu+vc9xwVHC91SrPulQ=; b=SXr3XDQn2woI4oZCxvg6QnfDtLU/khcBfoyazVZr9rIqZb2h52wdB0RZc3F0Jk70MZ14UpL7clIVICV7lKYuM68T9uwo/E229aSDjxQqfox63qZyLwVRgSbVQbFvTZbyCURlCW6M7mTiNdOBvigyFzg9+f1yOshuiO9i1v5E74DOmCs2u5JFCmpV6Ht77iT5nWVWPFFJmOn2IGw3bruhvKFkvGyJMpLxQMVbC1fvWm2hRu/VG649wZ+kBovG3QgTVmiyP8XOdKiIl33qbWL9WzHhUcuiet8O4HPC0AgDmFIwuB2zRjD0saXOSKPk4za8v/BslnFi8Z/YraO53nAhvg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IqHvW9pXB0uGuQyk+m8ATahmhu+vc9xwVHC91SrPulQ=; b=Nq2jQV2tZPRbBJMsnM20FSMKjfk3TzCPK9bgYpRSGbhXqyyWctDRLrgibr4GQ79I43eXk0H8tdkPIHeZppDmtgHThjXNoMNwKntmPBhTphKOsAnmRQMSKLqptWYHeotFFB1663OX5KsNpNDaGHlF1K9ZUli4/QzIdMWKoSUe/ICRtBHvL1+PLbzf64pz3knlt2I9IiRMxcNoTzQsyU6Y0FsMZvHza4EN5sSS+AGQMIYqZmKzA22vdSCveCPlnY9zKWPY1x5D8u3daQpGKc7Ytvr2E2Z+HCecw+XskL/+NcE9Yh0hfLYUdo1xqqOdQjGdM3YCMH3OqvxOQI5iujRUsg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:01 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:01 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 05/11] libavformat/asfdec: Implement parsing of GUID values Thread-Index: AQHXuneKzKptgfKvOkCabFBjdOUngQ== Date: Wed, 6 Oct 2021 06:01:01 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> In-Reply-To: <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [7g33zXRugvFN0iGuE0kmOQmpnBc7Rnqh] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 060b12bf-3f80-41e5-e1aa-08d9888eacfd x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: sFha83Eqerq1Y5gYNkRwLgAiKgOzPh9vXSg3yfuhXPH0/A7Do5KFIrZTL7uLl+3KyY1yFPAmvRwZy2K6jnZrEgN09Bq1Av9ZObXe48GlCStkD6OdZl7zlU264F32gPyJQTx3I25UcbNgQUl6sAr0OIUu48JktqtkILtOrPfY+lFr7ikCyzTQ+sN2yacJcDdJIq77LppvVd14Ez5oxWUolPsFr/75iixunKX2d4hoITAZwE50KbA3CKfX03mokt2cZhXjxoR+S7DVpLjXJnh2bUR7/TdW3f+8qgMeoqQjtzisQBopp5erOlaL68a37b/Jz3TaikjY6vBtmnVPZ4IntBr1pWRTvlQf8mnw/qs+hfEQShnaaJsI2L3OYvmiX+ezmcw+JqR0kkZbIJeML1yUuoOFpooANlCookHtX5+3EvBMdlNH4yvBi0oWP7JdSxlL x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: LeHsq3oVHWZl1i2TWq9kDppW2cY4A7InqoKsZpRQ9IzPHT2QwxZUVOlKRI7a+0s6D8kftkvYiMhTejO3QNwunXeYIfIZ6v7DYQzFQ/oOhMp10M9P2gLKhrxrKvgvXs0yNWSMJnd4c5Iy11rz63/LJg== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 060b12bf-3f80-41e5-e1aa-08d9888eacfd X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:01.8309 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 05/11] libavformat/asfdec: Implement parsing of GUID values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tF+wu2Zdf4g5 Signed-off-by: softworkz --- libavformat/asfdec_f.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 58c424b565..4c898ab3f2 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -280,9 +280,12 @@ static void get_tag(AVFormatContext *s, const char *key, int type, uint32_t len, snprintf(value, buffer_len, "%"PRIu64, num); break; } - case ASF_GUID: - av_log(s, AV_LOG_DEBUG, "Unsupported GUID value in tag %s.\n", key); - goto finish; + case ASF_GUID: { + ff_asf_guid g; + ff_get_guid(s->pb, &g); + snprintf(value, buffer_len, "%x", g[0]); + break; + } default: av_log(s, AV_LOG_DEBUG, "Unsupported value type %d in tag %s.\n", type, key); From patchwork Wed Oct 6 06:01:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30928 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp55507iob; Tue, 5 Oct 2021 23:02:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxegHdOxe2LmkS7cMDYoFXuAYITO6mE7zH7C9+aqvs3jGo7TBzAsvVbVe1hHqnLAlS9waKs X-Received: by 2002:aa7:d688:: with SMTP id d8mr31494500edr.218.1633500138575; Tue, 05 Oct 2021 23:02: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 v10si4112576ede.451.2021.10.05.23.02.17; Tue, 05 Oct 2021 23:02: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=@hotmail.com header.s=selector1 header.b=lyqWPTWU; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C344268AA35; Wed, 6 Oct 2021 09:01:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3C6D68AA68 for ; Wed, 6 Oct 2021 09:01:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mKPtojFY3Pxl/yLR80mMz9BCnSaD6TWWxKh7TpWiyeQpdamV3W8MAWFUTdAyIFtje1WVdfie6BqEC5cArLoX84G7wmHP71U8U6GRCwSxBfbEkCVW8o2+007/jyz8a7CHjV2EXVDSATSR64mbR0IrfY1DKs4V3tkRLmaQenwG/LhHYX17UPIvUfPqXStOVKlvthIDnGB0VS9fGit9pHeYEwgjG2yHrYioodCm7xnNdpPZo5E6rZ0L/+/bsGvcDMEh2bPsvHorwNlkeHUzsQkgNQgAiI9MyHy2D9G5kWI0ME7pdLry7f9Lw33eIJDt+6ixa4kPhhNjyPR7ndopnY557A== 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=zbZ7TIYVEthg9xAZtpjW8PjcsJJEL0rc/ALdQhFAsdI=; b=koj3vIYMEjVMgOlTbAjVkCCrDhjFRhIgI7dsTzrNaQDBnJ03xhUTLClpd4nrwyzYd/Yr1qLJuPwR7Vpmrb8DjGVdbz5YAB+iyvRSmnenSeDxsBqRKqB7Sr/J0N0O8+zhlvBEzmv+XaeDT9FsBPwGGaE8lE1P3SSSHDNewK/qRvayh6zF63uIwvPsdo8dGbK5ncQ6GEBHfPAXNoTpog3q7GhV+TXL4jIfYK58F7RVq88x4FCUbxr6nzQFHY54tYrwknkx5bwE75jBcW6q0QQhbRFvBHGop67OwD+MLtSa1cJpUXSyUM5pE4BhSCM5H92XfBGESF9DDzM34rRD2m7dTQ== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zbZ7TIYVEthg9xAZtpjW8PjcsJJEL0rc/ALdQhFAsdI=; b=lyqWPTWUTqwam1PBUgWkRySbE4oDPtJeaDI1MjCGQc5yu4i8+SsiHzd/dR90+JYxDNO3ViS8s0RBOoDmtrPHfKppWP2WPt7YPHEXs6eapXLnl+/xbKuEYIkl0bZNZ97WlFU0ZkO3B+CVqhHHjtlTMh9QhBZwzF8oUzkkwq9ukaE2LI2O14GL47rKMWAahjed/6UjQZhH3XyZDDeXVP9Ev05Rqquf0hetpn/PCLbyEkXqwuBTiSJLrdmWWeaw6j5VyWseolMLjESblHM1wD4PvNWhVsxhEJwo/6gYEwiWqExYpLXdYU57IsLIlvzWC8O1bdQGC96T3i68xn7Zg98aeQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:04 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:04 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 06/11] libavformat/asfdec: Remove unused parameters Thread-Index: AQHXuneLyZJrZsfZ+0aEJvEYrrxxrA== Date: Wed, 6 Oct 2021 06:01:04 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> In-Reply-To: <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [I/rqw6bUy6mFENcPMhhfox6Z9GgUKbk/] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6dfd7749-9f4b-4405-0888-08d9888eae7e x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: NT6nHRsmSGzIZSILnoa4gdO57R7qeqzOMuEzfoG5D+wBM56yY/E+vXrL5P1WhlEoiGpMzntjQI+YAO06nBev8eGRus0oE0BNwWkdE/PS59Y6fD1bg64ceasB+sYhVM5tAmoTDoBtixmDcpadprf1FvVmkSmg+g3r+RN4tH4lqKN/rnA83vjS8crzrDdluxfLOAbS3itdlul21h0wkxOHUPJK3BW7v/TTOCg78XsDlxeJyPTAuOB8ISk0dgha16vJTj6BfznXMALR3bQxtGeyjz5Ozp1njWHWrp9nhqiM+NdHYiJobrpjq/D0dq0n/iX5bSYniHhhBGnlPfe9PVaaE+CAwNa49ytk8pvYXJE6gj9bG54ynphiDplxcjs6A4pP0ANA10HmaqN2o/mMDe4oOBUcL/qZQKNKHdQJMmzWx4UmenRfjJCoW8+Q9lBUp7z4 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: LwvOD4M485DTwHz8nbrP0zfjxKib5cY71fFCjzkPObgmrkPO0myfUJkbW0gwQ4KmOOJ5SXWbKM7alzowWwJRmzy0AQ06ww4x6WNc1fPZOqeA1f5FG88JFVfgwlfv49KB94iXdqX1pvim1hlKjXXdUg== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 6dfd7749-9f4b-4405-0888-08d9888eae7e X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:04.3025 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 06/11] libavformat/asfdec: Remove unused parameters 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yNRwFZGWWXr2 Signed-off-by: softworkz --- libavformat/asfdec_f.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 4c898ab3f2..e87c78cd6c 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -299,7 +299,7 @@ finish: avio_seek(s->pb, off + len, SEEK_SET); } -static int asf_read_file_properties(AVFormatContext *s, int64_t size) +static int asf_read_file_properties(AVFormatContext *s) { ASFContext *asf = s->priv_data; AVIOContext *pb = s->pb; @@ -494,7 +494,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) return 0; } -static int asf_read_ext_stream_properties(AVFormatContext *s, int64_t size) +static int asf_read_ext_stream_properties(AVFormatContext *s) { ASFContext *asf = s->priv_data; AVIOContext *pb = s->pb; @@ -554,7 +554,7 @@ static int asf_read_ext_stream_properties(AVFormatContext *s, int64_t size) return 0; } -static int asf_read_content_desc(AVFormatContext *s, int64_t size) +static int asf_read_content_desc(AVFormatContext *s) { AVIOContext *pb = s->pb; uint32_t len1, len2, len3, len4, len5; @@ -573,7 +573,7 @@ static int asf_read_content_desc(AVFormatContext *s, int64_t size) return 0; } -static int asf_read_ext_content_desc(AVFormatContext *s, int64_t size) +static int asf_read_ext_content_desc(AVFormatContext *s) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; @@ -619,7 +619,7 @@ static int asf_read_ext_content_desc(AVFormatContext *s, int64_t size) return 0; } -static int asf_read_language_list(AVFormatContext *s, int64_t size) +static int asf_read_language_list(AVFormatContext *s) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; @@ -639,7 +639,7 @@ static int asf_read_language_list(AVFormatContext *s, int64_t size) return 0; } -static int asf_read_metadata(AVFormatContext *s, int64_t size) +static int asf_read_metadata(AVFormatContext *s) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; @@ -693,7 +693,7 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size) return 0; } -static int asf_read_marker(AVFormatContext *s, int64_t size) +static int asf_read_marker(AVFormatContext *s) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; @@ -772,21 +772,21 @@ static int asf_read_header(AVFormatContext *s) if (gsize < 24) return AVERROR_INVALIDDATA; if (!ff_guidcmp(&g, &ff_asf_file_header)) { - ret = asf_read_file_properties(s, gsize); + ret = asf_read_file_properties(s); } else if (!ff_guidcmp(&g, &ff_asf_stream_header)) { ret = asf_read_stream_properties(s, gsize); } else if (!ff_guidcmp(&g, &ff_asf_comment_header)) { - asf_read_content_desc(s, gsize); + asf_read_content_desc(s); } else if (!ff_guidcmp(&g, &ff_asf_language_guid)) { - asf_read_language_list(s, gsize); + asf_read_language_list(s); } else if (!ff_guidcmp(&g, &ff_asf_extended_content_header)) { - asf_read_ext_content_desc(s, gsize); + asf_read_ext_content_desc(s); } else if (!ff_guidcmp(&g, &ff_asf_metadata_header)) { - asf_read_metadata(s, gsize); + asf_read_metadata(s); } else if (!ff_guidcmp(&g, &ff_asf_metadata_library_header)) { - asf_read_metadata(s, gsize); + asf_read_metadata(s); } else if (!ff_guidcmp(&g, &ff_asf_ext_stream_header)) { - asf_read_ext_stream_properties(s, gsize); + asf_read_ext_stream_properties(s); // there could be an optional stream properties object to follow // if so the next iteration will pick it up @@ -796,7 +796,7 @@ static int asf_read_header(AVFormatContext *s) avio_skip(pb, 6); continue; } else if (!ff_guidcmp(&g, &ff_asf_marker_header)) { - asf_read_marker(s, gsize); + asf_read_marker(s); } else if (avio_feof(pb)) { return AVERROR_EOF; } else { From patchwork Wed Oct 6 06:01:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30925 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp55672iob; Tue, 5 Oct 2021 23:02:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4FLnavaUzcT/teuyEWAdqW8coQ8C9Pe4TpCeqDLAzVNPR9zRSCgA8XZDAFXB4R5hiqyep X-Received: by 2002:a17:907:7752:: with SMTP id kx18mr30205803ejc.276.1633500151635; Tue, 05 Oct 2021 23:02:31 -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 de10si20295119edb.150.2021.10.05.23.02.31; Tue, 05 Oct 2021 23:02:31 -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=@hotmail.com header.s=selector1 header.b=AF2JRhy4; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBAE968AA89; Wed, 6 Oct 2021 09:01:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41E0068AA6E for ; Wed, 6 Oct 2021 09:01:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UuWAU5gn3QUgvhBLwHbo5DrJo9TFGRy1SSNjDoaUzWbTu8u81XS5yAT1sxzCBW5bSDt4WDmHxNAuSHwJ/LqQ8KlKN6aCD1SsjRszhVwuJAlPkG/VG1IMrZbhKel3lyISrMMITjAZMdXgmwM8L8zukMvEz0vaqbVlzMFmZxAR/rsIbl4VPijiF3XqyMRXW9g1pzh9k3gBPerFmG8TQz+toYAMooQssbGXyzWBoOTi1l9sUssWptiAgp6wkuuHgM30nOM92uyvwAsIqKc2W6jZNTqN2dvpL1NCAmj9W34ZzviP2BnjejVXCcR8JKvNa1OFJu7QL2HZlwahPNebA9fFBQ== 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=VvINDtEopHzlurO/TC0D8GYaEnPWnBZwlYjknzOy6jQ=; b=W/5vCwTiEyOabQUeZ4LbLKAA6RodBiqGwSLjdAdT90P17OJgj9DTIJ5hXudxpBGXcX14oPzYbSe79WsnY/n1mqxC2q5GlOGAd46rce5+UC1PHRx5r4B5pAcK7cTGvi2S7wixm3lqcIBzeslNXVdOHK+2w6s3jcM4B+ameeOHSI2i/VrApn/rCDG65r4c9vjX+uzyDLZWvDzwO8CjuMi4D9G9O8WEPQr968gOYzN7cad4/WiUlACHJQ8nNW/+oxUG4C4G92dcHbndNkM6ToLKFbjqVuTEvbUnPfIzPhVNzoUjqL9FaaFi6IBcjLMGlDXetRMg2iFvWQ/BORCC7YX9rg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VvINDtEopHzlurO/TC0D8GYaEnPWnBZwlYjknzOy6jQ=; b=AF2JRhy45fyiHWWlYZ0nukh+LUCq6b4Ec0/9V1QCBRpdPRy0RvEXKqIwxlwqsEhM0VzO4bc95z/aaBXhuDj5L09A6bSIPZnvC5+QARXR6Lzy8mxrNX/KJ72N9bZ9VoC1ISxZUCWNcd7t6HOn+5tmoTRT0RnWE5o8phelmnk4vlPUIKJJFGU2z/6RRC/S/oJy1QnNe47Jd7daDJcvk/5XycnEC+6ylyZgdKf64zDkhM3Dt6tnBceoeOQc9AXsZ3pN4/o1w0Hx60qPS5rqxbp0AbhgwkO4iZAU6ngnkn++nzeH5AiMitjm0QJXKhVu3c7Jn35H0zFQT6ur8kOnYOIyvA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:06 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:06 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 07/11] libavformat/asfdec: Fix macro definition and use Thread-Index: AQHXuneNCI3QoF4fUUuB67TyYvzBXg== Date: Wed, 6 Oct 2021 06:01:06 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> In-Reply-To: <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [n9aMIKTNt9U0AR6IvbzxdHYXyTulSk+Q] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 16a2f506-e329-4c33-3000-08d9888eaff5 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PdYRC6CH/S+9Is631b3LaHLc81rVJD3Ge3Br8eRYdK9bj2Yi0ZQVPwE+HvwPZCTSl1KZjWdsvUU+5NACabLA0oeF9aO8Ve2hSoYChvN40kYyYgBxnOrDm1531xaC8n0V7yzBO6OX20zfZAE9KhjZKP6d2KfsN1Lz/cqU2Xr6R4DsOm+8ZbdkwnTJb5c/uNUHihjD3svUkl7k2ZZadPD5UCT8YqXB0rxEIFXcVsP7d6lcZKkmi4OrRLnStuZlUVblNTCLNoM04BtdtLBxisKi3MaA+3BhZrbgpkL9Btwuel+3mF2OBem9FYToahlChGxjS3IXngGz92yZoTvXjhGCPczIEI5nlekqTqJVZiIv1foSLknIw40wG5zakvFB5IjXxsx+AmX13AORlUvNJ0QdnmBHlJENYYdwh8bS4XIKRgFM+EEg+ysiGEkheHAiEBDZ x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 50t+Kdl2QAw7toYazFz5A/Y7dpIOf3E8obpnENM2JawvqGL2DzAyFmLuCW+cMWjqYtxcfvFPbd/QH5sVjNnkzPUyjWad9wqxAg5JWVvxswtKtk7hKsLarzP9jp2KhY0Yny+m2Dbw/bHx3xgzT8AQ4A== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 16a2f506-e329-4c33-3000-08d9888eaff5 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:06.7941 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 07/11] libavformat/asfdec: Fix macro definition and use 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +TAlJ/oLA8sR Signed-off-by: softworkz --- libavformat/asfdec_f.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index e87c78cd6c..a7b5ffe465 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -896,21 +896,21 @@ static int asf_read_header(AVFormatContext *s) } #define DO_2BITS(bits, var, defval) \ - switch (bits & 3) { \ + switch ((bits) & 3) { \ case 3: \ - var = avio_rl32(pb); \ + (var) = avio_rl32(pb); \ rsize += 4; \ break; \ case 2: \ - var = avio_rl16(pb); \ + (var) = avio_rl16(pb); \ rsize += 2; \ break; \ case 1: \ - var = avio_r8(pb); \ + (var) = avio_r8(pb); \ rsize++; \ break; \ default: \ - var = defval; \ + (var) = (defval); \ break; \ } @@ -993,9 +993,9 @@ static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) asf->packet_flags = c; asf->packet_property = d; - DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size); - DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored - DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length + DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size) + DO_2BITS(asf->packet_flags >> 1, padsize, 0) // sequence ignored + DO_2BITS(asf->packet_flags >> 3, padsize, 0) // padding length // the following checks prevent overflows and infinite loops if (!packet_length || packet_length >= (1U << 29)) { @@ -1056,9 +1056,9 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) asf->stream_index = asf->asfid2avid[num & 0x7f]; asfst = &asf->streams[num & 0x7f]; // sequence should be ignored! - DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); - DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); - DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); + DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0) + DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0) + DO_2BITS(asf->packet_property, asf->packet_replic_size, 0) av_log(asf, AV_LOG_TRACE, "key:%d stream:%d seq:%d offset:%d replic_size:%d num:%X packet_property %X\n", asf->packet_key_frame, asf->stream_index, asf->packet_seq, asf->packet_frag_offset, asf->packet_replic_size, num, asf->packet_property); @@ -1134,7 +1134,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) return AVERROR_INVALIDDATA; } if (asf->packet_flags & 0x01) { - DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal + DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0) // 0 is illegal if (rsize > asf->packet_size_left) { av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n"); return AVERROR_INVALIDDATA; From patchwork Wed Oct 6 06:01:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp55828iob; Tue, 5 Oct 2021 23:02:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7sc0th49UNaAOUWQAnjYTrtLix4nsZIhh+C50jDfzz1uQ0s7/KLF1BQnlOSHPMRrnG3H/ X-Received: by 2002:a50:cf83:: with SMTP id h3mr32740345edk.63.1633500164799; Tue, 05 Oct 2021 23:02:44 -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 nc14si2924636ejc.445.2021.10.05.23.02.44; Tue, 05 Oct 2021 23:02:44 -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=@hotmail.com header.s=selector1 header.b=tevGmGvF; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E07A568AAE8; Wed, 6 Oct 2021 09:01:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97B0C68AA6E for ; Wed, 6 Oct 2021 09:01:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BAjpEnRbsol0kA4r8uDDzcZsL6zVRinyT1QJ+50UVjq9PnkW4DuAoYXLhQPfog7zkEsevNcCnTRMEt8aTqCd6vDqfOMkA1xo8Iun6UGGEcaN2byaLzD8tBRDXmU6+GcZRpe6LxN23NAclpBEGS5vWEbJVa6V68hJGUz73FkOW/9qR8/SnY5r/2p6y3oFRl1VAzOcJQx07k4jXRNi4d/mNylqT4D5JlLyCF0zeH+deSvUTJyadpBHRA7YH4PRPlOIPp8o0po5ZSp8J9Xemp4EL4y+ucYBZaV3PF95L2M06hnGIWFbME3mxTKePOGrL2670NAf/hNWZAQ7+h0K8/11FQ== 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=M/FKCMmgHJNWtu7vCkdpGkQDXqYs2eKyDzGb4ZhrH5Q=; b=hld24NlPTQ+SxaYhNdkqLcnqWI6IX4YU4rC0qsJw8LuuCz8nF3ZGB99jP7v6LiL7zXeTMIN7Iee+XQGIFxaG/p4GTsnS7siYaWX1+xh0WOFNtNgBfQTLCPpubhDCBzXY104bL2AAUHqan2jTDThp+valw33mRs3+MP6JFDQbFdzWno9qwLqt3WZhu6lukF8MDdtz+hcBsoGdDRwRz/nfhwYnbNkJOib17u+tSbgBEozYh5DjROuxaMKwfOOBQubkUaHQJM8lOD8XPdazyGj/yYpP6d6AHe0dP90qUpGFNRDgLMtcns94J4ZNqj6EiYVPyRuNQgbp9yU46DTQbtBJAg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M/FKCMmgHJNWtu7vCkdpGkQDXqYs2eKyDzGb4ZhrH5Q=; b=tevGmGvFzY4wuT5HdCFwOfer0Q1RS1e8caZNHh8/7AcXmNhIupSNHEsc3vMbsYWloQuGkldCHvbsCvxNQC7NTuj7rr3BbGH3B2xRMs2zJDdM4yXQGXnN/MrImSp3/ZK69pGVwQy1Dq5uXz+qe8/y6frc+9HD2IBIkUcVdUqI5/iocfFT6Pl5ImlB2qFGRe6QfM4X7KaTqVKuKg6HPznYWIrI/rA2iK6r/HZAn46+quKfxT2cdeJ8ljDdJJFC7VCOatFLwHkadeS7ooMlYWfy6rVX1vJ1lJ7K3Ev0OFcjVJBywxOOvWwdaI0FvmcNWcurUSKDy4H18xBZ8QafZ4rODg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:09 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:09 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 08/11] libavformat/asfdec: Remove variable redefinition in inner scope Thread-Index: AQHXunePQVocf6igXE2Ys9ZQLJHjcw== Date: Wed, 6 Oct 2021 06:01:09 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [YZ0bMJxxyP8YY4CF+rc/4pop54jU5VKl] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 16ae4086-8e12-4c7f-f846-08d9888eb1a7 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: e4I7Ni2LykBOmYoTk2VnaDMaLaRyZzoYV51t8yzT8n/auHCedZtuybnF7rkc4m7EamHD0q6SPTmeHmhJZZKImtYA3SZVe9ccplFsEx2rKcyE2t/eQdzalc/b3yRipW7y0AFxUgJ3qbBU0YIzqQYu4G1oNjou6qfrWGxK+SDTTac34Bs1xA0p9+F8L2Ea8+1vwG6WQQg3480UmMw26Zzn14a8oBcSLHcaQzZia1IVZnOxkIxeQhEjxVz/hyNSB+i1NtDaRiJ34fTS8hRbA9NKks6ncmC77n24CzNod2D8Vdqk2FE5bBwLswc0Xxkvxq5Nbr13l+VSvHsLgmBU4zO65+Hmo7Sts9XIOD5Y7K65IRJur/XZrfdF8H7Eed5e7EVB8EtuaazB2ZL8vwiK4vhrGQLChCTCYGRFgIrDrWc1iD5Cu3OELKHT4QJSs7o+ppy6 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: dK5kHmExzgaLywKl4Vxf19Xf9qUUL4RLq8Om3Nm9GdeO2zXeglZad7kd15Z7XyRdxMUeSfpJY3g+RBFurJEx0LWY3QySKK7dv8PgcPr9aXY4L7/ttEhfkPxcPXFj6da0Ek4WCzs8CDxwLBGjWUYc4g== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 16ae4086-8e12-4c7f-f846-08d9888eb1a7 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:09.6604 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 08/11] libavformat/asfdec: Remove variable redefinition in inner scope 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NyC3ATcVXYju Signed-off-by: softworkz --- libavformat/asfdec_f.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index a7b5ffe465..8283f245ab 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -1181,7 +1181,7 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) return AVERROR_EOF; if (asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1 && asf->packet_time_start == 0) { - int ret = asf->packet_size_left + asf->packet_padsize; + ret = asf->packet_size_left + asf->packet_padsize; if (asf->packet_size_left && asf->packet_size_left < FRAME_HEADER_SIZE) av_log(s, AV_LOG_WARNING, "Skip due to FRAME_HEADER_SIZE\n"); @@ -1250,7 +1250,6 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) if (asf_st->pkt.size != asf_st->packet_obj_size || // FIXME is this condition sufficient? asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) { - int ret; if (asf_st->pkt.data) { av_log(s, AV_LOG_INFO, From patchwork Wed Oct 6 06:01:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp55995iob; Tue, 5 Oct 2021 23:02:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyj2it0ZdGdPBWiujSLY9sddlkseFe6HulG/L6qQ4/6YUT0W0VV4/ZtGjXOkm+7GbdMuonB X-Received: by 2002:a17:906:369a:: with SMTP id a26mr29100735ejc.539.1633500178172; Tue, 05 Oct 2021 23:02:58 -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 ce28si1033428edb.3.2021.10.05.23.02.57; Tue, 05 Oct 2021 23:02:58 -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=@hotmail.com header.s=selector1 header.b=nBXlK7Tw; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0F4468AB00; Wed, 6 Oct 2021 09:01:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE6B168AA8E for ; Wed, 6 Oct 2021 09:01:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V6xWPlnuQGEmJhKSEpX2dd3H1gTiTLwIt7ZWlzkACcs2ghBkv0v0wEr1p+umUsunMC2zjvHezAQmmMVIpcPXnEOVylNxGhbly3bq/IAD/L4S2FKz0fM9I9SZ8Mh++xHkR+Sv1kcxKYoEP61Z00eTpg3KK9InTXz4BL+q3th8WwhspOz40BzsHrTkllSgXyCcoFAtpClkFROF/Bdc05uVCwRvvTT5eWCeAqdrRgZVJZoh1BRGNh9GE9uGJ5sJq6dWb7EBtIy2cy8YAn8WQETRXxlhzo+/rKbPEN3heFjYrsH3PC3nUnixyNhiNUCklUnmT03uKdM0b2VIG6ExKWyv7g== 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=KbEfBLncbTX76CdgDdmwj7wkS+HFNNUdCBzpGQVZnyM=; b=Dq+4XQFWvWHRsUdSozB59TkNu1Kjxsb3Gtq6bsoJEETaFSGd6OsXfcKZxAHQZFFMl26voFSaEvSJqvD1l/bmdALwmyqk55jA2lR8ItUdVqyliFi0LrM6bLEg5dZtv6GukBtGt3T1+OYOPPkAm4Gnu49s/F6od84yZU0C7Fd4/Mm34Es15rFtP+uprkT0c/3/34Cs/f7yA4dPSBSmNiVoyAo83sR6UhhRG1oMKrEnsjWxSSsQjJuWLA6hXzbc/4E/cJypOaAdUalejdChkeTQ8KEe6ZTGF0y/PriYpLQ4F8K4ZJIPkg1ztkrRMkXj0j7SyLiribU1izFEYCXUBLz97A== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KbEfBLncbTX76CdgDdmwj7wkS+HFNNUdCBzpGQVZnyM=; b=nBXlK7TwEX9o5Z29K5fgzTnhkzu/WIIzHfuYbVcl0BvBD4Q1LkK9+I/wAswVUg/HIRZmajhYpOEmI2ADt1o9/eIo1eJ6SS7M3i+dWMXd0OpoxnRPQKAn5Ne4T/sI4iTcPnl1c+A2mc0wLse/NucxwsOqkpg6m1SqjF+zB4Qloggs5doGuW9yRDo3Vzri7m16+E1y1/OhWMxz+MlpRB5Ql1N8tD/5kXwXd82FwLAOI8mM1dhdxOVhP5O9MEElFGHrBFQ6JiemqnaaHsOW3OMlx5ERpjXmrbU6WUy5dVPv5RSJkJcU+plN+PbM77dAsmwa+ApqcHCsyuNv4o7n8fMQFA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:12 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:12 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 09/11] libavformat/asfdec: Ensure variables are initialized Thread-Index: AQHXuneQX+HBuYzh2U+LlWW7nQZjhg== Date: Wed, 6 Oct 2021 06:01:12 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> <6dd6ec1943ecaee3ba0712b5e3ce193e3f0702f9.1633499980.git.softworkz@hotmail.com> In-Reply-To: <6dd6ec1943ecaee3ba0712b5e3ce193e3f0702f9.1633499980.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [3ZgzjaKReF6tIAlUg+//t93CKBJD39SM] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a5b8a8ac-bac2-4486-ff63-08d9888eb37b x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: yKDSyIADP9ONGR7gmFpv/pmtXEb+iyfGmcnPsbSjs4+81RP9Hpp7i3HwBBnnuhxbZ3jVvIp8T4Y5zTJd30JU2YxIejCV3nP/fv5iTQJiIRffCbPcFj8t6FxxhJ/Rj47W24ymli/j1DZwWKqhJGRruw8h950GL0BqbP+4mCKg1ie2vD6RCw4CuYZUFIXxSbuy6lqolOwtgCIH7h3pwifBqFRIPIFgtXJU1AHDJ07xOU1Q2gRAW+SKgotPyz9q43arB8K6rakg97PElAG/VyYHuAIksiZuH2T0+HxQrcDcGu5kAjpLj8hl9sc58fDK7J3vuxhV6wgjBPcAe2GvW39+80dynvtYOpvGn+8/eSCO0/ZM7ofjNxkMG3NQIr7sm/Ow6gb3zVLCU3Wkh0hZcv3TDsps1Jmd1yS+YS4wJ6W0ezDg9TP4wwH3iStsy7s5PQhE x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 3me3sZMqgOY8DNN5Jpnnx7KXRZfZetoQwMaOPW9xXL43vPrzSbv8yKIasA2jneJ2n1SE6W9MNAe39lSL+o/fa7ZJbi6HO78dEWBlULjbGNJFbBonvaclydVG1UkLvw46gnHZdtQahJzAA0wzumhBAw== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: a5b8a8ac-bac2-4486-ff63-08d9888eb37b X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:12.6727 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 09/11] libavformat/asfdec: Ensure variables are initialized 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: y/Xjz09d1UGd Signed-off-by: softworkz --- libavformat/asfdec_f.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 8283f245ab..024d77903b 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -968,6 +968,7 @@ static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) avio_seek(pb, -1, SEEK_CUR); // FIXME } } else { + d = e = 0; c = avio_r8(pb); if (c & 0x80) { rsize ++; From patchwork Wed Oct 6 06:01:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30926 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp56192iob; Tue, 5 Oct 2021 23:03:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxK4dvFE4y86/xaeEpoEQnymkq/mBbezcOl74DxuqSfCQByZn4I5uc0d0EkTLHeM1jVdjHg X-Received: by 2002:aa7:db8a:: with SMTP id u10mr33034850edt.189.1633500193503; Tue, 05 Oct 2021 23:03:13 -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 jz18si18008534ejb.66.2021.10.05.23.03.13; Tue, 05 Oct 2021 23:03:13 -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=@hotmail.com header.s=selector1 header.b=I0pn3Rmk; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B26D368AB1D; Wed, 6 Oct 2021 09:01:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2074.outbound.protection.outlook.com [40.92.19.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6486068AA8F for ; Wed, 6 Oct 2021 09:01:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XaaSE4CRQ/PQNF2xmGZ3H2OfC9TQoDjnEpmvUlprot78zt6Mhd7g4UO59ZNXrFcaLFGUpbmaWOJBjlZrQ6axm8JOckUwIghUvkOJrWU2ZBt5hqKv7iBAcCIAzONZvnRAc1RHVSxfCMaBkYW84k3XsPPSzFZAanOQcDksPmSnhuNlJLYnu5DB58bEvZb8gGfX+H9lQKUitexvnVKx1F/8e+zk4pLR16lEtdSDyg+jGVJImEZa4P+ykkTW9pQU5Ax4HKomdco5rapYuxKGCQC29mZJoIfUUPuuLwiwGoB/OD4j/GJNVuLvwU43RxbFwMtViP/5UKnD+iq4drlrjX01eA== 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=avGMKhq7R869jd9fCMl6osH+jRdkMQWrAxVrvb0pUrE=; b=GgfN2ea/zH2fp30X0VKPvUZNlflPREm7pIK6GZQIT2ohp8WXVMT0KvaLztOLSoiVtLUqLOR5Gl1wz85dSK+YSNHVWFEBbK0QNnAzjPMETcYnQjzIzZpA7ca4PGqjZUbbCK+KrVP55wCsOnngLCCeLf/pb6Yml2k0R115LyfEkYoRZ+szIvtwb9P0BUxmhwrrJQ9u5B/HElwtQJsbY8oCS613hE0XfcEMBaVyYMg97HEOBpkWMiIrs1gJs9V/Wf1usGLk26jtlP/MilfKYA/DgHfLbQCQ6XgsW3QoDHuGy2zoM2AER1n3eLK7R59z69HDsPE8K7qcKh11DPnjULIM8g== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=avGMKhq7R869jd9fCMl6osH+jRdkMQWrAxVrvb0pUrE=; b=I0pn3RmkWdZo+cWU66IkJ/JVrqReghDVVhIl/Mr4llvIdhC828IflWsOk+gzmzHIZL7Dymum4IXlDDQeoiWkdxvdTXpKtgDG1bqXCfxyBJhprMvNa4EOdPgHTLEp5wn6ZMQFKpskvYRax/kt62P1XlOueTb6BIQnp8Nker4d8GbFzx1kjb8a6fDF6sCbPAFc/h+lS8dbIAU3HQU8/hj2WDZVnlc7s6+LIjtSdMZ1Z+txNW8UsjlEHRoClRBGIu2uNpRo15CIvK3oqcdo6RTNXf4WScDzYX2oTGplYwtBj7Uk4cW0SipVxCN4RswPLwx+uJ0v5bfNP0jWYUNYWqX1cw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:18 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:18 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 10/11] libavformat/asfdec: Fix parameter type in asf_read_stream_propertie() Thread-Index: AQHXuneUkTjxYQxfk0aTn2xMoeBbFA== Date: Wed, 6 Oct 2021 06:01:18 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> <6dd6ec1943ecaee3ba0712b5e3ce193e3f0702f9.1633499980.git.softworkz@hotmail.com> <84ad876e8f0f19696962f6d3660c7d3297324dab.1633499980.git.softworkz@hotmail.com> In-Reply-To: <84ad876e8f0f19696962f6d3660c7d3297324dab.1633499980.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [DDGlqVNGWQXsMkVV58nRuh7CqxBeRkl0] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c326b52e-1d13-48ef-f9ac-08d9888eb709 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PPEjB6AvQnmIxBXSdmSJ15awqqWypx6R6u3SlJr0LXH4Cw9KaHFNzNjJJlPIqvPTC8aUt7ESYsHf7XD7Qu7NvcKa4cnBjsdXGA3q4NLf2kJDRLRBnckxVrQnikU1KuS8vYL07l4ukEw03j1l+6D4y2DbZoBqCe+Rgw9I3Px4/QSL6PWJ7BXEsQqz1OYpXwwgomlTTEmiYrgexQCzjXg1GRT6i9IkAhyUW1vqfleTMGEL7IqvNtrs5Cxk4nDNznTmwvxqHsdPMi0B1uq9N4IO3ERLSB6pe+HcFUPjvWjSa4o4FQOX0WYVXxEVYxLN6GRKIXS0CpgChO1/kO7cnJI98DlTGirBwrWlogqnZENoviqa+wyu2vVzc9CIMbWebMOpxqv0HIAdT69cfG8zfr7EeIIeC8bgljlnZZIsbHcoeXxfnuxlQ9PCDo2oIC7ahcvM x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: NWRrzA3BT2kwJrQmUgj/S868LKeWLV/2cF/p3BysWRSHuhCvvw8l2E96+dBm6NG7mFNeA316CuTk93xYw9iuazIHZtVxARHddv9jEXIDJrNocXzu3boOmOmEixa0CyO3A109YbPrtcFrFu2sltPz4g== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: c326b52e-1d13-48ef-f9ac-08d9888eb709 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:18.6504 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 10/11] libavformat/asfdec: Fix parameter type in asf_read_stream_propertie() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SfLLCxtsnTNU Signed-off-by: softworkz --- libavformat/asfdec_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 024d77903b..b8140a6d57 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -323,7 +323,7 @@ static int asf_read_file_properties(AVFormatContext *s) return 0; } -static int asf_read_stream_properties(AVFormatContext *s, int64_t size) +static int asf_read_stream_properties(AVFormatContext *s, uint64_t size) { ASFContext *asf = s->priv_data; AVIOContext *pb = s->pb; From patchwork Wed Oct 6 06:01:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30920 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp56329iob; Tue, 5 Oct 2021 23:03:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3f1goR40xBhNj9EAI/sERfUH4hsmN/1sQT1s/tK9OReLfFY7W9TJA1v6tJ3SAofGLa/Rr X-Received: by 2002:a50:ccc4:: with SMTP id b4mr32177018edj.83.1633500207662; Tue, 05 Oct 2021 23:03: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 l1si23879612ejz.748.2021.10.05.23.03.27; Tue, 05 Oct 2021 23:03: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=@hotmail.com header.s=selector1 header.b=nHjELz7p; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAF3968094F; Wed, 6 Oct 2021 09:01:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2073.outbound.protection.outlook.com [40.92.19.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3555268AB32 for ; Wed, 6 Oct 2021 09:01:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jcx1O4oD1nfC7f9h7A/HdN/bErIIOeL6mTxjmHnqJ5umqoHt2Nkv3nh4K5/LB2e+O3Q7YEQ1eh/k55oXzCZM6iCSW0e395HqKwB1QFPFxtsrd4Vt/ihR5w2idaLkY7Yy5FG5toAOtRKUk07X6jH+ftorIHiIlKIPE3YTdt5zCc9kjHl4bhonVuRdr8vNUqNp1rpCwjmv83kqwarshRt7atGQfXJbQEFcD6WooumlX/p1MsCZ48mdmFJsGqcPEBi8ThBUB+Q2Qi8faOS+RIhQUiHSnEBNC9RmDmZy1uUc/866B24H936Dg7Fm+as7LgPlNNTnb8lrpbabl05FIGkBdg== 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=881hHkc1YWUkvJ8RGDewUYj3N2HPdwshZ57tE0A7OXc=; b=ey54Q4AZ36bcQrnZp8RNu4s2/ScMLXAsg38GySlO2Bat4iRMgo2ZyIoFhxET1N1KDQev2VJ3wmPYofio4WIRZpH12IhSya/dUDKSW2Ja0AvxoXMsfKQZ9Az6Wpu0ozJibGhLAQTJPuYjkRiFS1NcNLKl9h9BKWjwdIveP6YQfawfe/fWR+/47aMMJOfWQsDsQuX4/VsRH97MSjeXd5TQf9WMz3KnLr7YbogBVjtM9G3nnxNAsxAhr1Sta9HAyRT1euHvDllHtEHUTCAw0ZCkcGWKJ6TTN/3CqAcsO/PX0pFb5kzT1hWU4PNngb3XTW5VQFvlSUfuCkHZby7xR161gA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=881hHkc1YWUkvJ8RGDewUYj3N2HPdwshZ57tE0A7OXc=; b=nHjELz7pzFKT62nusVqnXWxg7eSfGLxbzM8cZXanAlbPf3mMIy+46GTY4DGaCR+lPXIRlvOkIV0xxXd+N/RJsQfkOmFh1GnMWRTVEe1TwBvQL/h6FGFaEQNpXqXklQ14pKgWKT5pq5Lo/VYq3EiPnne4n5xeNKfiwTje0UrnFcI4qxXCTExnhC2x97+ymwMr6beMrZWm5Zu1XRH4a7Bdg8aioADtxv4x9UspaCAPAbyeMd7BAcoZgB4aoRHLjfop5aqG9slbFcngmMfc6uVCTFp9brJmUwIAGszf5aDaJHoC4XasAF33pslalANdp2+6ZHgRxLte7qJFf522tLMyng== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:21 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:21 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 11/11] libavformat/asfdec: Fix variable types and add checks for unsupported values Thread-Index: AQHXuneWHJmwjETu5k6hOsZhpi4y6A== Date: Wed, 6 Oct 2021 06:01:21 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> <6dd6ec1943ecaee3ba0712b5e3ce193e3f0702f9.1633499980.git.softworkz@hotmail.com> <84ad876e8f0f19696962f6d3660c7d3297324dab.1633499980.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [eoTKS05XFJGgedq9nNSdSts8uBTpLDVS] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c21ff6b6-e9f3-4a5b-3677-08d9888eb8c6 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +rkdtspZCfm6DH7cNccyQpzARACeySlmUgUkEcpreUrYvNVrYEiXPf+oAj3IytrvOlwUQcG6kzW7m/v/5AmiKnehRm1m2vFaq2dkU4OxZFhWhheMZItg1FG4PpScKDfTk4WNzyzKj+KUk5yNZiNH28HXFW5mvnZgp3E/EDVxfQCiS0gdXl0p/Si/N3TPUbswmIDy2mkS+xgTcnGhPie9aonntKUNwHdGNuJBmu5Ktw8+ogFKWSTpus5qwo56Y7IFrUUhNl2IYQyGm6P4SsCL3uqiW8ZlA1eJ1RX/qSr4jMH+dpAigK4Oayq7qKDv2GZp2FUK4fKUFCKgRE6ghZDVPu4sJKna6LzAKyujZjFphc1gH2YaRh3BaNLutTFiSPVb5KWuUGKuU4/4bLRHaYcI/XB2m7oZRdDq4iRu+sZYtJ4nEHbIKfJAGtXwtH27Sm9j x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: HKZVXZwBSKB3PPiuvXBQUhOUZfe6DbnWO942mevKKTfh2vQFvN3gakXXpe3pZJeaLiM1DmQcCTUnQwHR1/e80XeD1VmCSWGHRrYuNt3kS1PPVnjmcWFEifgMXFwjEH7eJy1ohQ2LUwb2JuZzVclAbA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: c21ff6b6-e9f3-4a5b-3677-08d9888eb8c6 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:21.6007 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 11/11] libavformat/asfdec: Fix variable types and add checks for unsupported values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6CZYTGLqVRHt Signed-off-by: softworkz --- libavformat/asfdec_f.c | 168 ++++++++++++++++++++++++++--------------- 1 file changed, 108 insertions(+), 60 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index b8140a6d57..c7141f6da1 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -332,9 +332,9 @@ static int asf_read_stream_properties(AVFormatContext *s, uint64_t size) ASFStream *asf_st; ff_asf_guid g; enum AVMediaType type; - int type_specific_size, sizeX; - unsigned int tag1; - int64_t pos1, pos2, start_time; + unsigned int tag1, type_specific_size, sizeX; + int64_t pos1, pos2; + uint32_t start_time; int test_for_ext_stream_audio, is_dvr_ms_audio = 0; if (s->nb_streams == ASF_MAX_STREAMS) { @@ -403,7 +403,14 @@ static int asf_read_stream_properties(AVFormatContext *s, uint64_t size) st->codecpar->codec_type = type; if (type == AVMEDIA_TYPE_AUDIO) { - int ret = ff_get_wav_header(s, pb, st->codecpar, type_specific_size, 0); + int ret; + + if (type_specific_size > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported WAV header size (> INT32_MAX)\n"); + return AVERROR(ENOTSUP); + } + + ret = ff_get_wav_header(s, pb, st->codecpar, (int)type_specific_size, 0); if (ret < 0) return ret; if (is_dvr_ms_audio) { @@ -433,21 +440,32 @@ static int asf_read_stream_properties(AVFormatContext *s, uint64_t size) } } else if (type == AVMEDIA_TYPE_VIDEO && size - (avio_tell(pb) - pos1 + 24) >= 51) { + unsigned int width, height; avio_rl32(pb); avio_rl32(pb); avio_r8(pb); avio_rl16(pb); /* size */ - sizeX = avio_rl32(pb); /* size */ - st->codecpar->width = avio_rl32(pb); - st->codecpar->height = avio_rl32(pb); + sizeX = avio_rl32(pb); /* size */ + width = avio_rl32(pb); + height = avio_rl32(pb); + + if (width > INT32_MAX || height > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported video size %dx%d\n", width, height); + return AVERROR(ENOTSUP); + } + + st->codecpar->width = (int)width; + st->codecpar->height = (int)height; /* not available for asf */ avio_rl16(pb); /* panes */ st->codecpar->bits_per_coded_sample = avio_rl16(pb); /* depth */ tag1 = avio_rl32(pb); avio_skip(pb, 20); if (sizeX > 40) { - if (size < sizeX - 40 || sizeX - 40 > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) - return AVERROR_INVALIDDATA; + if (size < sizeX - 40 || sizeX - 40 > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { + av_log(s, AV_LOG_DEBUG, "Unsupported extradata size\n"); + return AVERROR(ENOTSUP); + } st->codecpar->extradata_size = ffio_limit(pb, sizeX - 40); st->codecpar->extradata = av_mallocz(st->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); @@ -499,9 +517,9 @@ static int asf_read_ext_stream_properties(AVFormatContext *s) ASFContext *asf = s->priv_data; AVIOContext *pb = s->pb; ff_asf_guid g; - int ext_len, payload_ext_ct, stream_ct, i; - uint32_t leak_rate, stream_num; - unsigned int stream_languageid_index; + uint16_t payload_ext_ct, stream_ct, i; + uint32_t leak_rate, ext_len; + uint16_t stream_languageid_index, stream_num; avio_rl64(pb); // starttime avio_rl64(pb); // endtime @@ -513,15 +531,15 @@ static int asf_read_ext_stream_properties(AVFormatContext *s) avio_rl32(pb); // alt-init-bucket-fullness avio_rl32(pb); // max-object-size avio_rl32(pb); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved) - stream_num = avio_rl16(pb); // stream-num + stream_num = (uint16_t)avio_rl16(pb); // stream-num - stream_languageid_index = avio_rl16(pb); // stream-language-id-index + stream_languageid_index = (uint16_t)avio_rl16(pb); // stream-language-id-index if (stream_num < 128) asf->streams[stream_num].stream_language_index = stream_languageid_index; avio_rl64(pb); // avg frametime in 100ns units - stream_ct = avio_rl16(pb); // stream-name-count - payload_ext_ct = avio_rl16(pb); // payload-extension-system-count + stream_ct = (uint16_t)avio_rl16(pb); // stream-name-count + payload_ext_ct = (uint16_t)avio_rl16(pb); // payload-extension-system-count if (stream_num < 128) { asf->stream_bitrates[stream_num] = leak_rate; @@ -535,12 +553,10 @@ static int asf_read_ext_stream_properties(AVFormatContext *s) } for (i = 0; i < payload_ext_ct; i++) { - int size; + uint16_t size; ff_get_guid(pb, &g); - size = avio_rl16(pb); + size = (uint16_t)avio_rl16(pb); ext_len = avio_rl32(pb); - if (ext_len < 0) - return AVERROR_INVALIDDATA; avio_skip(pb, ext_len); if (stream_num < 128 && i < FF_ARRAY_ELEMS(asf->streams[stream_num].payload)) { ASFPayload *p = &asf->streams[stream_num].payload[i]; @@ -577,20 +593,21 @@ static int asf_read_ext_content_desc(AVFormatContext *s) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; - int desc_count, i, ret; + uint16_t desc_count, i; + int ret; - desc_count = avio_rl16(pb); + desc_count = (uint16_t)avio_rl16(pb); for (i = 0; i < desc_count; i++) { - int name_len, value_type, value_len; + uint16_t name_len, value_type, value_len; char name[1024]; - name_len = avio_rl16(pb); + name_len = (uint16_t)avio_rl16(pb); if (name_len % 2) // must be even, broken lavf versions wrote len-1 name_len += 1; if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len) avio_skip(pb, name_len - ret); - value_type = avio_rl16(pb); - value_len = avio_rl16(pb); + value_type = (uint16_t)avio_rl16(pb); + value_len = (uint16_t)avio_rl16(pb); if (!value_type && value_len % 2) value_len += 1; /* My sample has that stream set to 0 maybe that mean the container. @@ -623,14 +640,16 @@ static int asf_read_language_list(AVFormatContext *s) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; - int j, ret; - int stream_count = avio_rl16(pb); + int ret; + uint16_t j; + const uint16_t stream_count = (uint16_t)avio_rl16(pb); + for (j = 0; j < stream_count; j++) { char lang[6]; - unsigned int lang_len = avio_r8(pb); + const uint8_t lang_len = (uint8_t)avio_r8(pb); if ((ret = avio_get_str16le(pb, lang_len, lang, sizeof(lang))) < lang_len) - avio_skip(pb, lang_len - ret); + avio_skip(pb, (int)lang_len - ret); if (j < 128) av_strlcpy(asf->stream_languages[j], lang, sizeof(*asf->stream_languages)); @@ -643,14 +662,14 @@ static int asf_read_metadata(AVFormatContext *s) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; - int n, name_len_utf8; - uint16_t stream_num, name_len_utf16, value_type; + int name_len_utf8; + uint16_t stream_num, name_len_utf16, value_type, i, n; uint32_t value_len; - int ret, i; - n = avio_rl16(pb); + int ret; + n = (uint16_t)avio_rl16(pb); for (i = 0; i < n; i++) { - uint8_t *name; + char *name; avio_rl16(pb); // lang_list_index stream_num = (uint16_t)avio_rl16(pb); @@ -664,7 +683,7 @@ static int asf_read_metadata(AVFormatContext *s) return AVERROR(ENOMEM); if ((ret = avio_get_str16le(pb, name_len_utf16, name, name_len_utf8)) < name_len_utf16) - avio_skip(pb, name_len_utf16 - ret); + avio_skip(pb, (int)name_len_utf16 - ret); av_log(s, AV_LOG_TRACE, "%d stream %d name_len %2d type %d len %4d <%s>\n", i, stream_num, name_len_utf16, value_type, value_len, name); @@ -697,19 +716,21 @@ static int asf_read_marker(AVFormatContext *s) { AVIOContext *pb = s->pb; ASFContext *asf = s->priv_data; - int i, count, name_len, ret; + int ret; + unsigned count, i; + uint16_t name_len; char name[1024]; avio_rl64(pb); // reserved 16 bytes avio_rl64(pb); // ... count = avio_rl32(pb); // markers count avio_rl16(pb); // reserved 2 bytes - name_len = avio_rl16(pb); // name length + name_len = (uint16_t)avio_rl16(pb); // name length avio_skip(pb, name_len); for (i = 0; i < count; i++) { - int64_t pres_time; - int name_len; + uint64_t pres_time; + unsigned name2_len; if (avio_feof(pb)) return AVERROR_INVALIDDATA; @@ -720,13 +741,18 @@ static int asf_read_marker(AVFormatContext *s) avio_rl16(pb); // entry length avio_rl32(pb); // send time avio_rl32(pb); // flags - name_len = avio_rl32(pb); // name length - if ((unsigned)name_len > INT_MAX / 2) + name2_len = avio_rl32(pb); // name length + if (name2_len > INT_MAX / 2) return AVERROR_INVALIDDATA; - if ((ret = avio_get_str16le(pb, name_len * 2, name, - sizeof(name))) < name_len) - avio_skip(pb, name_len - ret); - avpriv_new_chapter(s, i, (AVRational) { 1, 10000000 }, pres_time, + if ((ret = avio_get_str16le(pb, (int)name2_len, name, + sizeof(name))) < name2_len) + avio_skip(pb, name2_len - ret); + + if (pres_time > INT64_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported presentation time value: %"PRIu64"\n", pres_time); + return AVERROR(ENOTSUP); + } + avpriv_new_chapter(s, i, (AVRational) { 1, 10000000 }, (int64_t)pres_time, AV_NOPTS_VALUE, name); } @@ -739,7 +765,7 @@ static int asf_read_header(AVFormatContext *s) ff_asf_guid g; AVIOContext *pb = s->pb; int i; - int64_t gsize; + uint64_t gsize; ff_get_guid(pb, &g); if (ff_guidcmp(&g, &ff_asf_header)) @@ -754,7 +780,7 @@ static int asf_read_header(AVFormatContext *s) asf->streams[i].stream_language_index = 128; // invalid stream index means no language info for (;;) { - uint64_t gpos = avio_tell(pb); + const int64_t gpos = avio_tell(pb); int ret = 0; ff_get_guid(pb, &g); gsize = avio_rl64(pb); @@ -809,7 +835,12 @@ static int asf_read_header(AVFormatContext *s) len= avio_rl32(pb); av_log(s, AV_LOG_DEBUG, "Secret data:\n"); - if ((ret = av_get_packet(pb, pkt, len)) < 0) + if (len > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported encryption packet length: %d\n", len); + return AVERROR(ENOTSUP); + } + + if ((ret = av_get_packet(pb, pkt, (int)len)) < 0) return ret; av_hex_dump_log(s, AV_LOG_DEBUG, pkt->data, pkt->size); av_packet_unref(pkt); @@ -923,7 +954,7 @@ static int asf_read_header(AVFormatContext *s) static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) { ASFContext *asf = s->priv_data; - uint32_t packet_length, padsize; + uint32_t packet_length, packet_ts, padsize; int rsize = 8; int c, d, e, off; @@ -1011,7 +1042,12 @@ static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) return AVERROR_INVALIDDATA; } - asf->packet_timestamp = avio_rl32(pb); + packet_ts = avio_rl32(pb); + if (packet_ts > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported packet_timestamp value: %d\n", packet_ts); + return AVERROR(ENOTSUP); + } + asf->packet_timestamp = (int)packet_ts; avio_rl16(pb); /* duration */ // rsize has at least 11 bytes which have to be present @@ -1030,10 +1066,21 @@ static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) rsize, packet_length, padsize, avio_tell(pb)); return AVERROR_INVALIDDATA; } - asf->packet_size_left = packet_length - padsize - rsize; + + if (packet_length - padsize - rsize > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported packet_size_left value: %d\n", packet_length - padsize - rsize); + return AVERROR(ENOTSUP); + } + asf->packet_size_left = (int)(packet_length - padsize - rsize); + if (packet_length < asf->hdr.min_pktsize) padsize += asf->hdr.min_pktsize - packet_length; - asf->packet_padsize = padsize; + if (padsize > INT32_MAX) { + av_log(s, AV_LOG_DEBUG, "Unsupported packet padsize value: %d\n", padsize); + return AVERROR(ENOTSUP); + } + + asf->packet_padsize = (int)padsize; av_log(s, AV_LOG_TRACE, "packet: size=%d padsize=%d left=%d\n", s->packet_size, asf->packet_padsize, asf->packet_size_left); return 0; @@ -1068,22 +1115,23 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) return AVERROR_INVALIDDATA; } if (asf->packet_replic_size >= 8) { - int64_t end = avio_tell(pb) + asf->packet_replic_size; + const int64_t end = avio_tell(pb) + asf->packet_replic_size; AVRational aspect; - asfst->packet_obj_size = avio_rl32(pb); - if (asfst->packet_obj_size >= (1 << 24) || asfst->packet_obj_size < 0) { + const unsigned packet_obj_size = avio_rl32(pb); + if (packet_obj_size >= (1 << 24)) { av_log(s, AV_LOG_ERROR, "packet_obj_size %d invalid\n", asfst->packet_obj_size); asfst->packet_obj_size = 0; return AVERROR_INVALIDDATA; } + asfst->packet_obj_size = (int)packet_obj_size; asf->packet_frag_timestamp = avio_rl32(pb); // timestamp for (i = 0; i < asfst->payload_ext_ct; i++) { ASFPayload *p = &asfst->payload[i]; - int size = p->size; + uint16_t size = p->size; int64_t payend; if (size == 0xFFFF) - size = avio_rl16(pb); + size = (uint16_t)avio_rl16(pb); payend = avio_tell(pb) + size; if (payend > end) { av_log(s, AV_LOG_ERROR, "too long payload\n"); @@ -1484,7 +1532,7 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, ASFStream *asf_st; int64_t pts; int64_t pos = *ppos; - int i; + unsigned i; int64_t start_pos[ASF_MAX_STREAMS]; for (i = 0; i < s->nb_streams; i++) @@ -1541,7 +1589,7 @@ static int asf_build_simple_index(AVFormatContext *s, int stream_index) int64_t ret; if((ret = avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET)) < 0) { - return ret; + return (int)ret; } if ((ret = ff_get_guid(s->pb, &g)) < 0) From patchwork Sun Oct 10 17:01:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp2924282ioa; Sun, 10 Oct 2021 10:01:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxETapvNueiMu69xhteO6LSX8VHy61xR5yI1531kV5xYi5T8sekWMnVcDkIbwXMRjlnlhtV X-Received: by 2002:aa7:c2da:: with SMTP id m26mr5677162edp.89.1633885314341; Sun, 10 Oct 2021 10:01:54 -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 hb12si7466040ejb.188.2021.10.10.10.01.54; Sun, 10 Oct 2021 10:01:54 -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=@hotmail.com header.s=selector1 header.b=G+AMRuEU; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF1946899BB; Sun, 10 Oct 2021 20:01:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12olkn2035.outbound.protection.outlook.com [40.92.22.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18CA16802FF for ; Sun, 10 Oct 2021 20:01:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HNKvXKPsUza7MmnSrEaN+ACZnWJ/mMa9h3C5bwTAiENm93lA4Wb0mmnr1mNKwiFpvNJunPZwCvBreWY7jdK8q6d9dj4R2hJjnpt4jbnM+Fqv2hzyDH5tp9uUnf3x36tcstcTuTiLV5WdK2WJrwNhQ9JNV1plgTMroq14ls8BpD9mozeXesLqyP4/5cR0wNFApcUw9svU7e2euHa6BbgUpQG7ljs6uatWcr2XJMxHHeZ1Wwu8mdqpdrtO7/zaZF9ZNrwYSTqam9e1ArxQ85c2QACHpGeorYLzGVu/jufsXpwNm8pOseQALmgrpyduYqNtdPFw9ajlPENuXOkmJwHO7Q== 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=utA37GbgMSChVbuJURM81x04sbNF4Uv6mk/MsL41hfo=; b=m/0Q1Wghd5hdDj66yKhZvROWxEKJnN0/Vjx+M/Oa2C/mdzFr/ZQiJphpkb4+oPzfew0g+lEW6Z7PPqfuUY6BpEJxEOS4+G3HIRsww8sGfe0r5uC7Qp5Eb6SNaWqq68mGyil/eLhTdsgL84qZg4+x5NPQDKpOiKQFiVDhiE3r+CcuAxOEtSqasI2MCdgLBLXEqR0LDoW1SadudG5hRxCmE+mlwsJY2k/iWXeQup4vSCZt12HtO+ZmiDRu6BJTseenAOFdVRf6q8Cdb+EZ+YTceFfkx4w0oLRtx9newfyaPq03+fpPFN6nG4P5t9A59R8NqTYZ9/V4KOYW00yJJjoKOg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=utA37GbgMSChVbuJURM81x04sbNF4Uv6mk/MsL41hfo=; b=G+AMRuEUibNMnogaP7k3KN+r64PaHy64DMJtBcrcusIth1EeY1slyWKR6fTcWOrZiCv+E+vmXq7ndE1+HXhcA2hE2R8X88+/jKz7jMpn+AWaWSXmgbuaKM1TSc8/iYhgscp+w6+lISMyVYcAjnw4/uC8upCxsrqLnaRhxh7cMb+Dv4lFdKVgDxrfTZaG4zheodSoer4G/r2Hlc9igWrKQl6NmCFeyOhBg2LFoD3AT1KKeVOWW+J+8Qp0kouiD/H9Uvu/RZREyfrVIPC7iZO7a1kFPA6XmWWwcDZ29cruG3APfZOPJ1NVq1gKW/5twfgu469hzDgIr8USVTi2448aPA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5887.namprd04.prod.outlook.com (2603:10b6:208:3b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.20; Sun, 10 Oct 2021 17:01:43 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.025; Sun, 10 Oct 2021 17:01:43 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2 1/2] fftools/ffmpeg: Remove redundant loop Thread-Index: AQJ9mheCrR+eCX9RoRv4C5mqMO7FhAI0bPRk Date: Sun, 10 Oct 2021 17:01:43 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [+V+CaT/WFm8vZYLktV4MBHu8uBz6Lgxb] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: de6f00fb-f9c1-4970-ed80-08d98c0fa2cc x-ms-traffictypediagnostic: MN2PR04MB5887: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: BhZfklpIoh4AS62l+1UPITgxPWirknNUU0XLsXylGt9FIUkKXzDUOv/7FtazQ+gaQIAxlYCi19u7ofolzUXV9hHQ27KawaayGEuLa3zBFxnQVcRe7DsUxJIPypvbb+ytFLKBUKz39EfF0MqaFQEzH2617pYwBSUmIk+7cID1R/g037xSwix5Vjdm/7MqvWnjqUTkIJIFXRySZkVZhJtr0jCnmOmV8nng9gTi9Tbr9Xp8YDHZujxbg9IvN1J7qGITDipvhbVDaPspX46mUIExZra+rKzbTrGh2+WKCwfNAHuOrE5fuoSWjKrWlIIMlODxn/Shq/Wbl7gATn12yJJuU3rI6zO0rgHS5gdRcMG9cJw0Eo/L4EwiepHQSZurMoBB19Z3bdU4hc5vHZQOIgx/VI4ur4L7jTHyI/XX93SJNPTc6N5AULcH2+qGgTIUAAoF x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: AO4kkzYiLOs74xJtvVKKWu6Og4NHYt/uj4PlkDFvLLds2+yzNOpbZjRCtprEuoRkphp5wUKHen78ZJgZkYqsibSMOA3uXTfswAxUkHS1amN/Y+jtpNVeQ8NhqythxO67XH2cuq46JjWLZrB3mw1lPw== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: de6f00fb-f9c1-4970-ed80-08d98c0fa2cc X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2021 17:01:43.2393 (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: MN2PR04MB5887 Subject: [FFmpeg-devel] [PATCH v2 1/2] fftools/ffmpeg: Remove redundant loop 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lpW509FfsuIU Signed-off-by: softworkz --- v2: Replaced tabs fftools/ffmpeg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 9d4f9d7a2b..e205945e63 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2178,7 +2178,7 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) { FilterGraph *fg = ifilter->graph; AVFrameSideData *sd; - int need_reinit, ret, i; + int need_reinit, ret; /* determine if the parameters for this input changed */ need_reinit = ifilter->format != frame->format; @@ -2216,7 +2216,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) /* (re)init the graph if possible, otherwise buffer the frame and return */ if (need_reinit || !fg->graph) { - for (i = 0; i < fg->nb_inputs; i++) { if (!ifilter_has_all_input_formats(fg)) { AVFrame *tmp = av_frame_clone(frame); if (!tmp) @@ -2233,7 +2232,6 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) av_fifo_generic_write(ifilter->frame_queue, &tmp, sizeof(tmp), NULL); return 0; } - } ret = reap_filters(1); if (ret < 0 && ret != AVERROR_EOF) { From patchwork Sun Oct 10 17:01:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31021 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp2924474ioa; Sun, 10 Oct 2021 10:02:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzv5RlnodtvAPzq+aoZM4zZgrOBWoNfojk0Oj7kMe4ACWO377r3effvXVgg9SFDXw00R6zr X-Received: by 2002:a17:907:7fa8:: with SMTP id qk40mr19276850ejc.445.1633885328338; Sun, 10 Oct 2021 10:02:08 -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 c22si7544829edn.592.2021.10.10.10.02.07; Sun, 10 Oct 2021 10:02:08 -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=@hotmail.com header.s=selector1 header.b=FL73cUYX; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0183168A4D4; Sun, 10 Oct 2021 20:02:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12olkn2077.outbound.protection.outlook.com [40.92.22.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B4D46808B2 for ; Sun, 10 Oct 2021 20:01:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cpc9TCm/wVk7xBaLMAtS+F7SMkVZkhzbymILEpwnmi8Gxk4kWKsvqXpjJVJpQVq602Z97+bu+dkazd1FoGVU3IanJ/yR3/YMkPn5sglX8ISgp1I/pc5rFOEU63DtbSPHgEDzsPFlMwVc+uLsN1ZUuy9QwdaLmlKG5I/kXM6xYg7Y9iOHcPCouX8CpSulp7APjuilJxRQE/Lq+J0UJhjoibwZB/rsMh4tqNzRDVRAjLZG6G8EnUsnYuU+qOvGQXuLSq6OEldqBiWtxWut0REXmY1iWmmdC/LvFGjqHO5tvx3Q2LvxbsflRNTYlMkpblH1QlMFwZ65HdbC9Z54x3AXpw== 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=VFDlJ/0S3HjRfhROPcsXfD+SGYCO0JSpsV/zdwbySaU=; b=dwXtHNs8AoxwocGcrkBUmhDGB/Np0UrF/LCxRqYPUv0chytao72bunLrRF2uGgihvwFh/RU1G/vdwBHxChfRs8ENPQBQMDIxsDHr7RKCakHH6U0ExrmuQWw+5VnYaNr5PLSZBvsu+ha2TyKqy1KuAaO3yN0DQxPrkfN2fiackc3c8bUiWk2h/q1VvzYvAqMkPhD27hWuYquWCXTEaCd+jKEMOviGoRR1qX0IBBPWu7sxiRUxfOLMVe9+Qfbx6+tQ1BNhPSDFIBa1iAvs+izvsaZtFWrudtnhr6gWZGEV2lxAaK/uHlIYJEuNKIg+fzhMs4JXydk3sNfOkkYJwtGkpA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VFDlJ/0S3HjRfhROPcsXfD+SGYCO0JSpsV/zdwbySaU=; b=FL73cUYXYNcMZr1TzhPLCz0Z4q81zstU7sFyw57BCA+ngsnSuQpETar+RW4krp978wPRf/E8pMkBazA57YioENuvX0c1AHTZ82tWqY1bE1LvUxktlBYeCvQz5XHa3X/S9n9j2ihjqfK3WtVAMA7ydElzVBiPmsFUUbb5ZG/JyZ0mjpMy1jbLmrxw8tvpAmq3RAE0BHAKuv5hFlC2Gf2B52R/E1u8RA3uPxHtbH2KhxaXJFBWOGK8b5L/rVX7WQY5zjH4S0e5pQmswnBFGi9posMuolI5a/U84t6jAoQpqle1Owq1h8n9o6KMoP2xS2vXj5ZvRzWY4ZFq26TG19v4AA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5887.namprd04.prod.outlook.com (2603:10b6:208:3b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.20; Sun, 10 Oct 2021 17:01:56 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.025; Sun, 10 Oct 2021 17:01:56 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2 2/2] fftools/ffmpeg: Fix indentation after change Thread-Index: AQHXvfiIWVBCjOAVjkmrDFaMVJuBww== Date: Sun, 10 Oct 2021 17:01:56 +0000 Message-ID: References: <41d9e46608debaa545ee947d20d83fa67335bc73.1633885236.git.softworkz@hotmail.com> In-Reply-To: <41d9e46608debaa545ee947d20d83fa67335bc73.1633885236.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [cbUYwV+M8MfjnxsnMt+o1dg4yf1sQE+f] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5270a7f8-7a7f-4795-0dd6-08d98c0faa9e x-ms-traffictypediagnostic: MN2PR04MB5887: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 4VRPFY/7SAX+1sQJArOiQ8YxSaGnJSfQHmFBKv7UpIrLB17Aqrt8YoYfbFGY2TttBe4ZciDeCD6b7ETqpYL8ZCFiI1QKfQlnW3kiJCfXlujbCpr/KuG2aLheOrOKz68/rxVbW9+xDtC8KVQOD7qDnOH+ChzgNgZgHsm1TZ0nsxZ5YGq/hh2X4LVUqTmewCkONh/Z0jOXauM4t/K8l70y8VxBW/1AS5OQPdPgcjmy5zNiJj4pU60JeK3KHlFSKta5B33WeFd7U1ZEZykYyIFu+A2b1I89feSRRQEiRHjzdo3j5EMXyOkrbFYsqnW3WpkWnrX8Ek70QlbbXnFAowfTwr8Yk7RgCcpLHUWMsyxxYyvRnIMC3JDyPR2CeRvGqQVr0eI8Xr6HrhUPpcKmmH7z+F82r+taBmbcXh8AdO+ti4N/E9KLc/MQAjtGWvq0pYOt x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 8iUn5KfiQlgKg8aFaMu9v0E9csUXyMnR8C4CivaKOHAR3x1hhXAUv7bepbcY5RHmvV5j0No82XVC/HU7PX9Lp+i4Pcyqluinqi7R3PWnx1E6RGLtgbyEj/k+q8ZxPha+TTchH/kG9x0HvHqoIVBYLA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 5270a7f8-7a7f-4795-0dd6-08d98c0faa9e X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2021 17:01:56.3639 (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: MN2PR04MB5887 Subject: [FFmpeg-devel] [PATCH v2 2/2] fftools/ffmpeg: Fix indentation after change 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u0qmSl/xwJjh Signed-off-by: softworkz --- v2: Replaced tabs fftools/ffmpeg.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index e205945e63..7545b7c68e 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2216,22 +2216,22 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) /* (re)init the graph if possible, otherwise buffer the frame and return */ if (need_reinit || !fg->graph) { - if (!ifilter_has_all_input_formats(fg)) { - AVFrame *tmp = av_frame_clone(frame); - if (!tmp) - return AVERROR(ENOMEM); - av_frame_unref(frame); + if (!ifilter_has_all_input_formats(fg)) { + AVFrame *tmp = av_frame_clone(frame); + if (!tmp) + return AVERROR(ENOMEM); + av_frame_unref(frame); - if (!av_fifo_space(ifilter->frame_queue)) { - ret = av_fifo_realloc2(ifilter->frame_queue, 2 * av_fifo_size(ifilter->frame_queue)); - if (ret < 0) { - av_frame_free(&tmp); - return ret; - } + if (!av_fifo_space(ifilter->frame_queue)) { + ret = av_fifo_realloc2(ifilter->frame_queue, 2 * av_fifo_size(ifilter->frame_queue)); + if (ret < 0) { + av_frame_free(&tmp); + return ret; } - av_fifo_generic_write(ifilter->frame_queue, &tmp, sizeof(tmp), NULL); - return 0; } + av_fifo_generic_write(ifilter->frame_queue, &tmp, sizeof(tmp), NULL); + return 0; + } ret = reap_filters(1); if (ret < 0 && ret != AVERROR_EOF) { From patchwork Mon Oct 11 04:19:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3314138ioa; Sun, 10 Oct 2021 21:19:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZ5ZuFsUKWwTBKZ/n2cpGgXkZXa6jFLiNHs7y/cdHCx97AN8JtlQQAqmgJGRO1OPo4yH8t X-Received: by 2002:a05:6402:40d0:: with SMTP id z16mr38894152edb.220.1633925966335; Sun, 10 Oct 2021 21:19:26 -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 y8si9753102edm.73.2021.10.10.21.19.26; Sun, 10 Oct 2021 21:19:26 -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=@hotmail.com header.s=selector1 header.b=a8vEwUyZ; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 646D968A789; Mon, 11 Oct 2021 07:19:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2029.outbound.protection.outlook.com [40.92.41.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5F4C6891F1 for ; Mon, 11 Oct 2021 07:19:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mYVkwYV8yEY5uODa9UaA+fr7A29VPhyPfG9jU5bggho4EiEmzDmlO//Gl3dO6AlEZjPybqhIz8WjsiqLgz6jp1hjj2Gu5Xf1Het+oUYrLzbbgfE2QsrHBLwQsQYlcKk9KqsNE5+7t+JdagNsiS4MZ3d/zv3JkuNSFuSlL6zklVdfAUyaS6jfHtr4vdE0XYny2bPZEClhGo1sfwngYh7JFEz8OjHXPqhN/JEZp9EO4wBCMuA+bgUN690vrwCdeT0H3sRgi4jDYwuFRvE2geiTVXBDgH6pcNtKr2YKDgBzHlz0R0lFL7qxFkCaZdWXNhHtREBsddgRHaDa5VRwIFM+mQ== 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=1N950XshoAEOHXIacXfXS/YbiFAQLDJBYuDoLGkPEHg=; b=EHmMNidtwJI2Qa7+VtbTd7cb6mA3E8CZD1/nplBAJEU55vqe++LAqMP0lbONGVC7NL4dogKA98yg1ijMWNGipm+vqwOoGizUMbhYQ+lgnoAx3hidhX9RIlLbztoyfgA6IuJQYNmY+xn+LvMQR0E824GEl1RetUcZMg8S8wHSU3TdeB6O6XuNTLjb6H3voTu/5lH/mvuOUFUM5KEfrNlEHFMC+XIZxTHZiR+KrX8nVmJj1735Qt2GJvTBxYEWMeEm9Ccll2Eq0rSokDAmuEJE04C1CylpGoR95A7rNiLOgD0CHmKVg/GVK4UXjo1qPPwtYnFQROnGJNXh3SZT9Qhm5Q== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1N950XshoAEOHXIacXfXS/YbiFAQLDJBYuDoLGkPEHg=; b=a8vEwUyZe0NxO54Xw3+7cVPaK+o/PgYLFYwlqEvHE8SvW4ykGgXm45/j05g7PNJm7WALk0uSzOEllfgNbWdRjPRPkdHVycKGI/8gyE0pdCTl3OmRjmDrlHeK4OH54bWGuVIuaehR0LANJYwVv6zglFbxksWLMlSLy7RSVIPj09PV4ertKOAXd5aB5So0gddKlx/hbfGDCmUgTPsR/mV/fMXVBsWqltFNiwMHCWjF0FMJ1IZ+RpsebMXmVFohVO/PJg91NI5W4+YvEA9BOh8dQsx1XtLYus5c3zXHNK75YEChyWfjNqEnWIJakflXt1Xjg098pZpjPWZjFcfF9GjK+g== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5566.namprd04.prod.outlook.com (2603:10b6:208:e3::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Mon, 11 Oct 2021 04:19:05 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Mon, 11 Oct 2021 04:19:05 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3 1/1] avutils/hwcontext: When deriving a hwdevice, search for existing device in both directions Thread-Index: AQIrZdEXveRs0pXhvJxt4faJ9+ztJgDEw3l3 Date: Mon, 11 Oct 2021 04:19:05 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Sm65CRQIxMtoatxrc3kwygzmBbES03ZB] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f992853f-372c-4309-b0ba-08d98c6e435e x-ms-traffictypediagnostic: MN2PR04MB5566: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: f5dk0lzM1XmnwfcIUcY2i4Ug41mt1LQlj+GGkQZFC0++l2yf9E8l/pwBMSTG5fc6V0jnKWqSD5HKN5EmoAzYPPNp3uHnuvF4T+E9pgYXiaEz5NnDLSnq6AsMzKqgpoOB5SyIfAAXwMbqwk9GC0MFb8b/celc+kBIWxsYedexB8jTKZRqm5JKwOhq/opplSWgNjzIOS1jQbr9BqwUj7Gpq+9ZqoY2Z/uUlsyDWlIce9vnrxUGlR+i3CioqVn2YwYWQuM9x1yygmHem+GafUO0XFZurt2C6CLo1PDYqZP4y8h6+/2qnoy5zbL+OAblXSk7/NePThIPfW0nJ5qvPjhBTfOOBkdV0Wfy1EQesQ28ReZcwZ0AAMIo2qaXRYpZS8DdwWKixHIkP63SlUwVYs/wC/yWLHI2n6ZAVE7Sjms1Bl/PBuX4Ibjh/yfiSsDfWVCv x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: gHduMsz3z8ryJp7hDZ+WwB9DSOlUzK9JviQhy67nc8QDYseIXKsaUBn9sF17H7ntvs2+BoQwxpiDGQYiAfyOWVkip7D7gEBK98EwT3FEfP4XR5QrhaIK/gzUAHcfvpoGu/BLjsZcGGku4yaA71zNoQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: f992853f-372c-4309-b0ba-08d98c6e435e X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2021 04:19:05.3846 (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: MN2PR04MB5566 Subject: [FFmpeg-devel] [PATCH v3 1/1] avutils/hwcontext: When deriving a hwdevice, search for existing device in both directions 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cSeqqTSV3ICK The test /libavutil/tests/hwdevice checks that when deriving a device from a source device and then deriving back to the type of the source device, the result is matching the original source device, i.e. the derivation mechanism doesn't create a new device in this case. Previously, this test was usually passed, but only due to two different kind of flaws: 1. The test covers only a single level of derivation (and back) It derives device Y from device X and then Y back to the type of X and checks whether the result matches X. What it doesn't check for, are longer chains of derivation like: CUDA1 > OpenCL2 > CUDA3 and then back to OpenCL4 In that case, the second derivation returns the first device (CUDA3 == CUDA1), but when deriving OpenCL4, hwcontext.c was creating a new OpenCL4 context instead of returning OpenCL2, because there was no link from CUDA1 to OpenCL2 (only backwards from OpenCL2 to CUDA1) If the test would check for two levels of derivation, it would have failed. This patch fixes those (yet untested) cases by introducing forward references (derived_device) in addition to the existing back references (source_device). 2. hwcontext_qsv didn't properly set the source_device In case of QSV, hwcontext_qsv creates a source context internally (vaapi, dxva2 or d3d11va) without calling av_hwdevice_ctx_create_derived and without setting source_device. This way, the hwcontext test ran successful, but what practically happened, was that - for example - deriving vaapi from qsv didn't return the original underlying vaapi device and a new one was created instead: Exactly what the test is intended to detect and prevent. It just couldn't do so, because the original device was hidden (= not set as the source_device of the QSV device). This patch properly makes these setting and fixes all derivation scenarios. (at a later stage, /libavutil/tests/hwdevice should be extended to check longer derivation chains as well) Signed-off-by: softworkz --- v3: avoid double-release as suggested by Haihao libavutil/hwcontext.c | 38 ++++++++++++++++++++++++++++++++++ libavutil/hwcontext.h | 1 + libavutil/hwcontext_internal.h | 6 ++++++ libavutil/hwcontext_qsv.c | 16 ++++++++++---- 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 31c7840dba..1a50635018 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -122,6 +122,7 @@ static const AVClass hwdevice_ctx_class = { static void hwdevice_ctx_free(void *opaque, uint8_t *data) { AVHWDeviceContext *ctx = (AVHWDeviceContext*)data; + int i; /* uninit might still want access the hw context and the user * free() callback might destroy it, so uninit has to be called first */ @@ -132,6 +133,8 @@ static void hwdevice_ctx_free(void *opaque, uint8_t *data) ctx->free(ctx); av_buffer_unref(&ctx->internal->source_device); + for (i = 0; i < AV_HWDEVICE_TYPE_NB; i++) + av_buffer_unref(&ctx->internal->derived_devices[i]); av_freep(&ctx->hwctx); av_freep(&ctx->internal->priv); @@ -643,6 +646,26 @@ fail: return ret; } +static AVBufferRef* find_derived_hwdevice_ctx(AVBufferRef *src_ref, enum AVHWDeviceType type) +{ + AVBufferRef *tmp_ref; + AVHWDeviceContext *src_ctx; + int i; + + src_ctx = (AVHWDeviceContext*)src_ref->data; + if (src_ctx->type == type) + return src_ref; + + for (i = 0; i < AV_HWDEVICE_TYPE_NB; i++) + if (src_ctx->internal->derived_devices[i]) { + tmp_ref = find_derived_hwdevice_ctx(src_ctx->internal->derived_devices[i], type); + if (tmp_ref) + return tmp_ref; + } + + return NULL; +} + int av_hwdevice_ctx_create_derived_opts(AVBufferRef **dst_ref_ptr, enum AVHWDeviceType type, AVBufferRef *src_ref, @@ -666,6 +689,16 @@ int av_hwdevice_ctx_create_derived_opts(AVBufferRef **dst_ref_ptr, tmp_ref = tmp_ctx->internal->source_device; } + tmp_ref = find_derived_hwdevice_ctx(src_ref, type); + if (tmp_ref) { + dst_ref = av_buffer_ref(tmp_ref); + if (!dst_ref) { + ret = AVERROR(ENOMEM); + goto fail; + } + goto done; + } + dst_ref = av_hwdevice_ctx_alloc(type); if (!dst_ref) { ret = AVERROR(ENOMEM); @@ -687,6 +720,11 @@ int av_hwdevice_ctx_create_derived_opts(AVBufferRef **dst_ref_ptr, ret = AVERROR(ENOMEM); goto fail; } + tmp_ctx->internal->derived_devices[type] = av_buffer_ref(dst_ref); + if (!tmp_ctx->internal->derived_devices[type]) { + ret = AVERROR(ENOMEM); + goto fail; + } ret = av_hwdevice_ctx_init(dst_ref); if (ret < 0) goto fail; diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h index 04d19d89c2..56077963e6 100644 --- a/libavutil/hwcontext.h +++ b/libavutil/hwcontext.h @@ -37,6 +37,7 @@ enum AVHWDeviceType { AV_HWDEVICE_TYPE_OPENCL, AV_HWDEVICE_TYPE_MEDIACODEC, AV_HWDEVICE_TYPE_VULKAN, + AV_HWDEVICE_TYPE_NB, ///< number of hw device types }; typedef struct AVHWDeviceInternal AVHWDeviceInternal; diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h index e6266494ac..f6fb67c491 100644 --- a/libavutil/hwcontext_internal.h +++ b/libavutil/hwcontext_internal.h @@ -109,6 +109,12 @@ struct AVHWDeviceInternal { * context it was derived from. */ AVBufferRef *source_device; + + /** + * An array of reference to device contexts which + * were derived from this device. + */ + AVBufferRef *derived_devices[AV_HWDEVICE_TYPE_NB]; }; struct AVHWFramesInternal { diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index c18747f7eb..7b559e2b47 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -223,7 +223,7 @@ static void qsv_frames_uninit(AVHWFramesContext *ctx) av_buffer_unref(&s->child_frames_ref); } -static void qsv_pool_release_dummy(void *opaque, uint8_t *data) +static void qsv_release_dummy(void *opaque, uint8_t *data) { } @@ -236,9 +236,9 @@ static AVBufferRef *qsv_pool_alloc(void *opaque, size_t size) if (s->nb_surfaces_used < hwctx->nb_surfaces) { s->nb_surfaces_used++; av_buffer_create((uint8_t*)(s->handle_pairs_internal + s->nb_surfaces_used - 1), - sizeof(*s->handle_pairs_internal), qsv_pool_release_dummy, NULL, 0); + sizeof(*s->handle_pairs_internal), qsv_release_dummy, NULL, 0); return av_buffer_create((uint8_t*)(s->surfaces_internal + s->nb_surfaces_used - 1), - sizeof(*hwctx->surfaces), qsv_pool_release_dummy, NULL, 0); + sizeof(*hwctx->surfaces), qsv_release_dummy, NULL, 0); } return NULL; @@ -1528,8 +1528,16 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device, child_device = (AVHWDeviceContext*)priv->child_device_ctx->data; impl = choose_implementation(device, child_device_type); + ret = qsv_device_derive_from_child(ctx, impl, child_device, 0); + if (ret >= 0) { + ctx->internal->source_device = av_buffer_ref(priv->child_device_ctx); + child_device->internal->derived_devices[ctx->type] = av_buffer_create((uint8_t*)ctx, sizeof(*ctx), qsv_release_dummy, ctx, 0); + if (!child_device->internal->derived_devices[ctx->type]) { + return AVERROR(ENOMEM); + } + } - return qsv_device_derive_from_child(ctx, impl, child_device, 0); + return ret; } const HWContextType ff_hwcontext_type_qsv = { From patchwork Tue Oct 12 16:02:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31088 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp4936777ioa; Tue, 12 Oct 2021 09:02:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwM3U4TdjRztvWx1+RSYTptyQsy/WPgsqiyiVzdrswodapz3uJCVQQn0ZtGI3MWJmU3uGJ0 X-Received: by 2002:a05:600c:4fd3:: with SMTP id o19mr6474051wmq.147.1634054570930; Tue, 12 Oct 2021 09:02:50 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g1si17072030ejp.158.2021.10.12.09.02.49; Tue, 12 Oct 2021 09:02:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=opvEwMKu; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7049568A8E7; Tue, 12 Oct 2021 19:02:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2049.outbound.protection.outlook.com [40.92.19.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AF7368A87C for ; Tue, 12 Oct 2021 19:02:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DEUxtwNFQAiMS5PFjpis1sCx/gxh3AJZxZy+SN6R65ukntJfcnOJ9UD5GBE8lTqd5z5ovOIIA9lngdTBKijXQeJXccCvGlwaWv041phZ3/fd2pZML2/KkWaAW41fDg4eSxqKYX3X9gvq8ymQCjys84Y2OhFSaqDaEGkNA4RDpsZwK8LAoZeQOEXgW9vAOuyOQgJao5KI2ZhyJ8TvwtWVcPqUaUi7BUSS6t/v2W6zsOl0Ehc3NISln9nTZNZuUSZfuDW69SHxDKhAQhQEEfpGfZZBe9XCTg0wbJIsypR1ApKRXqB15oKe5/kw4bpJuZp/QZr3Grb23ITTfyQ3XxtWjA== 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=ADV3Oz3xzHeO1v3r+EevodMpDbQEEB5qx3uZPNuS7Lg=; b=B0A+JUNuxOe2vz50WG8iEiVydLwEvxEUUgtSBQCcXfpGDHwghqpha5B4WWOXlLR36KApQH8Au7HVLda3ZDXUSsZ5hQZNlBtwdBkNNNolLVc4R7oQh4VpANFqndcO99Lb4dy7L9VZm6EyJRMEUUjzEvNnXcfKHaCPtoqrBR1FdMEyY466PTtKCx6dWnWp0hyybFjUoz5TW9nrdMW5XWNrnQ62FHJnJPdNq3ELi22h89eyPDdwxU0LGcKTA+fcMbc5m8PxiuadHkiB0m9bxiNymPd8VE3KlYCzJUvgM9M7prtlZrIT+plzsL45YtOTQm9jwwxaJcom4TVteNByKCm54g== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ADV3Oz3xzHeO1v3r+EevodMpDbQEEB5qx3uZPNuS7Lg=; b=opvEwMKuMIUxNKiZZayI/8jWOrcG5qw74oc0tBClXQ8SxIjfOUzUMkiiSkcSlIUrFILboV2tQunLaADWXpvEy0FOjts8/nu1dkXZOWwZzruAWhaFKo4KkUVDLwX7q97PatZzBFP/wBoguW5DzEL+v64hHHdHwZJkd7GtCTcWaJnL+3GfFkm76ZEAS4jMbQeQwx1ITrw3Sq67SbAxbGZSwuhBp/bY1QQSfMUmaBRE7a/AYKhttxtsNjURkuJ8ADySQOZQiVRO5M8vAqoqN66fUWxwJ9g37to6in6dhJWfsjKpw73ok//DYSYBLKrzO0aQo3SPhFaBsI8DztITN/47eQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5503.namprd04.prod.outlook.com (2603:10b6:208:e4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Tue, 12 Oct 2021 16:02:31 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Tue, 12 Oct 2021 16:02:31 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2 1/1] avutil/frame: Document the possibility of negative line sizes Thread-Index: AQHXv4KQN62XeHJ1ekWuZqM1kdIMJQ== Date: Tue, 12 Oct 2021 16:02:31 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [TmXbXHOsXbCqP3MI7kWVXdv2b2HEx/XV] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 944443c0-1437-4228-6b5a-08d98d99b2d9 x-ms-traffictypediagnostic: MN2PR04MB5503: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: YepUvZefzTERMecZWkBpldwjPKlXcK6fxqgkpjJobhtSZmPy8paHKYZeAZidG/XkRoJhSb3Vic8+AAp6ILejOVROABZrLw7vZMkl5N4Ma1LRZy5OuL4+hjKkBduhVfk4V/sgOzydIiM/IU/9xL0W4Anehk/lbPdrXI0nlBSbiFv/ao30lGt8vQpA6c1lmu3UUp3MSE1ma3XVGny53hS0uX7WGrII49spgB2Hj7H9Vmh+LWP0IW1Bu54O3DEFFakQK89JbDoywIPGK7B+obo4+RWz9dYIC3kvXyBOXmvvges6SJhTQWTy5LXXaxx+pjEzYwotqsRhTCqXEP/JVD6sGj7wfspnPHPxkDIEI1UQI5yeteXuNlgBIWT4i71Rbn1bEnWNHLJvywl/KCdAL2xvqyaNZu5HeQsPCySOYfM80LEbSq8iKldJV8lTbl0WaXUR x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: Z+brcf/seFnCSOyjisIQcAVkh9WyLUNEdhlcIaQZQ2/kvujRaN5LUqwlWjbcX/cFZMfalAZ+ReqeTPQVDn6lP05G9XOJF41FsW0/fSpgarMPyer4F3NTopoXMFFlpCpoe9Io5xbxknrr1/dY+OgTXg== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 944443c0-1437-4228-6b5a-08d98d99b2d9 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Oct 2021 16:02:31.9312 (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: MN2PR04MB5503 Subject: [FFmpeg-devel] [PATCH v2 1/1] avutil/frame: Document the possibility of negative line sizes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1Mdt+0/Rfu26 Signed-off-by: softworkz --- libavutil/frame.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavutil/frame.h b/libavutil/frame.h index ff2540a20f..f07e690410 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -304,7 +304,8 @@ typedef struct AVFrame { #define AV_NUM_DATA_POINTERS 8 /** * pointer to the picture/channel planes. - * This might be different from the first allocated byte + * This might be different from the first allocated byte. For video, + * it could even point to the end of the image data. * * Some decoders access areas outside 0,0 - width,height, please * see avcodec_align_dimensions2(). Some filters and swscale can read @@ -313,11 +314,16 @@ typedef struct AVFrame { * * NOTE: Except for hwaccel formats, pointers not needed by the format * MUST be set to NULL. + * + * @attention In case of video, the data[] pointers can point to the + * end of image data in order to reverse line order, when used in + * combination with negative values in the linesize[] array. */ uint8_t *data[AV_NUM_DATA_POINTERS]; /** - * For video, size in bytes of each picture line. + * For video, a positive or negative value, which is typically indicating + * the size in bytes of each picture line, but it can also be: + * - the negative byte size of lines for vertical flipping + * (with data[n] pointing to the end of the data + * - a positive or negative multiple of the byte size as for accessing + * even and odd fields of a frame (possibly flipped) + * - 0 for a more compact representation of a read only + * constant color frame + * * For audio, size in bytes of each plane. * * For audio, only linesize[0] may be set. For planar audio, each channel @@ -330,6 +336,9 @@ typedef struct AVFrame { * * @note The linesize may be larger than the size of usable data -- there * may be extra padding present for performance reasons. + * + * @attention In case of video, line size values can be negative to achieve + * a vertically inverted iteration over image lines. */ int linesize[AV_NUM_DATA_POINTERS]; From patchwork Wed Oct 13 04:49:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5559476ioa; Tue, 12 Oct 2021 21:50:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUz40kwB8A4DXY7yyngfGl9TUitZoBQ8n+tfAr4liZOn3m62QflpivP/br7gRIQ3PA8b89 X-Received: by 2002:a50:c006:: with SMTP id r6mr6289738edb.289.1634100610361; Tue, 12 Oct 2021 21:50: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 di4si25379128ejc.505.2021.10.12.21.50.09; Tue, 12 Oct 2021 21:50: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=@hotmail.com header.s=selector1 header.b=Iuga2HCy; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3370268A808; Wed, 13 Oct 2021 07:50:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2082.outbound.protection.outlook.com [40.92.21.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BD856800D9 for ; Wed, 13 Oct 2021 07:49:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eGq9YvMmZ5dMCxX5G0008h40H7WrBQZgshyYa/KlJUBKvDlUOapDn26N6LCctlXPS8lnZQSqJJP2m7PT3Ho2MLsUhnEJMnGSHxxk6QXqXEIAus4QsExZF/hvx5sh1re+R0zo1ze/DA+nWp8b046Lnpi+6eWkZ2vWTVYGak+5VEB6NMHtR5Fifvj/dgooeTA+BVFt6SvVObr4KBSLN4W52VPK9SvWCvWcjwsItlgKUADhvlAEnX06U03l7jfd6abhhxUiltdZ8q4uEBfWNIfWgSlFEOBZG867tB5MFRJQgGv2/OGaI2qUiEKjcR7I/Fj8qSWuKKFOTa26YEkYhIMTEg== 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=oZog/7dOOCrR5BvrbVINUtNfLXhRq8UkjlBvHDfBtWU=; b=NyZ4VTa0pwAUwOoNczIBWddGQ50z2Z/bZeabHmm3dVygQEsVKWtECIIf2vwhQwrB3N7VoFZoOfUcI9Yznp1nk+AZeVDRp8RUQ58psi1SwlOB+8FwsyLpbOPLabXKHK4lXaG6KJ+/RZbA4uMoLSnk0uOdzUBwGp/hRi2Bbw28zFg5vuDRKJPTFUvhvCvVYjsWCdXCKZIQmS5JGhISIMJbQ4IR5ASFoWiGoEA/YxAiCoLYI5wUHSYFqUsls3bkOJ9V78pDbe7tepAJDZOAHroo8jSrfjF/XJd2SbKGPJDTWDweafzs3N6KY5OzhM8fZh3OiM2fNZBN3rBv6vUmHgyhyw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oZog/7dOOCrR5BvrbVINUtNfLXhRq8UkjlBvHDfBtWU=; b=Iuga2HCy0E9WTWZ9nWMtLc+sm0/tq2D7RiiLrXhoGmXsiKzSA6qrEoylU9R/Exnzw3i4Zhpa4O5O7WW7N2XSIEmQxjMijWFuqFDDD37Zy3Xdbu6O5LjVqG1OYLOqEFBtSp4BqtiR3ZHkcC5PIY7HUXfWWXirev88XZWiJ7Uz8O8fum6UfKcRttJZTUZQcfxn/exUbQiLpakWUMb4KV6Rl3v370SDJOJiCy7PntZ+xHT4RBbj6GIDVexQfXbZVmaqNCTqoQWogctriY633z79HQnp6RvjsY5v7iBS+t83MVbS11uv6oPAZS6TmQ+4jDHwAnGT2dZbUa9UcOIHWdK+QQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6205.namprd04.prod.outlook.com (2603:10b6:208:d5::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Wed, 13 Oct 2021 04:49:56 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 04:49:56 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/5] avfilter/avfilter: Add avfilter_alloc() and avfilter_query_formats() for initializing filters without a graph Thread-Index: AQG/IMss9hwT72uYI1H8LXEEqR1CoQGXeu8g Date: Wed, 13 Oct 2021 04:49:55 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [4hT6Atp/zzrBa99RoMVLiYYUxavUk6q4] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ad8245e9-5ebf-46dc-54e3-08d98e04e73b x-ms-traffictypediagnostic: MN2PR04MB6205: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9AEg4HuWhUDY6FjVGZnud7mhaMFog2PbcsnNy4/zAs6P0MwtEYRTWsZ/WqHZ/O3Ef2jrq62KRtHJhPa5V+StkwCUiAdO9EtP/anOfkDp7OCn4jGeuMZ7moF8EVh5JVNuCU2BsAJfoOm5sps4KwTCK4uGZhGdpZjTKRBOLa55qLCbD1xiRrYe5W3pvUuA10JuSowcCyv3TY6baitaBCscS5iuaW/njNQqqD+Gi175+gvTsn7JLXjt8XhssFV3a9HGD6PrAqIsA01T5IaG4tcoIXea73PKDrdDfo92El3+paXUMLMX86qPPMPzxHCiM46lUIHwR27QI7zminkon6MTBBAFURz3K7WY5EDMblSH7kE6/G6chvXC48P4vOv5IXqR2jgw3nTY3WiDzGebfONYx/EQKeudqJlAIduzLNlAYgcWwAdJZxgPOIJYijiFNUIh x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 5fbIm6ij84LkmOtTiofLVM5AfiyUxlyaoCEX2svxRsECZ9c04go85UxJ7sy11/ZW/sCcLNRraWj4QMGJZS3ufvq0ZYQNhPJyTx9KevarAxMWoqsWnsE/kHUfhki6SUFMrmnAT1AIu4tmpHQdROIHnA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: ad8245e9-5ebf-46dc-54e3-08d98e04e73b X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 04:49:55.8985 (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: MN2PR04MB6205 Subject: [FFmpeg-devel] [PATCH 1/5] avfilter/avfilter: Add avfilter_alloc() and avfilter_query_formats() for initializing filters without a graph 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RFVA3vzlu/Rb The purpose of these additions is for being able to programatically retrieve the supported formats of a filter for each input and output without adding the filter to a graph and creating connections. Signed-off-by: softworkz --- doc/APIchanges | 3 +++ libavfilter/avfilter.c | 4 ++-- libavfilter/avfilter.h | 22 ++++++++++++++++++++++ libavfilter/avfiltergraph.c | 18 ++++++++++++++---- libavfilter/version.h | 2 +- 5 files changed, 42 insertions(+), 7 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 7b267a79ac..903de43365 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-10-12 - xxxxxxxxxx - lavf 8.13.100 - avfilter.h + Add avfilter_alloc() and avfilter_query_formats(). + 2021-09-21 - xxxxxxxxxx - lavu 57.7.100 - pixfmt.h Add AV_PIX_FMT_X2BGR10. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 7362bcdab5..645af2cb11 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -769,12 +769,12 @@ void avfilter_free(AVFilterContext *filter) for (i = 0; i < filter->nb_inputs; i++) { free_link(filter->inputs[i]); - if (filter->input_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) + if (filter->input_pads && filter->input_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) av_freep(&filter->input_pads[i].name); } for (i = 0; i < filter->nb_outputs; i++) { free_link(filter->outputs[i]); - if (filter->output_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) + if (filter->output_pads && filter->output_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) av_freep(&filter->output_pads[i].name); } diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index f7208754a7..24119993d6 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -911,6 +911,28 @@ typedef struct AVFilterGraph { unsigned disable_auto_convert; } AVFilterGraph; +/** + * Allocate a new filter context and return it. + * + * @param filter what filter to create an instance of + * @param inst_name name to give to the new filter context + * + * @return newly created filter context or NULL on failure + * + * @note for adding a filter to a filtergraph, use + * avfilter_graph_alloc_filter() instead. + */ +AVFilterContext *avfilter_alloc(const AVFilter *filter, const char *inst_name); + +/** + * Query the formats of a filter. + * + * @param filter the filter context + * + * @return 0 on success + */ +int avfilter_query_formats(AVFilterContext *filter); + /** * Allocate a filter graph. * diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index b8b432e98b..64379782fc 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -81,6 +81,11 @@ int ff_graph_thread_init(AVFilterGraph *graph) } #endif +AVFilterContext *avfilter_alloc(const AVFilter *filter, const char *inst_name) +{ + return ff_filter_alloc(filter, inst_name); +} + AVFilterGraph *avfilter_graph_alloc(void) { AVFilterGraph *ret = av_mallocz(sizeof(*ret)); @@ -395,6 +400,14 @@ static int formats_declared(AVFilterContext *f) return 1; } +int avfilter_query_formats(AVFilterContext *filter) +{ + if (filter->filter->formats_state == FF_FILTER_FORMATS_QUERY_FUNC) + return filter_query_formats(filter); + + return ff_default_query_formats(filter); +} + /** * Perform one round of query_formats() and merging formats lists on the * filter graph. @@ -418,10 +431,7 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) AVFilterContext *f = graph->filters[i]; if (formats_declared(f)) continue; - if (f->filter->formats_state == FF_FILTER_FORMATS_QUERY_FUNC) - ret = filter_query_formats(f); - else - ret = ff_default_query_formats(f); + ret = avfilter_query_formats(f); if (ret < 0 && ret != AVERROR(EAGAIN)) return ret; /* note: EAGAIN could indicate a partial success, not counted yet */ diff --git a/libavfilter/version.h b/libavfilter/version.h index e4c25b9225..dca5aacb45 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 8 -#define LIBAVFILTER_VERSION_MINOR 12 +#define LIBAVFILTER_VERSION_MINOR 13 #define LIBAVFILTER_VERSION_MICRO 100 From patchwork Wed Oct 13 04:49:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31091 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5559582ioa; Tue, 12 Oct 2021 21:50:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9bNYxh8wqfXnhxEr92eK3edw2gJEeWt6lIh+Wz+FEUnm8iRvzQsfwGwVASu/ZnNSMoH7T X-Received: by 2002:a05:6402:11cf:: with SMTP id j15mr6182498edw.232.1634100622126; Tue, 12 Oct 2021 21:50:22 -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 h1si17923743edk.285.2021.10.12.21.50.21; Tue, 12 Oct 2021 21:50:22 -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=@hotmail.com header.s=selector1 header.b=tfNtsmGh; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 593DE68A8F5; Wed, 13 Oct 2021 07:50:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2082.outbound.protection.outlook.com [40.92.21.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDBDD68803D for ; Wed, 13 Oct 2021 07:50:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BgT/Wr4etRC9+6+4oSsTNI7ceCAr1E2N1NeSRomDRqGAV8oMRR3IyNHDyfodD7zULzQhIYoO0LK4cNZLgcFUJf9VgmzGq3oBiQVLxxcBLihm6FVb+WMqEAOvZ3rDS0X3a+l+lZtryDDZTIAew9BW2VYMiPH2vVSgCGUfqHUPKdsMwuJoUktx5Y9gH3ftY8en0dDM6DxL0RID/BStAfaVzUEKphRxaLWSz/glDR7wgFp701DepspExe4kUXAq7Ehehf6xfqQ/G4jI1A67GyxRXT9RYTkbFc4AI2bhSYNx+RAjDlxhd/H7oN4LvuqPSN9LK0F6JJ7TQ9zAb+UibwmaPg== 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=ADUYUzvTJlUhyRSWpOl/t7DiPwP3a8csnclRYHNUpCg=; b=mDeXIVr7yI/+TivXV3rAxLcAvS+/XRsY7YRQPSw6NacGURhDDBBVSfakcgS1Clo6/tYU2FjdfMb378hX6cFJsLQmAJ5X5R6Z1iPRLamyHINrpXccnyY/E9DoZdR0PKlrAhs6Wvc/3zFZLP2st1oI34SzeK97kdigYTXeMZD1jJVL/4ud+spNthH6pFnHyjbzS1X7+6FG0MNlR2ntbZEWKvvNoHmYFJqctGqjnpFc4Nd7WC1/4UPva2kpxrOLsM0A7BPlgWKBNiUxCUQPxyJDbKB+ujDAOeJB7MYLvx0mR4tTXPAtQCtROQyrQ15JOyQ6or2wVo3SleWiHLm/GpmfWw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ADUYUzvTJlUhyRSWpOl/t7DiPwP3a8csnclRYHNUpCg=; b=tfNtsmGh93APJ3q0RMqMaLhSUXC+RT7deZyvYjJ8XtD3g0PQ0y0y6y+D7HDnRMdHqCbVXaYXPOJlEnxds+kuSfoavmFn7YExVT4jepp1aLTly5RWN4JKRLJ3CqWrR7axZXttZLdeyDg+CttZRoLczaCy9xhh6XDEHJXt3act91a9NXXvybhNsHQ4s1d65tcNN+7ol6DKoPqMo2jdMIapIaS+JZ+f1EtOwo88jM5zVoSAW3Gucwm/+5oGwn/dF3YSUgvn1W8KwQMEM5qjFFAMkUODqJlRXOsuQ0ZGZRn42fuu+PxcA4pL1/LRpMavPuc0u5llhEEJZwb6nm7b1GtpWw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6205.namprd04.prod.outlook.com (2603:10b6:208:d5::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Wed, 13 Oct 2021 04:49:58 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 04:49:57 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 2/5] fftools/cmdutils: Print filter input/output formats in help output Thread-Index: AQHXv+3FjFYbef1VDEW/18uDaAl0Jw== Date: Wed, 13 Oct 2021 04:49:57 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [tqs80TBnBAKVMI6s221HJzmtWt/hiMz6] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 049aa640-5df2-4fb2-d466-08d98e04e85f x-ms-traffictypediagnostic: MN2PR04MB6205: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2UW/cG5yHbFDn8u6+W4VCBkBfim7a2OwE4eiKM+33xd9RJ0XgydsbvFTd7uF+3rOs15NSiNTb0A8uB/fhPRcKN4g2fJc6g4ong/czLIEZKOu/1oiMLR6uZ9TeoU8pAGWJ++IunAzYNizQ0lVNr4B49MbF66d1xtkK4NZK1gkGS2y3D2Jmg3Hc83XHG2oB6BWyjJ/Ge7lxKY4W1NElbS9Nle/rGRD0CWzc+utTMG7wyplIPEkp/xxB5S8OyQOvIkEKww8TJpccK2xFOUXQzBIuITxnxB172sWPwouXHl5hi9Jmfzd+WOpWeJsuLel17RbEFH6TgApNWlkpE9EiNOEmkP+GvEzReGxU5w2QJO9qcjQQi6LENP+dtaXrpabQomVo63ZVw76QiM5U9vHdIiTPQLGNX3gQjFK5uIso/9q51E3CQ4G1ADU+kvw0RPgYhgk x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: FJBBzKd/AQPoze6z48NIKiN8QEgKfCB0bY/rPPj4Bv0RR8zZ9xJlsayFkQ2YTaBZnVuCazqBaSFPbNwQSP71r5RLyR3kj0mv318NO5g5+014Hq+bMntNtA5BAlCSJKOdsXHUWXF/GQH6hVh37Sh80Q== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 049aa640-5df2-4fb2-d466-08d98e04e85f X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 04:49:57.8524 (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: MN2PR04MB6205 Subject: [FFmpeg-devel] [PATCH 2/5] fftools/cmdutils: Print filter input/output formats in help output 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2oU7iMkPo5zG Exmaple command: ffmpeg -h filters=overlay Output: Filter overlay Overlay a video source on top of the input. slice threading supported Inputs: #0: main (video) [yuv420p, yuvj420p, yuva420p, nv12, nv21] #1: overlay (video) [yuva420p] Outputs: #0: default (video) [yuv420p, yuvj420p, yuva420p, nv12, nv21] overlay AVOptions: x [...] Signed-off-by: softworkz --- fftools/cmdutils.c | 89 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 84 insertions(+), 5 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index aa706c33ab..a112998574 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -33,6 +33,7 @@ #include "compat/va_copy.h" #include "libavformat/avformat.h" #include "libavfilter/avfilter.h" +#include #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" @@ -1922,11 +1923,38 @@ static void show_help_muxer(const char *name) } #if CONFIG_AVFILTER +static void print_link_formats(enum AVMediaType mediaType, AVFilterFormats* formats) +{ + if (formats == NULL) + return; + + printf(" ["); + + for (unsigned i = 0; i < formats->nb_formats; i++) { + if (formats->formats[i] >= 0) { + if (i > 0) + printf(", "); + if (mediaType == AVMEDIA_TYPE_VIDEO) { + printf("%s", av_get_pix_fmt_name(formats->formats[i])); + } else if (mediaType == AVMEDIA_TYPE_AUDIO) { + printf("%s", av_get_sample_fmt_name(formats->formats[i])); + // TODO: Uncomment once subtitle filtering is added + ////} else if (mediaType == AVMEDIA_TYPE_SUBTITLE) { + //// printf("%s", av_get_subtitle_fmt_name(formats->formats[i])); + } + } + } + + printf("]"); +} + static void show_help_filter(const char *name) { #if CONFIG_AVFILTER const AVFilter *f = avfilter_get_by_name(name); - int i, count; + unsigned i, count; + int got_formats = 0; + AVFilterContext *filter_context; if (!name) { av_log(NULL, AV_LOG_ERROR, "No filter name specified.\n"); @@ -1943,12 +1971,50 @@ static void show_help_filter(const char *name) if (f->flags & AVFILTER_FLAG_SLICE_THREADS) printf(" slice threading supported\n"); + filter_context = avfilter_alloc(f, "filter"); + if (!filter_context) { + av_log(NULL, AV_LOG_ERROR, "Failed create filtercontext\n"); + return; + } + + if (filter_context->nb_outputs == 0) { + filter_context->outputs= av_calloc(1, sizeof(AVFilterLink*)); + filter_context->outputs[0] = (AVFilterLink *)av_mallocz(sizeof(AVFilterLink)); + } + + if (filter_context->nb_inputs == 0) { + filter_context->inputs= av_calloc(1, sizeof(AVFilterLink*)); + filter_context->inputs[0] = (AVFilterLink *)av_mallocz(sizeof(AVFilterLink)); + } + + for (i = 0; i < filter_context->nb_inputs; i++) + filter_context->inputs[i] = (AVFilterLink *)av_mallocz(sizeof(AVFilterLink)); + + for (i = 0; i < filter_context->nb_outputs; i++) + filter_context->outputs[i] = (AVFilterLink *)av_mallocz(sizeof(AVFilterLink)); + + if (filter_context->filter->nb_inputs) + filter_context->inputs[0]->type = avfilter_pad_get_type(f->inputs, 0); + + if (filter_context->filter->nb_outputs) + filter_context->outputs[0]->type = avfilter_pad_get_type(f->outputs, 0); + + if (filter_context->nb_inputs > 0 || filter_context->nb_outputs > 0) + got_formats = !avfilter_query_formats(filter_context); + printf(" Inputs:\n"); count = avfilter_filter_pad_count(f, 0); for (i = 0; i < count; i++) { - printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i), - media_type_string(avfilter_pad_get_type(f->inputs, i))); + const enum AVMediaType media_type = avfilter_pad_get_type(f->inputs, i); + + printf(" #%d: %s (%s)", i, avfilter_pad_get_name(f->inputs, i), + media_type_string(media_type)); + + if (got_formats && (i < filter_context->nb_inputs)) + print_link_formats(media_type, filter_context->inputs[i]->outcfg.formats); + printf("\n"); } + if (f->flags & AVFILTER_FLAG_DYNAMIC_INPUTS) printf(" dynamic (depending on the options)\n"); else if (!count) @@ -1957,8 +2023,13 @@ static void show_help_filter(const char *name) printf(" Outputs:\n"); count = avfilter_filter_pad_count(f, 1); for (i = 0; i < count; i++) { - printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i), - media_type_string(avfilter_pad_get_type(f->outputs, i))); + const enum AVMediaType media_type = avfilter_pad_get_type(f->outputs, i); + printf(" #%d: %s (%s)", i, avfilter_pad_get_name(f->outputs, i), + media_type_string(media_type)); + + if (got_formats && i < filter_context->nb_outputs) + print_link_formats(media_type, filter_context->outputs[i]->incfg.formats); + printf("\n"); } if (f->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS) printf(" dynamic (depending on the options)\n"); @@ -1970,6 +2041,14 @@ static void show_help_filter(const char *name) AV_OPT_FLAG_AUDIO_PARAM); if (f->flags & AVFILTER_FLAG_SUPPORT_TIMELINE) printf("This filter has support for timeline through the 'enable' option.\n"); + + if (filter_context->nb_inputs == 0) + filter_context->nb_inputs = 1; + if (filter_context->nb_outputs == 0) + filter_context->nb_outputs = 1; + + avfilter_free(filter_context); + #else av_log(NULL, AV_LOG_ERROR, "Build without libavfilter; " "can not to satisfy request\n"); From patchwork Wed Oct 13 04:49:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31090 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5559658ioa; Tue, 12 Oct 2021 21:50:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmkwMWi4Q7widAZQXRmnVdvgsxVAYmumhzqIaHB7OpzqkXIWQzJFj3gniYPcezxMsXg9bW X-Received: by 2002:a05:6402:4244:: with SMTP id g4mr6166896edb.158.1634100633478; Tue, 12 Oct 2021 21:50: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 y16si19443515ejp.320.2021.10.12.21.50.33; Tue, 12 Oct 2021 21:50: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=@hotmail.com header.s=selector1 header.b=a+BEJD7O; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A4AF68A921; Wed, 13 Oct 2021 07:50:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2082.outbound.protection.outlook.com [40.92.21.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 180C968A906 for ; Wed, 13 Oct 2021 07:50:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bpVAV6KsKS5BwmwZ7ggEVOprFtoRAAPm72esUSbobt7elq6ZSItfjju0ukLMUJ7lFkWquPUC1ic8MHUDfITqDbXn9ffvKSlP0pjgLNu8DfWI6zrVJmOTGNgyb7v+IMY608QLY5HdJCaw7Ynrj9GKrg+3l9hc8sSiggR8jJh8f9DKUvPHXSUtJfDICphaF5wuBh2Eo4yiVtieOezeh6nypZVj4WzScSfEZDQHli2poGuYyE4DFB4suxSxk8c0O8IjLFH+UpHaXEhOnuPHJJHhBqIKN5LzdYWFFjFfsZC33fDf0n9kFZJ1p5H3hkj9YpvalgQR66FPh8yBS2Oz0A2c8Q== 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=c5GQqnD2dR8DT5VILXifCpBbGEJJwmfUuRlsHd4DM0Y=; b=T4CelVE8e7AC7Sas8sPFpLokvopthWwG9cotwfO2n14WD7cWMgIAm1FVypLX0/FhFP6WaD9DIEyhGY6EMGNUkIb8ueyJmprujmfAL39aJr0/KwklgtcvGSaHHxNtvhT+VrGY4+6lBxOlH38bVTRA3OOhgnPYhTgDfXWlvxuSH+1xYWLN8KJzYA4tgzKahPdKccBcwZMfKFLddKfUBYmOb3i/96+fIgryLvWvOxDF+2bA6/NMfvHJM84DZXuDDz1QUhBm+bkt4yle+YjmgkbSyEPB0+sbwBveK/gsC3rpmFZ3drjDkMu6A8XUUuuZDVzFpXvXsRATZr80eLdP/h/4Xg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=c5GQqnD2dR8DT5VILXifCpBbGEJJwmfUuRlsHd4DM0Y=; b=a+BEJD7ONVzXukq3CcNy7luzEmMl/o3hlKU+66tiF2stJMLga3AG02ZxPmlhZHAOrBuKqPhcE+omw9RDvl4ZEDpUjqeU1FuqHpwWY3n5S44LfS1oybaYHwEVTRnPE9rn+2wJhphMyluuuk2oLYu//x5CV4cgHoopUbVSwr4t/1LlxDP+gSzuyqhTQNS7Cd/WdaplIslrhzF/F03F/+AmZlBuuFeR6lcz5z83n6YOrpCe2ZhepPJ2Zwmkt5uVd/K3YN6w17f9s+5KmlOkQ7FXSeJRb9YP2xJPaUO1UStkCWFTCF50jyo1E1feDQndyuS4EqkE5r8eCzFKfCg31mumlQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6205.namprd04.prod.outlook.com (2603:10b6:208:d5::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Wed, 13 Oct 2021 04:49:59 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 04:49:59 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 3/5] avfilter/aphasemeter: add null check Thread-Index: AQHXv+3G/18Or3Vy1EC8vDrXleghNA== Date: Wed, 13 Oct 2021 04:49:59 +0000 Message-ID: References: <821af2cdf9ee3d4c63bb3e1e1737a20391d61714.1634100527.git.softworkz@hotmail.com> In-Reply-To: <821af2cdf9ee3d4c63bb3e1e1737a20391d61714.1634100527.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [k66QyQWhY/DQqiqD8VFzCLIZlmh7LV9N] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f6d2c322-21d7-4e4d-e474-08d98e04e96f x-ms-traffictypediagnostic: MN2PR04MB6205: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VOfLo2Uk3mjDIJLTlyu7Y5mF0gseGJU0zd/X08oh0Wld3RndWF38HdTOLpHLsmVS43OmR9Rs5pgm0cF4zokLlwD9Pek5FcuJANHNat6QmNgBtbwM3HkSwDYHF14AIl81Rbr8Y2GJ+lpXW19t/U55fNFV+Umjpn1zMWoHL9NYqgSWeQkw10Y+8vOuB2t54z9Uhp9SzCX+FIDhASUSIk80ThpEycR3S4QuF03rXRy4Xl8/sRC4yR+K3Q/JzGITqla55pdnB+X5lE839/7g+hJS9xLG0DazKoTftP80U46qx9GSgI5dqK7ME9P3bG2iYL5E03QYJCMKTFinhVkv3fF1f58JDBLqp+pLeJaQqOK6hwaKAYML1NzytgLXlGBl7kCyPDuhO8aetFi74BSUeXmcrJXuekzWRg1bdjtfpIAI4u6a2xMGqQ0kYUAy8GL5heIg x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: so0fTddCSImb5XEcM9BINuuh/nvJwFlgAUziloQa2OLid23R4M5iKpilJdYEDPuplH3B/YRhC1F01kX5Z9rrJbSx35BZ+mX3kegaTGM2/oc1g73eC0qFbjUKPEPevWJ6g5CZW0ochgW++qPPnqFy8A== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: f6d2c322-21d7-4e4d-e474-08d98e04e96f X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 04:49:59.6513 (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: MN2PR04MB6205 Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/aphasemeter: add null 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: H1dhZ786wXGR Signed-off-by: softworkz --- libavfilter/avf_aphasemeter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index d9302cf867..eca8751258 100644 --- a/libavfilter/avf_aphasemeter.c +++ b/libavfilter/avf_aphasemeter.c @@ -111,7 +111,7 @@ static int query_formats(AVFilterContext *ctx) (ret = ff_formats_ref(formats, &outlink->incfg.samplerates)) < 0) return ret; - if (s->do_video) { + if (s->do_video && ctx->nb_outputs >= 2) { AVFilterLink *outlink = ctx->outputs[1]; formats = ff_make_format_list(pix_fmts); From patchwork Wed Oct 13 04:50:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5559763ioa; Tue, 12 Oct 2021 21:50:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9VoGQ/PNJ6JKrmEQVF9Yss5BREfZSv7hD1FpHfLlHvneA4Ip0cf3vI7z3GjcW3iufqhSK X-Received: by 2002:a05:6402:3489:: with SMTP id v9mr6370919edc.130.1634100644349; Tue, 12 Oct 2021 21:50:44 -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 k9si24603712eje.548.2021.10.12.21.50.44; Tue, 12 Oct 2021 21:50:44 -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=@hotmail.com header.s=selector1 header.b=sn2QOJyy; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5932068A940; Wed, 13 Oct 2021 07:50:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2082.outbound.protection.outlook.com [40.92.21.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56EC468A912 for ; Wed, 13 Oct 2021 07:50:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AKS0mKPCRSRuaS5Y3pOovpChGyQK/7mwhgHvePednEHlh/qPfHs1xMUOXelKdsFZhmkokS+KKvPB++cv8RusKXK5xhP0/onajqQJgRYggQXVY/P9NF89sx6pWpg4mPH4PX9YBmvu9pSMsYe0MDVQXqO6ohQHeOt6neWI7g/9IluBdYw6wnCx0rEi5fDHdO0mcMXPaFUdITfDckcdULppOht7kHIK7VBhJ3Fc3xyffhsjasjO13Oh41LF1aFqhfPyrgWt10Vzw0Nh3VNovNG8muCmXG0YRFobPQsqDZusUrxOhV+tnaAbc7p6C6IpehqerXE6YzIbYc5TBUhKBnO6Xg== 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=wFFJrN54E6EeRwYN7wVviIne5x+nHynKI4ZIlGanmSs=; b=UCybbi9m0ipWUUUTcW3w+xQd4/gGfyMTDluTk3iUAWdIbkNB0zKB1viYTDjFoIdyvT2FuMf03n6X9yItswp9fP234NM0rWNDM0QzSWgIszGm7ApzZ6t2viYvt54wfPfmva3Rh7sZTh/VlZ77eSR+IoSjZWc+2vy2172OArWhYBRQnpniH13IdhH9+FMc56YMEImZtue0i7mi4y9NzetWfDPaP+ZW30VOTcZSpxcrzrYV2+Ec1CrU4sqnFQXVPmSFhl2QirpB8xnZ7BRQKiYHwn5QxLd+vpx1bngXWn9SygUsZ1E7cbliax8oYqQN/mxjrHzfcuCzlB4EZwzUafcIbQ== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wFFJrN54E6EeRwYN7wVviIne5x+nHynKI4ZIlGanmSs=; b=sn2QOJyyfM4r2gdaIXTG+lOXpgKQmxGSvTuvjd26zGLFuTBud8xLJ+KKNgILNOvzEU9ldbh/3OBBAnpM31cDQBah+XRF9NTFSGXZVdNtOKl+jt7IWyUvFH3QDt5sEjEq9Qmvz1f4ZpxWcYWgzyboERYJzJm0cHkGq6JCTFNqou9zqQj19EPFOZy/hsXR8j9uVc6NIGctyP27BaFjImj8BX8og8m+/BGk6gAVXoNDSfEn0C8c4YJs3nfaGvOx/pcfBEmwYOt2o2g7ySmWndTZRPMgabw0GiAbEKs7cNydlYfh1YtCVFJAWKrpI6XAlOiZ1XYTD8HLzvotjFwtys/Iog== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6205.namprd04.prod.outlook.com (2603:10b6:208:d5::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Wed, 13 Oct 2021 04:50:01 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 04:50:01 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 4/5] avfilter/ocr: add null check Thread-Index: AQHXv+3IBb4F+rKzM0m59FoN6xC4VA== Date: Wed, 13 Oct 2021 04:50:01 +0000 Message-ID: References: <821af2cdf9ee3d4c63bb3e1e1737a20391d61714.1634100527.git.softworkz@hotmail.com> <3b427b75053ae5970d9957e911f2b725688b7330.1634100527.git.softworkz@hotmail.com> In-Reply-To: <3b427b75053ae5970d9957e911f2b725688b7330.1634100527.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [gVEP8lvDNFUodyouM/PRwuuVZ0Mi9Dna] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f7ded800-83f2-49d5-69b0-08d98e04ea80 x-ms-traffictypediagnostic: MN2PR04MB6205: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: R1kwvKTWDRtSNg3D17VDBg87bnY1ezhnCM25XWWJvlw2GCfGXGubOhKru8YQhvycwDDH0YbudJDsqk5C6kKXcBh92rVof1lr7v/44kjmPvhMt3N7WqNiK+0GG+rFAEjvKmpKe60SPxMcgmKrYGJkmXU610K32jo9cdVRZNQLqiEarsVPCIbY/gdvC0zOjqWLsrnbmTRSWoR41xEATg7s6qeVJuur6gkAmV1PsbBP+P2LOqgV8FvmXwKrnV4xGT3DUTbk0JipKXiEPWCXq+goR/A1wTngPIJibY5AcOxJSF85zZcVS0FCde1WCRCQmMEDzlhkSmjCXOZSlJRvb0T55//aEk5oA6fXSMnDSQJOpWQYFYoZug8ZEHQZkxNyDbU1hGFVRDum8GjMNGvKxmKW2qDOgHHLgDsL6VDslgo6yQeNoi+m82bpeXfNFinyh35X x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: qqVqyrS5nqGbrs1qdVKclyDbt7RjmVnnER8u1nS6eeghVuzPjp4gniGRMQouogYtanqd3svgAPJ1v0hmLPlCsn3uiJKzjcAqdmcbqHIsRvedA2y0RIDl+si3ulvJHWsV3RB+gGdz4i/j7k5Uf/lFnQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: f7ded800-83f2-49d5-69b0-08d98e04ea80 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 04:50:01.4583 (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: MN2PR04MB6205 Subject: [FFmpeg-devel] [PATCH 4/5] avfilter/ocr: add null 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sMcaUsksqLnr Signed-off-by: softworkz --- libavfilter/vf_ocr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_ocr.c b/libavfilter/vf_ocr.c index f6249e61fc..a8be529033 100644 --- a/libavfilter/vf_ocr.c +++ b/libavfilter/vf_ocr.c @@ -115,8 +115,10 @@ static av_cold void uninit(AVFilterContext *ctx) { OCRContext *s = ctx->priv; - TessBaseAPIEnd(s->tess); - TessBaseAPIDelete(s->tess); + if (s->tess) { + TessBaseAPIEnd(s->tess); + TessBaseAPIDelete(s->tess); + } } AVFILTER_DEFINE_CLASS(ocr); From patchwork Wed Oct 13 04:50:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31092 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5559858ioa; Tue, 12 Oct 2021 21:50:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCTeZC5bACK7uN861R1cz0uxiZy93rNXKrgCwroN3NzzVF4LgkoAuNBDDStD46JT6HPkAc X-Received: by 2002:a17:906:b183:: with SMTP id w3mr37755089ejy.394.1634100655510; Tue, 12 Oct 2021 21:50:55 -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 n2si6034559edw.448.2021.10.12.21.50.55; Tue, 12 Oct 2021 21:50:55 -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=@hotmail.com header.s=selector1 header.b=J8RWTMJo; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4EE9568A919; Wed, 13 Oct 2021 07:50:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2082.outbound.protection.outlook.com [40.92.21.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98CB668A947 for ; Wed, 13 Oct 2021 07:50:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VllZRSVkYu4eOsXs26IYzEqeI+A7zDX02zf+GMXb92EDRtVroadHGZa+YOaASQtHy4RTDdYKT5BhrWhHbIiC11qObzGh1gY64efCNRr96lYyMpkdncAy3Gs+35+8BEMmoqqqFYR1aqKstCjwMQX0GZGdCS094qgI1sBuqyJpeBCF9sW//t0LPXPGLcC2imKLBtjSMKiCPFzPTTf2CHcTcK9PxrZ7tfZ3Xfv9H5A8lIsbF4JTOYmy/YMxXfi0C3//tGvifJIl3HCIXXxgjPIgIHtrACMQ+DEQb3iU0AzEfGW/ej6X1HvNXDPFsxPnQnx82DSqsJjjC2POiaZDIs/keg== 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=+lOZBdf1w5FymNYymYZXxlEq9hdNL/CMZrn84uByxT8=; b=ZPUVSsaKHxTJa712Gxm7GH2x9+azvN10UH7Aa0kW3s0vgOzIXS7Fx78/9lWeLeeNnm2bE32Ycj50jJFW4nYsBtwK5fyAz2yVOEzt/bQwPxKcBV8uZCnz+z0TQKIPMR/Nv+K65qCn5a4WGGwxk3yKbtBXN/I/91CSVUflrTXUkIqhKorVfCGXR2iYRSUOekz+xf6goBw3ezBJ0iQduZ9BJ1cQJZ1+FPaDlmqa9QGSpTM6UloVOzUi4mxQTKjG5enMajB9N5NQml0iox28/6PFf+L+5UNHt3E09WrLCZPfRlZASlRxfSiG1o4Y3UZKnuKT/uv3OuvUqH1V0iQyH3rMqw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+lOZBdf1w5FymNYymYZXxlEq9hdNL/CMZrn84uByxT8=; b=J8RWTMJoNC5O5RqjQZIirqJmfVIXRBBC+Q60nN9QF0VxD9lUPq6wUvKvGpO6uNgjeyk/y93TPpSTraaAbc7PICcI5nxHlqWxDfJ2NgTkRV5odJnY9M3gbshqfVGR8uDZf2KqbNmQYuj+QaAO5jeCVfE5QwBsiZ0RkM4RH5EH7Fm+1RP+dGw2JbPGPEUdNxYGr0jwi2Utxn5AiMu4T3GroWpgoG6+TW0QkY/JRplj7OSMcYIv+Tc6JS//4uDPLvVKxCRPBiQACg5tzEml3QacPZPg7+lnZV+PAV/aO/VkajEm4oZigOHPOVevGj5iL0K43urd26oZuDyUzizh2TRUmQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6205.namprd04.prod.outlook.com (2603:10b6:208:d5::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Wed, 13 Oct 2021 04:50:03 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 04:50:03 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 5/5] avfilter/movie: add null check Thread-Index: AQHXv+3JnTgzekGmf0KWwzak/eMbWQ== Date: Wed, 13 Oct 2021 04:50:03 +0000 Message-ID: References: <821af2cdf9ee3d4c63bb3e1e1737a20391d61714.1634100527.git.softworkz@hotmail.com> <3b427b75053ae5970d9957e911f2b725688b7330.1634100527.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [o9wQXbKDbbkl2Y4NBooIxDO3yhdLRv2k] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0a5cafe3-4bd6-4c89-b9d5-08d98e04eb9f x-ms-traffictypediagnostic: MN2PR04MB6205: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VGjw3H20/8MGJp7tXKe6po/0R92LhMSeykk6VZlZabycnm3xhZ5gCB4Ebt5brPQNsUInZ9kJY4pmRX7P27V+xKhiEKrEzo7sTh0M4fVmZiXpjLXxVmGazT4AgJmlUOJNdH5OPPvEKARfTjpRozGCLARW5uU0KMBloF6nLH+5O8TKUNJevR9d6Lpln/DXJ0aP3DMpnktfxgx2FpgxnGO0rcfhlEKoVjyNITnVRw0y2b/27JtfnwHRU1CdLN7+ef221g4PqpqyZYoHyXWbTez+OuIfq3nXY4O/PzZFdlyaETRptVYBzDc2ULM2dFBmENW+fw45Mjmf8Nvje7prU4FSNz1rr+wZCPgd2B+ajLVTpvLjEfy257KAqGYmax1YBLSYFm/SiREybdZQirxW5+HZ18+5MYp3N4nrlLac85AGAQ6Xca0MWIFLVaKj6AMqz1Xy x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: QSI4Ff0BvrV+C0TNqgvhpiGWjFftPHuASNnYIKVZeUdLySLE8oAYwskXstfVivNIOF5vjUToxEUXscbc/rF/u0xBzGGeXPV8pawXIbRUczGrxsKyrYQR8f+X1Y9ClMqCLyd32NR6sqEg84/b/o5WpQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 0a5cafe3-4bd6-4c89-b9d5-08d98e04eb9f X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 04:50:03.3143 (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: MN2PR04MB6205 Subject: [FFmpeg-devel] [PATCH 5/5] avfilter/movie: add null 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: X6eE0LNu9Y6x Signed-off-by: softworkz --- libavfilter/src_movie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 573f363705..2002e176b3 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -332,7 +332,7 @@ static av_cold void movie_uninit(AVFilterContext *ctx) int i; for (i = 0; i < ctx->nb_outputs; i++) { - if (movie->st[i].st) + if (movie->st && movie->st[i].st) avcodec_free_context(&movie->st[i].codec_ctx); } av_freep(&movie->st); From patchwork Wed Oct 13 05:49:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5602263ioa; Tue, 12 Oct 2021 22:49:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxIPnUzBvL5aKmXSG8ACTfp3F8JWIkHkeF8EPR6rj8/cVi1UEiSgX3TmXqq8Pv92onMbKS X-Received: by 2002:a17:906:b803:: with SMTP id dv3mr38816573ejb.289.1634104177482; Tue, 12 Oct 2021 22:49:37 -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 y13si18809916ejc.247.2021.10.12.22.49.36; Tue, 12 Oct 2021 22:49:37 -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=@hotmail.com header.s=selector1 header.b=RoXf2Yom; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 53F5568A817; Wed, 13 Oct 2021 08:49:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2093.outbound.protection.outlook.com [40.92.19.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF19168A776 for ; Wed, 13 Oct 2021 08:49:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NIdOeWHc5xENwYqQFyPTG+eI3fEz951U9UXRHfPuiyoGhFpTHomV+AYwZ/COf3lU0ecGjw0y/M4I48TXgSTRDEVBhU7pKBDDq2EpNTbpPl/OZmPAjHewYyDu6sTrDvFVjZsqPu/DGWryPT2svdLE760VwC0jgZMzrk3/AeW+fsFb+QQLDh4wMLyYxqUaivY+DB16g7p36uk17vxmmyhbmq8yPkaOsl68PL93Kypd2LN1v74feKkLO1ny5yQexFVaFZ69Djjcmvz5IIC1BXg5OaA0vHoaQVBLSvjl5XdE3aGk43Td2pOrVhG8hOYVC6/eASd0S/3dUC0C7eEkUUYZaQ== 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=uEL26ca1IOXY5PQ9eIdAFM0lPG8Vwi64AKuuU0uNqjI=; b=WiazvFR0yHBVAai7HEBHc9vlvI2nCZOFru1clQnTpFj9gKV90FVoDsLNAur7aMkrRay803KDDYTLkm2x3kprxLq4lZZi6WX+vwkGQ16T1RH2N01a91owzmvdt+49v/xZVmCaJKGkwwz2fQIboHsbusfYVBl8sBFp+zRP7ouqY3kr7S4d3tgVxjE+as7Dij6MJOlLJ2WfC95FpV/HxA/ogWYODtK8zkK4fUQRhOgj37dMQjdJWaFSxDgjKMzM3PygaFlAvGp7yLv2r1LJvEcVP800fQFM96cBin3dne7mN/ltv9JC7luqqmVM3GgPTSewYLJzBsNscxX8oorjs8d9Tg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uEL26ca1IOXY5PQ9eIdAFM0lPG8Vwi64AKuuU0uNqjI=; b=RoXf2Yom3lxbjGFoSazBb6GXed1Oym9nW8dzG9VGw1ZRVSz4sfPPUMNzn7wYb7+V4JkcinZVSPqceAF6WN/Ulq8P619lXsWMkwCJqm53QUSkrfPO9mQl+zEAJTMTV+IGIDJ1WnumbXThjDCZdNCiGxAID3RKsfWSHQ2OgxF3Trm2b6gqj4sc4/1JvrvW0Awgqd5iWd8tTo01zZzECyEOBrPFwLx5lv425ulD5LWIC2ZJ9Ldyg4Gtl920wzzu5P4K1C1DoeEfbp0fPBPpYihEJoLT9Lma9Gt8KdwxzPFR/OqRd7q2vdFEgdDqu5+bxbCiaGL+DY8BssLeEPg39qD3aQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6159.namprd04.prod.outlook.com (2603:10b6:208:e6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15; Wed, 13 Oct 2021 05:49:23 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 05:49:23 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/1] libavutil/opt: fix mis-alignment of option and constant values for filter help Thread-Index: AQKMgTzc5TTuBt3KV36FAsbHh24HiAII7gul Date: Wed, 13 Oct 2021 05:49:23 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [BnFgvQxwu0Ss6sxgDSvS6GjRLdEw/YdK] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 99ed0b01-720a-4f9c-7991-08d98e0d35c9 x-ms-traffictypediagnostic: MN2PR04MB6159: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TSkZypqLpwzO1bHwRPr1GRY6W09UelGQRJYMW/2FwjkVlW/g0Vo7SaiTKYJDkMGfrehhIOs+LD1IH41tMBGr4Zqvqn8CZnASK0TtLHKzwia0fJRjfmcLK8PO0AkCasJ8Rys/RjNR1sB2x4wefq6ZPFZRklNmvVJr+W8jBOzJyPNUjLrh0nggh1RCLVWfwGJnDUh7C1nvQEwaZB+oqPhDAdz7DE2HedApcbTdnLKiT7tetAl4Sa6iCTbk1rYG65D6PTClEW9uEYdI9GZ8l1e7QcJF7t3wc1AxEq+KFyxCUqk4L4ml4d9w/d5aPhsWGEbR+JrAe89LAZFki5qVeN/c+aKLzLlD+hpfFpQBFOlJtx1Ugz4PtfVW5biadgnBkEF5S0ed9oS7ckuOyagnG6Qq9JqXeaJqOYDYrLKXBPNpwrMtiOatyUcxNphBNZUqesoK x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: N4kd5XEQ0Knzkd/VW2WYBWs/eNvcA1gv1tBN+dR1grke7AIQ+D5sTVLYcaP1DOFXFVfllLPMRSc3TJe6dIY2g+dnJFdSw8NhYvpDUPxF5PUdGEsniobuPehezYdbgoPOc9E2wx4z9hozi4wgaj0JvA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 99ed0b01-720a-4f9c-7991-08d98e0d35c9 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 05:49:23.7051 (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: MN2PR04MB6159 Subject: [FFmpeg-devel] [PATCH 1/1] libavutil/opt: fix mis-alignment of option and constant values for filter help 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Us4+VyK+qOZh Before: overlay AVOptions: x ..FV....... set the x expression (default "0") y ..FV....... set the y expression (default "0") eof_action ..FV....... Action to take when encountering EOF from secondary input (from 0 to 2) (default repeat) repeat 0 ..FV....... Repeat the previous frame. endall 1 ..FV....... End both streams. pass 2 ..FV....... Pass through the main input. eval ..FV....... specify when to evaluate expressions (from 0 to 1) (default frame) After: a overlay AVOptions: x ..FV....... set the x expression (default "0") y ..FV....... set the y expression (default "0") eof_action ..FV....... Action to take when encountering EOF from secondary input (from 0 to 2) (default repeat) repeat 0 ..FV....... Repeat the previous frame. endall 1 ..FV....... End both streams. pass 2 ..FV....... Pass through the main input. eval ..FV....... specify when to evaluate expressions (from 0 to 1) (default frame) Signed-off-by: softworkz --- libavutil/opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index c7001dbcd3..8d866d8a3c 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1170,7 +1170,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, av_log(av_log_obj, AV_LOG_INFO, " %-15s ", opt->name); else av_log(av_log_obj, AV_LOG_INFO, " %s%-17s ", - (opt->flags & AV_OPT_FLAG_FILTERING_PARAM) ? "" : "-", + (opt->flags & AV_OPT_FLAG_FILTERING_PARAM) ? " " : "-", opt->name); switch (opt->type) { From patchwork Wed Oct 13 08:34:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5715310ioa; Wed, 13 Oct 2021 01:34:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF2X8n71iTmuhS868IdhEcWvyNzYqhaP1ZtO3f1gIDYsdk01CGwN+5sER8M4AYqJlPS/q0 X-Received: by 2002:a17:907:170a:: with SMTP id le10mr36896312ejc.537.1634114063641; Wed, 13 Oct 2021 01:34:23 -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 l19si17851752eda.351.2021.10.13.01.34.23; Wed, 13 Oct 2021 01:34:23 -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=@hotmail.com header.s=selector1 header.b=u5PsuLqm; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E48B68A9C4; Wed, 13 Oct 2021 11:34:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07olkn2058.outbound.protection.outlook.com [40.92.43.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA8B6680B9A for ; Wed, 13 Oct 2021 11:34:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gx47tsU5gnJoXAc/Vnot58b/kl7+jtjs8Z9dZ0h67omi2YSaZIb4usuJ4r4KNAYT+LxyP+jxtjjvy9pdCvRZPKZDIhLbC6Z3uHH0LxF8A3CCA3CMyhTOJhYGO9iZbSJOqTKVhaNuBFKwBvNe5xC4U5KyOF1mXBnVfic1QarhJpjPnPbcsi/fnuGzfOZ1vMYTvn97xrYjBIipJZ/yeJlwgGL6z+9ebqKR1KxBwCvcmyIkifgBGyAFyKFb04/AapjFydi1PJPX8//R/dlIdiSpxl8ECcyKTbaRgCyREc5J7lhMAwFd98kUZfHVD1HqG4xxgoRZNeq6YFKthoOWW9qG9g== 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=ez8lTlllQcyBoZgPDWiFa+45MeyIw6JEkYLK93+Q21Y=; b=kww5jHCAsNdSeyyyb795LEGSoFcO8MBPPOaHiBKGluxDjcIkOdpd2VaYE0zF5IZlVLVqTM9XVPEFd2mp1hm0MtQIqTVxj5TRtpCQEwgxuSPJ//98ZdYwyaePyrLv1iYcLRjiqf9Ri1mGlMr5gLbJ2VzY201VTKrWa/zX7pXZeogJLcyyguKJKmD4mr4dFT4L9zWa0vw9G8JnUtBHrEiI38Ki6vf3RSzOZ98uUSpI/R7O0r6csllGZuUY4TVMcnVn4CTrh2r309kbrecCcsnYVq1NkmU2GT/EAUeztOTY82/XPZo20kyQ2p3oeBYUyupPiBqS6TCEaqHL3wFgvz2mCg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ez8lTlllQcyBoZgPDWiFa+45MeyIw6JEkYLK93+Q21Y=; b=u5PsuLqmJ2d+4hr4RRcTU/0fbBh8dE05EVFEsNEJgwhCJmb78JBVi9R64iCil9ui+jG/NIQ2MWh79yDIHadNxNpjvpwV0gfCg5l+vWqJu5x3zK1kCuy51tmDAcDXc+xHfmP9X2MqeIOhJ4UtH2iD7DUlN3RqMVJDT+/+y+cb2/GyNUUCJMu3nwnhMVILzDXgBFMnjpSuZDB2BIgBTYnUSBPaPkk3IME/cjDtJtqYQ620v7vw2Yq3HSQLqrPlAFLye1aBpBNB3mYqVybrXn5nkZZaavGWjGjvOrcW/tA0Sk5bTqctAmT81zhdorE6E2tnSI25wOMaEy/QKOm3veSUMQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6031.namprd04.prod.outlook.com (2603:10b6:208:d9::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.26; Wed, 13 Oct 2021 08:34:11 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 08:34:11 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/1] fftools/ffmpeg: Output log message when interactive q command is received Thread-Index: AQLno0of0GqFv9upgjTP9e7f6PIUtQGsoh3b Date: Wed, 13 Oct 2021 08:34:10 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [5oUqs1s0h97/WRbk3tk47/8JcbwojmQl] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 50fb4317-1aef-48fa-b49f-08d98e243b15 x-ms-traffictypediagnostic: MN2PR04MB6031: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UA5nbTBsD191YSxiT2IyDTP5f8It++xiFPsC3tLkosaF3M7dboa9MebuBcFv14GwO4UuqR6GS1V6d8hYB8mUJMXDg1EnDSJ6G1q9rBWXb8sNfpBT1u3JfXv8svStRV86A2Fk1weyzzyRuRamcdFm44/mVjzEwK1zKMyjBcTdEWgBchrIMC8/gXoYV+D5yjWQfl67DKKqhbNJAmOVIfIzKdR6QzQD9pNYhnNp5tSP6merUAIGlufwQg2YgSFD4OgaZcZj1Be5XtCwyYHX95zQhcOxJHqQp3raGGZhwcqLOBqN3laZjod5in/BU91/c/Fq3fJuPVircl0imsyGed1Kl6z15rB02KkmBbpRf28VdgcTUbGvd2nz2WLtD8VczC46Rs9sxmtNShInL5agVG8fcPkBzDiPr6Ga5QbyXxXLpVI40MkiLCePWw7rZncJIZEJ x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 6DmyN/BGJaKTihhrl1zmUEwC0pWOXgnIUvwJNwVoCQzOKAXwtwykksIHjdZ69g22kSWQUQKqfa0rvC+bo9KGv/eUbwX1k5pE07N/GITgpKiHpOFULLOAW24lfLh+wTGK3MDyg0GD5VP8AZ2vBMsYRw== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 50fb4317-1aef-48fa-b49f-08d98e243b15 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 08:34:10.9611 (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: MN2PR04MB6031 Subject: [FFmpeg-devel] [PATCH 1/1] fftools/ffmpeg: Output log message when interactive q command is received 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u2LepAG6fdeK When viewing logs, it's sometimes useful to be able to see whether execution was ended via q command. Signed-off-by: softworkz --- fftools/ffmpeg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 7545b7c68e..d141f34df9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3991,8 +3991,10 @@ static int check_keyboard_interaction(int64_t cur_time) last_time = cur_time; }else key = -1; - if (key == 'q') + if (key == 'q') { + av_log(NULL, AV_LOG_INFO, "\n\n[q] command received. Exiting.\n\n"); return AVERROR_EXIT; + } if (key == '+') av_log_set_level(av_log_get_level()+10); if (key == '-') av_log_set_level(av_log_get_level()-10); if (key == 's') qp_hist ^= 1; From patchwork Wed Oct 13 12:08:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31101 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5892055ioa; Wed, 13 Oct 2021 05:09:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymTS3f9JrCMSSuLGVxhIjQdEvAwS54Xl9wjIPsaqXzelwSjxy4D3pQJxSrn9UI1Evf7wHy X-Received: by 2002:a05:6402:7:: with SMTP id d7mr9150755edu.265.1634126955223; Wed, 13 Oct 2021 05:09:15 -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 l15si13304209edc.464.2021.10.13.05.09.10; Wed, 13 Oct 2021 05:09:15 -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=@hotmail.com header.s=selector1 header.b=kelgAp56; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 962D368A842; Wed, 13 Oct 2021 15:09:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11olkn2106.outbound.protection.outlook.com [40.92.20.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C8E868A4D2 for ; Wed, 13 Oct 2021 15:08:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fzqU0l/1xieWWc9QZuV+5UR8gyigEsFWDYkQz/xduwUgKUtdBizclt4LgfZZCMgQVWfuGa9wbzyyXdJ1X+Z2qarvyPiRTbSnKKWyGGKxyNZ/FV1nJhNpPcTOFEUlvXBu6FbyaEHp8qEm2Bg9CEB+TZg0LUGJtuJ+MT+AJ/x+BdA1v5n5sgndGkgAhtSdvS4mBpXZmjrTGRRl0i2jeHB08e/zANUbMzJw9M18B7P/ZufNoTrhS89kD+QX3ib/5b4GpBRz+1hFNl8Iv94T2/xUpFcZgakZDxGEp437WVguzOZCb4fzHczpI0wq0ZgjR9PjBQGxw3YaQUDriDhue5RloQ== 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=PmHwqP8b4WH7bLi72qqA65WHWy3LL+rdacg3W3e4KAY=; b=BXcCVZQAZdYw9fhWzTKRnssDIjkUrp5jE3sRegAQJkyUxagAfCAcYCxhJTZWydcUD1qCVenGwDnsn5ni8+6+73AZEfeTH9q53h8MzPdLANtVmEZgytChVnwIPeURaBIvA+aa/8PKNuYLYhopAyHZUKHl3wSM/Mi0/EJwh7/08jN39tyvo0rkTJGXM1SGKSDbTNkzoL536Vc3G1zLxH/jadGxJHjqQxbrt2jvUbjVnlhnst+LuI6ELHHLPws/WHQoJIBI4BCDP3p+cJG5sxyn9WGXIZ44Zntpji7pHhXkRi7j/Z6xTpx0mK1WItCyWmjgR/fzbqZE4ZpPQk8IBVp3vA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PmHwqP8b4WH7bLi72qqA65WHWy3LL+rdacg3W3e4KAY=; b=kelgAp56qPJcxyfIvujP2i6VnE6KRGPnWugGlkooj4rv4n0s48KwdjqsVyJeIQRmICUlLeqNrg3LQS7NVCdU8HNFz/9zxDGBtDC0H+OrL7S6Hi68TtXkf7y+WO9A1PsYFb8EMuyKJQreG/ZNVM/CfQ5f/wbnaKtLeqPK3GZYPvfS5jvacCGogBdkMgx4cpp0hHD9moRSjMn9uOu5Tv6raid0pBwyK97NWv8Grf20K+OFy8Wh2muvrvQi5cULEwBcsYhVEvJgoPO3KfMX5B0FlIs4iWgKZFDNn9gW7b8VDPMjQfs2OtRCreGqhClhKbwm2N+Fww4vEdPimAk0XyP1jg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5502.namprd04.prod.outlook.com (2603:10b6:208:e0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Wed, 13 Oct 2021 12:08:57 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 12:08:57 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3 1/1] fftools/cmdutils: Print bit depths when executing 'ffmpeg -pix_fmts' Thread-Index: AQIAOCS2HB6T0SO03OBSYM7+3wxrCAJfISog Date: Wed, 13 Oct 2021 12:08:57 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [IKCO7lqXVFYVOWLPUiy0L/dB2JgQ6ROT] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a672c255-42c1-41ff-5589-08d98e423be4 x-ms-traffictypediagnostic: MN2PR04MB5502: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: K++vkdzRYyTr/6GbMFD4mJh4frKqIStbw3Pe3KGB0draF16Em4FgxDI+pJafxLPAbHOchyszODHqPBMHjqgM12gOak4jGyIViKU2S1JZWcoH/7cptJdiKPid6KYFzeCQ4o7agy4d5i/hw+tcW4X//lE8/MD3pmV+s7iVfhiGOrG1KstsdYS1YeTimCS8IKaWzXxpwzbrV2JcltIRRtlqmjqpqomS1N5QF/LXmrXl1xBhKoXa+S7TW3R0ff1CGpCV4Uy7HamYHFN6etFk+l8WH7F5MEsGkEJfvLBS2OwRTRVPMS+rDKSiXV+Fa+eCH3MYvjXf0wfGShCKdv8zLVyIocoDo22dQNb9db1HatVEn3ny8TTA91bRRaOoM1ODHIej3pKNsHlCmtQn6QoyPiyI94KsgoCpuSjYkZm9qAIwdpQyANhv+R1QXGdt626llK9C x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: B/E2SkysvB5zDQOl06tYIXVdt9iXMlSrvVlGZWUqZh3SpQ5/nXeSPjeiscapF0NK0ahRadzc1cG5BgcYleIO6ahUsVinllkBYiMWD6yR5py5SNdDQ+iCXPoX/lmABf6ls963eaPDYnj/qrPjCVkn3Q== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: a672c255-42c1-41ff-5589-08d98e423be4 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 12:08:57.2012 (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: MN2PR04MB5502 Subject: [FFmpeg-devel] [PATCH v3 1/1] fftools/cmdutils: Print bit depths when executing 'ffmpeg -pix_fmts' 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qqJyHpB1GFOj New output looks like this: Pixel formats: I.... = Supported Input format for conversion .O... = Supported Output format for conversion ..H.. = Hardware accelerated format ...P. = Paletted format ....B = Bitstream format FLAGS NAME NB_COMPONENTS BITS_PER_PIXEL BIT_DEPTHS ----- IO... yuv420p 3 12 8-8-8 IO... yuyv422 3 16 8-8-8 IO... rgb24 3 24 8-8-8 IO... bgr24 3 24 8-8-8 IO... yuv422p 3 16 8-8-8 IO... yuv444p 3 24 8-8-8 [..] Signed-off-by: softworkz --- v3: add context prefix to commit message v2: print depth values of all components fftools/cmdutils.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 2c8e98982f..426ba6c99f 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1754,7 +1754,7 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg) "..H.. = Hardware accelerated format\n" "...P. = Paletted format\n" "....B = Bitstream format\n" - "FLAGS NAME NB_COMPONENTS BITS_PER_PIXEL\n" + "FLAGS NAME NB_COMPONENTS BITS_PER_PIXEL BIT_DEPTHS\n" "-----\n"); #if !CONFIG_SWSCALE @@ -1764,7 +1764,7 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg) while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) { enum AVPixelFormat av_unused pix_fmt = av_pix_fmt_desc_get_id(pix_desc); - printf("%c%c%c%c%c %-16s %d %2d\n", + printf("%c%c%c%c%c %-16s %d %3d %d", sws_isSupportedInput (pix_fmt) ? 'I' : '.', sws_isSupportedOutput(pix_fmt) ? 'O' : '.', pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL ? 'H' : '.', @@ -1772,7 +1772,12 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg) pix_desc->flags & AV_PIX_FMT_FLAG_BITSTREAM ? 'B' : '.', pix_desc->name, pix_desc->nb_components, - av_get_bits_per_pixel(pix_desc)); + av_get_bits_per_pixel(pix_desc), + pix_desc->comp[0].depth); + + for (unsigned i = 1; i < pix_desc->nb_components; i++) + printf("-%d", pix_desc->comp[i].depth); + printf("\n"); } return 0; } From patchwork Wed Oct 13 12:11:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31100 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp5894720ioa; Wed, 13 Oct 2021 05:11:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7z77ORfKV9FUCt7+rX79xGpUgYWTplcdU/YWmJ+HmYSz35prVXMb6ckR/KxGSD5VLPAY4 X-Received: by 2002:a17:906:3d72:: with SMTP id r18mr26335872ejf.525.1634127096756; Wed, 13 Oct 2021 05:11: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 qh23si18991807ejb.493.2021.10.13.05.11.35; Wed, 13 Oct 2021 05:11: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=@hotmail.com header.s=selector1 header.b=GUeIzujG; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3007668A56C; Wed, 13 Oct 2021 15:11:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2012.outbound.protection.outlook.com [40.92.41.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDEA26808A7 for ; Wed, 13 Oct 2021 15:11:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hU43JzlB33ffTv8tPkkfmTrWO0398tsEAm8ea0j8yBgM83jeCKN8zcQKmfgFfei/ACYDjHf7NeNip85A7iVQPgwr2cnwxPgjHK5VV0snlt9fNHsMCr79lSNwavbWCTmdHmn/cJW04w/xE5VxAgi8WMnWuAl+hqq59bG8Y5qdXIFtUiobXnPmJpFKmgktpUx6dhY1PRv1+m3XdWPRY9134tRFXhdnLh+gpb7a3n2lMsdK7bXCBgjfa9gk3YvEc3KXDBzDz6W3fEUz7YjSF3dMN6XqLOLhtn5yLNZD/xDxuslbSqmfqCuPVITRHiS61WJCqZQDuMjYNuQxlzZTA5NDpQ== 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=5jCFXWCem0Ts5n3ybr4ziE+SasDFqcPSxjSZAu5K2Mg=; b=dA0pFigbEaDkahK5KPhZZGXCV8rUYiC3JoBbt4KB0TqQXEQ6uONqeKMoizjGgG1n/A52bdvSf72YvWvMDzyV6PPm9q/KTK6c5F/Xy8Uld9y8xT4xBCQSg9a464LWsMwe1ZC9tuGJ/38Lza5jbtch3URCcm1s39zVSA+/Ftb/+6z7a8pkzE90o2dGa6Zs7jiqWIO2m2ym8PF/PttbeW6aMxoZ99PVw6CDO1fd+d3k2mCidS/ZyCbyNE770H6Ym/SudH5JcDzBD9RcGmGyvq99D20D7Shvb5fKyfFeElU5c2t/yV1aZkcCE50BzsyQZgJc6z5ML0KneuXO3K/rZYzzsw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5jCFXWCem0Ts5n3ybr4ziE+SasDFqcPSxjSZAu5K2Mg=; b=GUeIzujGxfWezXUeFCYIRey5byDxjF5nNoxAHuN2yC4+f/V/AVycr3I+A3L8ZybY3SCVUPrycabzKHlBGlxbvcu+L78gfSx/FxCOx1lfVnrNQcJQoumc3KpplvK/x9VlyIMvtCuRdfeTThEbT0XtA7oO0pxI4X1nfD9a/CS0zW7+dsdwg098RD1b858etbhYEmGU/6wRJDw2BCeMTQWA/Cwm7KzVXrtXpBizTh0+VrCfIh8XFuF5951q1RjXhfu0mmpc/kLjg0O61p2LkU0oGqL0YiwP8HsLuiKY4nYPMQVcG1mQg4nnd9qkT7OWfkXtMtbvCo4ISy9vUQrp5psiOw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5727.namprd04.prod.outlook.com (2603:10b6:208:a5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Wed, 13 Oct 2021 12:11:21 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Wed, 13 Oct 2021 12:11:21 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2 1/1] avformat/dump: Print codec level and stream start offsets for input streams Thread-Index: AQETz0EUEg31RdgyHzI0csohaQHEwAJGg93c Date: Wed, 13 Oct 2021 12:11:21 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [8AhvACohQQ8QpHEZpNYdYNUs3Rg4dHPU] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6a640f6f-569b-44b9-1ce5-08d98e4291f4 x-ms-traffictypediagnostic: MN2PR04MB5727: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: HaAxQg7WwGr6XV7BuIm3lvevumx++tC7WUbF50iVYX4Ec8spD15sFN4UFdor8HHvHl7rZZkgbEg76lcackY9N1k3SqEw6HIMTxXZTy5QFQxG/cDjjiEtVb0gTdjR3CD9kqdU+VmCZie3Ivq52dHiqGZ1/jVJrxvuIYZxfbTwYNloc0dpwBpKoUit0hvlvtEL1LCnAovO09ZQ87ShJsPRZ/J2Ne7GNO6XpgU8Y8KTVySNntoJ5nToeUTAxV7nZISOxelGFXwGt2/WFrmI3uTNaVGIlZaVLh+95DLJQQxhWvEdrX4Ay6uAr4MLfbyxl6s1jJhka5Rd/DygjyJNGvEUMdvVWhpKiNC88DTezueSbLOk26jfWcTqSGv2B87i+Gyrp3gWTFsdlGUsLC6bS1XMBsUYGZ8Sg3oAnVxqJsJhCsrHz5BXYb9lTwbdZzt3wFnM x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: NKhlHQWpPhoZF+2XhxXhGdHA2QlgARytvQZ0aFsdeIUNz5FKBMaobuUWAnsfCgET6UzK6TE2y5XMM5pBu/uehqqbEK/8uQhiVBinK8IBTZ8X/kztAR/yXMrpNssyjM3dME0LWGBCGA2wh9namN+4Ug== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 6a640f6f-569b-44b9-1ce5-08d98e4291f4 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Oct 2021 12:11:21.6516 (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: MN2PR04MB5727 Subject: [FFmpeg-devel] [PATCH v2 1/1] avformat/dump: Print codec level and stream start offsets for input streams 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wdJKUM7qu8rJ Signed-off-by: softworkz --- v2: rearrange code to fix warning libavformat/dump.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index 4824965ee9..58bb28d06e 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -566,6 +566,9 @@ static void dump_stream_format(const AVFormatContext *ic, int i, int tbr = st->r_frame_rate.den && st->r_frame_rate.num; int tbn = st->time_base.den && st->time_base.num; + if (st->codecpar->level > 0) + av_log(NULL, AV_LOG_INFO, ", Level %d", st->codecpar->level); + if (fps || tbr || tbn) av_log(NULL, AV_LOG_INFO, "%s", separator); @@ -577,6 +580,11 @@ static void dump_stream_format(const AVFormatContext *ic, int i, print_fps(1 / av_q2d(st->time_base), "tbn"); } + if (st->start_time != AV_NOPTS_VALUE && st->start_time != 0 && st->time_base.den && st->time_base.num) { + const double stream_start = st->start_time * av_q2d(st->time_base); + av_log(NULL, AV_LOG_INFO, ", Start-Time %.3fs", stream_start); + } + if (st->disposition & AV_DISPOSITION_DEFAULT) av_log(NULL, AV_LOG_INFO, " (default)"); if (st->disposition & AV_DISPOSITION_DUB) From patchwork Sat Oct 16 20:50:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp1737989ioa; Sat, 16 Oct 2021 13:50:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMA39M5N6scnlRduvj6/8rBCcIKPYPIXT5PQNr6XXW7yW8LYojikvjDoS0hr3iDbISw3hy X-Received: by 2002:a17:906:5d6:: with SMTP id t22mr16795313ejt.98.1634417430363; Sat, 16 Oct 2021 13:50:30 -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 e8si11315997edz.147.2021.10.16.13.50.29; Sat, 16 Oct 2021 13:50:30 -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=@hotmail.com header.s=selector1 header.b=FD63+PUa; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 675A168A799; Sat, 16 Oct 2021 23:50:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2045.outbound.protection.outlook.com [40.92.18.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCFF268019F for ; Sat, 16 Oct 2021 23:50:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ccNe1O7eAUy/lzjSTfEzo9Dyw4va8uDDHpjruFZmNKoNnyq+a9iPcFaIbBnkJ3ogWT7decAUUEtFO53boeAnaXzufO4RCeWk0E4h+d7tKx21ctmcfmOSCQgggXNhUlc3fKCvLZBcugm8Fm568+6vNCWwawoViml52SDWlD2SMX2IsjOCRrWY205amLZhIi5rpq5OMqTJPsQ3oVF2PkIKoDlggf5AaWq9KIIjIn3lxGLQdK5edcRoAUG/Ow9u/rRZfb2z/8dK4xhCFF7rAd7loYqGLDwvohP0mQ2FQ4rN8+STHqtR+kRYAr+8SjKPIhVnz8rspkAZo8FzpXFhHj8mZw== 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=bCSO7TQfsFt63jIpcYW5zbg20FjphdOCRIjlhaXrs2I=; b=UM+dgSXwGQFRYpCh5g038AqnbqPAypu3b2r/OJGAXhQonqCe133KUa+wknAs20Jle8Lg8QH74xfa01Vp+xJEabJ1YAdhDg6ty3g00zhAcqOVdbgtuL0+HZjYMOAq6dyNpbcpIrEdk8M0eY5HoyG874N5E23qxeqFdtJjas6x4xL/044eTQs49ZM5PQ1s0D7g0MfALzcwFaBhrT+9qU6qNdqd/iGFrk7nOXYGeDacsQ4skYxBsLcEDHBjvlh8b8MYTRlbyB1RS/xwunyfG+Ph4v8gVAFCIJ3T8zUm0TOxhljsRpYfZ7TiJYW5ICwMQLWzplKvc9fvrSerTZrQ/T9zrA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bCSO7TQfsFt63jIpcYW5zbg20FjphdOCRIjlhaXrs2I=; b=FD63+PUaCSHETYULKy+kgQr1P9epJ67/3nE8rIIVJIFscS98caTZ21Cnz1Ysd/sx2QwRzsVR1Ccoi6llE01fMpPzLUUrJrihMH5uvFPvU+P8HUioHFnYmsnHRcIPs0JIjJuoQxLNcPN0E8Q2tgavmh9n9G6YUmet5SaDsoIwYs+CHpHTjUCw1taFQkh1GxkgiYA9ryb/U4qAeR6K/7Yu8L8TtfACuPj7bAR69oBey9ByqDGFGcFDTiYQ6Eck0Xbf9FVU9oCKhr+ObPh0rN1WVFmt82Mq5sge1/RUi9RGChuPW07Z6RHCVLhjHDXdiq0L5AyMu2q221v+RKhfmS3TmQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5504.namprd04.prod.outlook.com (2603:10b6:208:df::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Sat, 16 Oct 2021 20:50:14 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4608.018; Sat, 16 Oct 2021 20:50:14 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/1] swscale/swscale: check SWS_PRINT_INFO flag for printing alignment warnings Thread-Index: AQL9Btr0/bAaxC4bs9lI2XF6zbgL0QC+eL+z Date: Sat, 16 Oct 2021 20:50:13 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [MRaitlZLF3g6SNbHB7/5IYVdX8hjv+o6] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 44d67eb4-0051-4ad6-9fef-08d990e68d7b x-ms-traffictypediagnostic: MN2PR04MB5504: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6XJiSfaQFF8tTIX1qWDN7TcSdjr6F2DkV4N2t2Fq9FTo8NT+azNxFZ9JLOrCPcvl7mfTAbpjzF1v62zCR5h/xxF2pfU244uzL2UrPMbGn3/giKlTlnEYCzaP7htI1tk8lRALtvjsQgWXkm+JAXj6TToo74Gn7/ElDTqKs8AO6dd8HuEv5CfKJbwQ1PagjQGhwHWGhnpa4V15V4jhq+jda4VNNZcfZECdMcTTeZcN+agLAs3aAmX5fBU4wUOWzvG5HRdA/riX0mjXG5c+sCbSRGU1V/K5xdMGEBFhWlBYzYZ1TqFBGQ58g/1nu4WakQe1/4y5i2fc1673/u7mnQvWCtmoh0/Mq4AVwdr22WN0HnX7xhL34Md4HPm6qJpSFAyPFRAbHOOtZzYz3JFpepohsRoUeWr9m/kHEJ7kd+tL0oD0Wu6bG7uJat29LPtyLIs8w2Hikw1XJlof7/eg6uetqutcPPgzzibRh/nVclXJcI1rFxCRdmbcO8XIlpNhqyPQ4uAOjD9hSmmycgueD0R1Lsdn+Qbnv+jUD8q87mMNXSc= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: hbWgQ3wwYpEEAYBg33ZnpXcGx9LjxWVMkuGUJFxbQjtZzVAxRXNPy0zQARZIg2NgJnLKoP9pslLfi7x/JqN8wF5Wpl7xlScdxc74Q/lGXF3KUhMyRBFEQtvltlg4KLkfZSyNTxB2clrIavYedFJbtA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 44d67eb4-0051-4ad6-9fef-08d990e68d7b X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Oct 2021 20:50:13.9643 (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: MN2PR04MB5504 Subject: [FFmpeg-devel] [PATCH 1/1] swscale/swscale: check SWS_PRINT_INFO flag for printing alignment warnings 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Vf1ylI95Dwux This makes output consistent with a similar warning just few lines above where this flag is checked in the same way. Signed-off-by: softworkz --- libswscale/swscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 75cde31f4f..feef3482d2 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -329,7 +329,7 @@ static int swscale(SwsContext *c, const uint8_t *src[], ) { SwsContext *const ctx = c->parent ? c->parent : c; int cpu_flags = av_get_cpu_flags(); - if (HAVE_MMXEXT && (cpu_flags & AV_CPU_FLAG_SSE2) && + if (flags & SWS_PRINT_INFO && HAVE_MMXEXT && (cpu_flags & AV_CPU_FLAG_SSE2) && !atomic_exchange_explicit(&ctx->stride_unaligned_warned,1, memory_order_relaxed)) { av_log(c, AV_LOG_WARNING, "Warning: data is not aligned! This can lead to a speed loss\n"); } From patchwork Tue Oct 19 01:38:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3939885ioa; Mon, 18 Oct 2021 18:38:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvX7GWoEoHSPySjPbOe5f9chsVvFwdsfoINrZCUTu2FCSUJk49Y+QDDPAiTnz3I46E0pzX X-Received: by 2002:a50:e085:: with SMTP id f5mr49816545edl.9.1634607511166; Mon, 18 Oct 2021 18:38:31 -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 j4si20758372ejm.726.2021.10.18.18.38.28; Mon, 18 Oct 2021 18:38:31 -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=@hotmail.com header.s=selector1 header.b=repegcmz; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E025B68A8A1; Tue, 19 Oct 2021 04:38:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10olkn2094.outbound.protection.outlook.com [40.92.42.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1372C68A133 for ; Tue, 19 Oct 2021 04:38:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OK84GFEWIw7+ZyJVcSlz7cAmh3XKcDcmF7l4XzoYn4j4HaWgudusvC66E8x2I5LHJWsEcuCVPoLvGApKs8k8vS6xBJm2MuE+Hsk8rTJy7vI9k8dIzMGY1P1X4x1BROjU+MWf9K2f8VGOiySitEaogkRBsuEur1if30Ta/XOLOSIABAsJbPO+u0nJrwgMu1z6nXaWOtdH7/rgwNXqcniXceutdTR3wZUSU5Ha4MpRFj3Y+Cnmk68ONKeNCQ2SumjzLuBEMsCuYlhhly+NOGtgUvge2gMdoAhdpTafjluNrIDufZTK7NTTGZ+lpZBj6lHuKewrVTcJCQjSvnS7kCGTlQ== 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=yPfLMYBAYEMYH49DeXT1P6ipfsf2j8cDgtq4S6eNauI=; b=dl3Oq1LLvtvqRs2HLXmH9VAxTEaqPQGfI46p9yCv0xRJPxLSs0n90Aslhe+SaZs6L2jKrN8LAURpNXZIo6XikcOZ1S5cZ3wWkZYKrSEGfBLxup7FHtS9o5H74idAbyKZOQpz3ne4uOufxw4Pog7hlsMu5cKtuyM0xl3c3G7CvOIr0azEU05lTmD0BKkAfbsg6sTSIaCQIboE0dVXJ0Y+y+TpoS2mCiE+5Qe/M8pun9/GpOuf0Z52HpU2ZzNDotVe/kta9+aNSV9LaVWqqR8wWGwjBHfRgaEc+/97Deg5Mfu3WOU+THdnT98hnXbmduhEGEg451OfXQpg7Up6Ozi8ZA== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yPfLMYBAYEMYH49DeXT1P6ipfsf2j8cDgtq4S6eNauI=; b=repegcmz9B9zkShNnP2A9jRQyppawGJUK8vWRA20hHUsLPqeHr8NNq8ZrtXp+8kpnWJ7O0huO+R2me35I5KD2jM6ceFo84UHnqKMuQy6hYr0PYoSxAFsxDA2sq/+VkP5xQx7VRBxX087hpaC+5eOpv5b6Rj+nX7aeY0Hodg6ZtPsi/FCBlnZLTD88Ajng4ykh5V6s4P5ccGkfoqFrB57ecruvIoystP86HLG16No85VtWQ6kVmBDMbjwaH8H22iuM9ISFjBu0VMz5WS2wHOgvRZ6rcL5uod9S0hRcVQYy5TItdkOq6A4iuDrKibipvlX5fllSnV9pEYXM47VflRoog== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5663.namprd04.prod.outlook.com (2603:10b6:208:a3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Tue, 19 Oct 2021 01:38:14 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4608.018; Tue, 19 Oct 2021 01:38:14 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/1] fftools/ffprobe: print size of attachment streams Thread-Index: AQLzrCXmUCt9NgweuQ4I9hv8iqZW7gFI8tt1 Date: Tue, 19 Oct 2021 01:38:14 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [YrkPrpMs6vk7fKOgqR/944oAC824A4ej] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4f655d79-36c4-4545-4d63-08d992a11e5a x-ms-traffictypediagnostic: MN2PR04MB5663: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Wi2kaBuQI+2fp9Hy8PvQKzoak3zQ8L/usryBbwC4pHY8zetAA3jO1hCimpKmBBShGwYxpw39euVWDmB/i1royXk3YeZ1Zg4yBrhmkp9Ja9VI8Ynl4KSt3Ts3RKt6hkW58unSHxN6xg71AqxdK8JFUGtjCdmyGZ7T/R66CDxslcK/sSN2/sqGDM/xWWHDb2xkbVzmqhfky0+Bt5hS1prJ3+rCZlhSK80CfQQfIAizG+WLMVEauamQeFrj2SIZiZ1DA2rcsk7IRpZOy6HU6fdhbsiUtqPmabyV3mVu1GsuSq7aL+5ptnUmL/dvHOYEJjHbp7oG+drDSwVKJZzrbyy+rMtJ97pjjdh6xuHJ4MGGX7nP3cKl1OsZyP6kpxQdoy/KOtZQQW95VGKanRsfZ8MA9rOSZxnOs7B6hL6K2mnA5xm02S13q+6HwNW4wH/zms4Xp4FKWO+rIptHr9HvFSgmPE6wJ2DdJpCRyR9V96dCQyu3DnDLkzhABmNGzNPcAsEiKkrs06K9+Kdkgp0SiKfTAVmV6OwvhDksDQYEvsjPGMw= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: gnKXZ6iifoYkX7LbjtUir2NXHsulDsncF2NbV6IMGOSXymsA+nAkL5Qv3zC59D2uWsrs90UCZVOwa73OMrzO6GtTb2htOTf4xJUOqa/465qPRDydYvynn5Frq4UjSYsvd5WhA8SdEoL3odr/ZgNKPw== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 4f655d79-36c4-4545-4d63-08d992a11e5a X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Oct 2021 01:38:14.4721 (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: MN2PR04MB5663 Subject: [FFmpeg-devel] [PATCH 1/1] fftools/ffprobe: print size of attachment streams 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xGlrSbQYIdrE Signed-off-by: softworkz --- doc/ffprobe.xsd | 3 +++ fftools/ffprobe.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index b65e54dbef..d0cddd6130 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -258,6 +258,9 @@ + + + diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 90e895bbf9..8a08bb51af 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2727,6 +2727,10 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id else print_str_opt("height", "N/A"); break; + + case AVMEDIA_TYPE_ATTACHMENT: + if (par->extradata_size) + print_int("attachment_size", par->extradata_size); } if (dec_ctx && dec_ctx->codec && dec_ctx->codec->priv_class && show_private_data) {