From patchwork Sat Mar 2 19:37:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46707 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2004967pzb; Sat, 2 Mar 2024 11:36:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW22BXMHqPol6Mag1+Ef6IjbNF6BEAFrhI5N0w03JsmSmtZEmc8m3p51ZNKxioxHwy85DNlkzNdrFVP3nQhqOEKfG4TNlz1KxEtKw== X-Google-Smtp-Source: AGHT+IHaoktg9jcWpKWWf0YcdwXmoTeco0QpFT3bpvXSAW548Sc/H0N1KfAnJcC2FnQyEOX6X2He X-Received: by 2002:a2e:960c:0:b0:2d3:1503:fc37 with SMTP id v12-20020a2e960c000000b002d31503fc37mr3930864ljh.33.1709408177368; Sat, 02 Mar 2024 11:36:17 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q24-20020a056402033800b0056619c87387si2588280edw.608.2024.03.02.11.36.16; Sat, 02 Mar 2024 11:36:17 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=UH50oUtt; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AC8268D2F2; Sat, 2 Mar 2024 21:36:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2057.outbound.protection.outlook.com [40.92.73.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6B4168D244 for ; Sat, 2 Mar 2024 21:36:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nybz7hlhtetTzwlJI5tJ4+4PmmEteoUSSP0sL5YqkdjOt7NXEqfsyNJtb+t83gFSe+oNMVT6ZYcHJ606w5s5Sbt6OXiITBJONiNghtjTinIf3noSaqB/aRyx+8XDOemz5C1uGFB6rRTwas1OK8kVYOMGVdH6TPc9yFKiEqgxboooikAvMufpsk+mWhQbXzul8ayqOz1LM3IDCoARBjE0Qmecwivku0dLRFS/LVFYLsWZ0w1Z6Jnht6Q/tldIfQXtnd5KByAceoFKQuSLWAkJonMDk3IIiQoJy6dC2HsBBmbquW/s0XQX5N+nPu6m6nKjgwObb2K4uMY6Twbnxj4h5Q== 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=fJlvfrXD53/UysK43CPUoInOC3MPs+otSVQjmdoAThA=; b=ZQgF8HVCb8g+HpOSWx/XOelKdCffhoU4CH30YjXrRUryAsNh1KGRHNBLT/AF0jztVtXGo8lf/Yzc3K+TnyhB1q16PRHOiTpuSnJl59zJ8H8A9WqqN4/PunwFwS31/6Vt10S70duP7jwoKD/P13xE8aCrq8sulxGrdp5pDeYsPK01yz2YoDHfLUA091M+xu6Tkjn5oJJy1wM4yLmtGhUH8SJBtRtrapMQk99Bwldxtpb6Q3EVRqhKUIzpgAM2Tk+K0rvL6/G9yxaXj0Gh9j/XC2OdwgaMKI8vTtTZGub57mE+a4C5iQC0vKpcotL/StEPHyzrT6KbQ4/d5IwzOQwqdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fJlvfrXD53/UysK43CPUoInOC3MPs+otSVQjmdoAThA=; b=UH50oUttKsQRs7UGsNUkGnCv5rdGVYH/ezZjAjgoKlwcPd+abNm5gWGSlQfE/wH9zD4Kjf6bVDOpC2qdMaiUtBWxtZCDe+FKnnQjwXjaGxhB6pFNxxQJztZVBda6u+2tVuOCIH11dzzQhpcN/0OaeEWmKDTjXEBAkCFl9rFw0z47cCnDbWcWV8dDaAGmhs60uyAVKKVtpznIAAS1f/4tryZHBuN0Ajc+xakbYFCkIz5UMpqfnAAcZcpzdJesbLZn+RIaiHyAg+A282PhDjChQw1ZQbCcdp7Jd2ssJaTFftfcKCkVszWCVBkwmiX+imcSvCzOWiRVGNjna4sHperPdw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB9P250MB0425.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:335::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.32; Sat, 2 Mar 2024 19:36:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Sat, 2 Mar 2024 19:36:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Mar 2024 20:37:56 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [IQIff563PmVWPJ/nmTNrSylmu1ShCzTw] X-ClientProxiedBy: ZR0P278CA0012.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240302193756.47545-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB9P250MB0425:EE_ X-MS-Office365-Filtering-Correlation-Id: 80614795-765e-4226-f37b-08dc3aefff8c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: quKEDqPBL/Lm6KZbZd6tI7SVG/uUy3UT4AK9WIB79SM/JYHVloRwGitQVY/dY0+M2NNIaxhbTYiGxTfaMBOgZtWNU2xHYZID0SFspFD1UqLcB1Wi9XjMfLi6tPYAeclIb/DfILG5DaLcDl+v6dSpHkDdDnUaJv7Zh8FgL+AV1tOOSDsXeuC17Ja+qHSBPsbpEs6u+BKjy682bptPYDZCH/aL/Zxh6PKCZ2rV5fwtGjIEG1EnwRe1f+7slREzlPFSJeZHYFTYX5lBXC9cxEnPUj1ncDiPrZwZlok6q0nSZoncZoqA4XXsYZ9oov+9Z2kf/wEbLgnjjgxq61h8xRO7yy9APWq7+Z3V6BFVcK5D2Lv4zbLVZjPuy6NmryBpzi4xo1GxBhn8NxRIMPnL19KcOoPxbkdOEOBsHIxIoU9Fl6zVROvqVC0WpqRY5yz29dnRY1lboDwVqV1+Emi3hORYkiMQNzTPeACXH0G3W/N8Taw5NN7H+f9ml3ZD7UxEMb25XL7YEHbefzTZEj47KG4JkeErzxo3e7cecn3E7PbI8nohk2NbV351uU44RLsaM6GbKY1/cnVlPrY8mIueTittsubZDxRLFHiZ/0NYK64GnMiMAPlQJvqFk2/DowVtsovu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XERFDWYchXDYou67D7vHDreRW5qMAEzo6NOPLuNQpFC42+bSygCvxXf+Ol575+aFuNjCCATj8NTMnTktH88oI1n2e/Swc7GopBM9FtQlUlOwbSRtZ+EhHcnHets8DlhQ5Kvl89G8Vc70xY1tXqd6SSBahHyfLTvOj1SoyRixY6Ey2paB2/2Zz7/hOnjM7g1dZpuR48DL5YjB75i1LtrUZF/rOpS/LovYa/rZDGMlOLJ1kfv1NEeaIVU9Rq+nmBoejetLWIRv7TREtlR8eGCCS0pdyhlSOKDq8kSH/rsh3WFC6yBgO1Gv4eVBVu2K1Y5mjkRSoXPel4HZyyDx7V5sOG22NhaH9fIjzy0umJl6217Ui7HSrQiFRczfsPQU0fTHJYAMrDMxbLOmpiDxMHjeP6ND+ZpcoEq6o5TXT0ONjvsFpHM842uGZj78T+Bs2+V2FAyBJt5WumKdTw2VK3L9Vb9yg2uSD4FY8nXvWwYr4i8XSR7g/ULyPaouVIqGhaYUrLXOfM2JmsUBe9u9yhAx860xED203kej20PDVykGvQY2YqBxBe4Qm8qtqajp0514NHKl8/rHB0fvR69Tz0fcZKMajxShHChoOWSY/0yxsXEzJ3NGndpSgcZ5WMutEzF9hWDOM7+MbzPMcbKiLgo5Kscj1e9ZjlfXqoCbIKuHMU5OlY1cAYpkDRIqpoOTwHilFUtKir68/FxOMhNSwH2DyHrEzo0p8cGgD9jaxpplDCbqxCLVLLqCCYJcepE2cdhWI0m8b37nrvF/5D+zVaNpxRPo/XKbSeJo3jRNBxhZnZ9v1xhb7SIMGRpCfXCHFspojLoi0bFIWp9Mhg3QQyXEOS/KsUizO+B9n5K7F6hJxKgN7SHXkzYAYQvVU7UEx+S+CcD/Fd7MENwHZc9/TDxDH1emdzesfF68V6ufEQqXFE2PyjUdDqLIcRPs8bzeJ3vG4IihzF/EEPDJddOkQyxVcJd0Eh/1Lc3adolPk4JO6Ok5x4dTNKNhPWylX/C1TLrLqZ2lRLlvHuz8OQ3VYZ2WT5n1oHEOroMXfEjej7ygI9HC5KBmQuhqnVzyUClStUxTz04FTOIRyAbHqG/oIkL1nLdf1lcxwKqfP+wCL0WpPtMNVgt/lnT4g1rsmHxG7FILg2Og7o2kFxw5y6z3HPgGutEGw/JGJ2ovzXv6HRECTg5/6piGHzNny2Q0oYOrVqBmyZI/fenVCJg02sII42UBWTCX4AAq6cqjONMoaEN0DN7vplW13gjfGaW3Am+TGO7dSaWqvOicFOsh9vjSvVLOZw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80614795-765e-4226-f37b-08dc3aefff8c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2024 19:36:04.0516 (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: DB9P250MB0425 Subject: [FFmpeg-devel] [PATCH] fftools/ffprobe: Print dispositions generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RI3tAllKjOtx Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index ea225f14ab..ac6b92f5d6 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3039,6 +3039,18 @@ static int read_packets(WriterContext *w, InputFile *ifile) return ret; } +static void print_dispositions(WriterContext *w, uint32_t disposition, SectionID section_id) +{ + writer_print_section_header(w, NULL, section_id); + for (int i = 0; i < sizeof(disposition) * CHAR_BIT; i++) { + const char *disposition_str = av_disposition_to_string(1U << i); + + if (disposition_str) + print_int(disposition_str, !!(disposition & (1U << i))); + } + writer_print_section_footer(w); +} + static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx, InputStream *ist, int in_program) { AVStream *stream = ist->st; @@ -3215,31 +3227,10 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id } /* Print disposition information */ -#define PRINT_DISPOSITION(flagname, name) do { \ - print_int(name, !!(stream->disposition & AV_DISPOSITION_##flagname)); \ - } while (0) - if (do_show_stream_disposition) { - writer_print_section_header(w, NULL, in_program ? SECTION_ID_PROGRAM_STREAM_DISPOSITION : SECTION_ID_STREAM_DISPOSITION); - PRINT_DISPOSITION(DEFAULT, "default"); - PRINT_DISPOSITION(DUB, "dub"); - PRINT_DISPOSITION(ORIGINAL, "original"); - PRINT_DISPOSITION(COMMENT, "comment"); - PRINT_DISPOSITION(LYRICS, "lyrics"); - PRINT_DISPOSITION(KARAOKE, "karaoke"); - PRINT_DISPOSITION(FORCED, "forced"); - PRINT_DISPOSITION(HEARING_IMPAIRED, "hearing_impaired"); - PRINT_DISPOSITION(VISUAL_IMPAIRED, "visual_impaired"); - PRINT_DISPOSITION(CLEAN_EFFECTS, "clean_effects"); - PRINT_DISPOSITION(ATTACHED_PIC, "attached_pic"); - PRINT_DISPOSITION(TIMED_THUMBNAILS, "timed_thumbnails"); - PRINT_DISPOSITION(NON_DIEGETIC, "non_diegetic"); - PRINT_DISPOSITION(CAPTIONS, "captions"); - PRINT_DISPOSITION(DESCRIPTIONS, "descriptions"); - PRINT_DISPOSITION(METADATA, "metadata"); - PRINT_DISPOSITION(DEPENDENT, "dependent"); - PRINT_DISPOSITION(STILL_IMAGE, "still_image"); - writer_print_section_footer(w); + print_dispositions(w, stream->disposition, + in_program ? SECTION_ID_PROGRAM_STREAM_DISPOSITION + : SECTION_ID_STREAM_DISPOSITION); } if (do_show_stream_tags)