From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AAB9348B16 for ; Sun, 3 Mar 2024 14:19:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F95F68D37E; Sun, 3 Mar 2024 16:19:39 +0200 (EET) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3243268D36C for ; Sun, 3 Mar 2024 16:19:33 +0200 (EET) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6e59bbdd8c7so2945697b3a.3 for ; Sun, 03 Mar 2024 06:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709475570; x=1710080370; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=aTHUslFUH+2YybgWqi0HFLfqX06SrhZTx2Veu+V+ML0=; b=ncOnekHAQ8xWk6A0+bdG/hFj8cvdNVyoiugne4y9PePDKHwHQTiK8HlZQKBz4gBJ1b dxeiXrBKKBFFVF4FP+WVltQWw8RPGs+4Ksipa9juM/Gbg8YtH3kiXhQbAymxA0C+xont O37oDJpnImE0E5QvCPOlKD67dc19+SxrY3pMpexa/9cawr4wDojJjNcM1C88nsKk9oqh yJkKM/dDAHWoUDQAUjfOn/SDROpxMurF7YjzcQ0Jab+GKqxVOs9fUcFjQXTAoXOxlQun M6katEkheiLtUgGK4ufk0pat0Y1AB0Wae/H70R6564BSX7v8uR6qyysMYqKqweW1a9fI 4Hmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709475570; x=1710080370; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aTHUslFUH+2YybgWqi0HFLfqX06SrhZTx2Veu+V+ML0=; b=uDTauEyE5JR9KmtYeqCtn4ETYzDBE3RRygWMkQSp0MPk9wwSH6AcHwD9wLTWbkH9r0 g2rcRsO/zEk/3drLkkf2DVpEjfon300YyN2Ts/Hlue9w1md1CeHmAYkax5omik4FsHfz e9il4lcb3NmycTsTz2K0hdZG6hz5E/6kilKIJSSfKvIOo/b/07bqjsOjPq0L5Xrz6SU3 2TTT64T7+cJbiE90I6TEoMJAFwuy2n8/05yeKbGiNvKkWWmFETp3WysYOrINPdCiWeCT 1ynKyfCBhzLp7fieuZgJ8HybDuj0ZlDIyDn7hcHuoY3vDeHl2//Y8dxlCO1e+8J6mNw9 3eFA== X-Gm-Message-State: AOJu0YwhmMvspc/g3fL/o88aX2/iD+DalRABd4Y/CSURk9veuJOdvz3k L2eFAuL+J1UYa/SNQqn1u0EPqZ3GucpVrvI96Obo7nnxQidkC3lxI6GVy4kA X-Google-Smtp-Source: AGHT+IH6IKnJP0hbfqaz3XAT9xSS+1ha6nVI4CcJismbZH15u8xQF+giEet2xGUaqWC/gWMUlMDAlg== X-Received: by 2002:a05:6a00:9084:b0:6e5:dadd:6e11 with SMTP id jo4-20020a056a00908400b006e5dadd6e11mr7919668pfb.33.1709475570294; Sun, 03 Mar 2024 06:19:30 -0800 (PST) Received: from [192.168.0.14] ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id t26-20020a62d15a000000b006e04c3b3b5asm6190931pfl.175.2024.03.03.06.19.29 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 03 Mar 2024 06:19:29 -0800 (PST) Message-ID: <62312f77-1ee2-40b5-b95a-e7f55c78593b@gmail.com> Date: Sun, 3 Mar 2024 11:19:37 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer In-Reply-To: Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/2/2024 4:37 PM, Andreas Rheinhardt wrote: > 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) LGTM. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".