From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 5A24A472BE for ; Fri, 27 Jun 2025 08:24:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id F137668D057; Fri, 27 Jun 2025 11:24:05 +0300 (EEST) Date: Fri, 27 Jun 2025 10:23:56 +0200 To: ffmpeg-devel@ffmpeg.org MIME-Version: 1.0 Message-ID: List-Id: FFmpeg development discussions and patches List-Post: From: Maryla Ustarroz-Calonge via ffmpeg-devel Precedence: list Cc: Maryla Ustarroz-Calonge X-Mailman-Version: 2.1.29 X-BeenThere: ffmpeg-devel@ffmpeg.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: FFmpeg development discussions and patches List-Help: Subject: [FFmpeg-devel] [PATCH v2] ffprobe: add -codec: option Content-Type: multipart/mixed; boundary="===============0182058272718467107==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============0182058272718467107== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: <3H1VeaAYKDIw2q7E1qw44w1u.s42vv25uw-tuBu1vv25uw.47w@flex--maryla.bounces.google.com> X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 0576D68C1A0 for ; Fri, 27 Jun 2025 11:23:59 +0300 (EEST) Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-450df53d461so13839235e9.1 for ; Fri, 27 Jun 2025 01:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751012639; x=1751617439; darn=ffmpeg.org; h=to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=4tMm72AFua96BrbAdO9fpWxoAicMHMypbAyMOxgmsns=; b=eLaMlcz5xf0GTuT2DR/M4Cw7nicrCGZdMcdD2uKpEINr3//fRJSiHlBUjCQEOnQKM6 suppGq8wbCMgC1xifLZPqqGA+BHe1oiBlFoez2J3XAcB5LQuwRemmINIAGfK3zcMFnP7 pfINzSavxvz5vOkb2pvnxmuNdHB3UzTx1wMN517zoqDulWkc3/Wge+Go1gQzoUbTxYNV t0udPhxEy5JL3uH034Dd5oZ+muNPSNt/8Q5P0mthG7+/KmrrUeLjF8zJvvVaMT0OEyCs lEqKHv43i+kBGo97Bn1j4qLneZ9FNqRXJ0dMrDOZ7nSt7rKgOUbEs13x7pvZI45QLVZm QbSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751012639; x=1751617439; h=to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4tMm72AFua96BrbAdO9fpWxoAicMHMypbAyMOxgmsns=; b=o6dZcztpRlH+6N9Njgm5GWejIsU83cX+HZCAxBMhbc0KmLaZwHehABjxu0pD4KwTiP RIJghhdMRqJl+4l1Vl6fk14bg4iRJFdTSxquYqJRrVm9p05CppZksYObnwCnBPf8Zspz KigYn5Hyme+iMGgVElTTapjJcxzKoXW6WJuE4MvgPFSfwLeRY56UjeiWh2jqRm3YY2JT MXWcNpSFWqXxIwxZNW6Q3TfpI63zYDLaSUtcChj4nRfdrFVAFsaiPi4mlYuu9+v8PsRd 7X6UTxz37IyMtYQ8Kjvu5gbpWzFC55yXTRFjd2py5OU+Htr5BxjZ2G8gdVqGqkxGtbmV ARHg== X-Gm-Message-State: AOJu0Yy48Lx41qiuuSS7wqJpRlMSQHFkWJBEDPGE6gbE69qucFlyoP0j QkWy5UQV+ZZLmto19dEZkqOt6HXuq86HbhHnxQXMOKr+EkBOWRxgkdGTYQqWJrHaYNp4a4F3DyT EdU7LnAXxZjDXfCCo0EHHZuewq/NgplMY0ojYQ63XJeBGG6wjLsNNi/I2gjQ432ZF34UPbhHmnf X/ubal+clKwC5LuXn+mB2ld5zz+iv5yigFU+sflQ== X-Google-Smtp-Source: AGHT+IGad/V82aOmn6K2KldV99YKPUfxAUgE/T5YG7V3mEZVz057wdSJkAc1hddVWOLtyX8esyaqrXEmTH4= X-Received: from wmoq15.prod.google.com ([2002:a05:600c:46cf:b0:453:5e1:c32e]) (user=maryla job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b02:b0:43d:fa59:be39 with SMTP id 5b1f17b1804b1-4538ee82500mr18929305e9.33.1751012639011; Fri, 27 Jun 2025 01:23:59 -0700 (PDT) Date: Fri, 27 Jun 2025 10:23:56 +0200 Mime-Version: 1.0 X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250627082356.2688548-1-maryla@google.com> Subject: [PATCH v2] ffprobe: add -codec: option From: Maryla Ustarroz-Calonge To: ffmpeg-devel@ffmpeg.org Content-Type: text/plain; charset="UTF-8" And -c: variant. Update ffprobe.texi. opt_codec() is mostly copied over from ffplay.c Signed-off-by: Maryla Ustarroz-Calonge --- Changelog | 2 +- doc/ffprobe.texi | 8 ++++ fftools/ffprobe.c | 117 +++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 114 insertions(+), 13 deletions(-) diff --git a/Changelog b/Changelog index 4217449438..ae73611222 100644 --- a/Changelog +++ b/Changelog @@ -18,7 +18,7 @@ version : - APV encoding support through a libopenapv wrapper - VVC decoder supports all content of SCC (Screen Content Coding): IBC (Inter Block Copy), Palette Mode and ACT (Adaptive Color Transform - +- ffprobe -codec option version 7.1: - Raw Captions with Time (RCWT) closed caption demuxer diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 8834df8d35..4ce0c8b583 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -368,6 +368,14 @@ Read @var{input_url}. Write output to @var{output_url}. If not specified, the output is sent to stdout. +@item -c:@var{media_specifier} @var{codec_name} +Force a specific decoder implementation for the stream identified by +@var{media_specifier}, which can assume the values @code{a} (audio), +@code{v} (video), @code{s} (subtitle), and @code{d} (data). + +@item -codec:@var{media_specifier} @var{codec_name} +Alias for -c:@var{media_specifier}. + @end table @c man end diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 1346ed33c5..14ba4d3fb0 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -36,6 +36,7 @@ #include "libavutil/ambient_viewing_environment.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" @@ -130,6 +131,11 @@ static int use_byte_value_binary_prefix = 0; static int use_value_sexagesimal_format = 0; static int show_private_data = 1; +static const char *audio_codec_name = NULL; +static const char *data_codec_name = NULL; +static const char *subtitle_codec_name = NULL; +static const char *video_codec_name = NULL; + #define SHOW_OPTIONAL_FIELDS_AUTO -1 #define SHOW_OPTIONAL_FIELDS_NEVER 0 #define SHOW_OPTIONAL_FIELDS_ALWAYS 1 @@ -2284,6 +2290,64 @@ static void show_error(AVTextFormatContext *tfc, int err) avtext_print_section_footer(tfc); } +static int get_decoder_by_name(const char *codec_name, const AVCodec **codec) +{ + if (codec_name == NULL) + return 0; + + *codec = avcodec_find_decoder_by_name(codec_name); + if (*codec == NULL) { + av_log(NULL, AV_LOG_ERROR, + "No codec could be found with name '%s'\n", codec_name); + return AVERROR(EINVAL); + } + return 0; +} + +static int set_decoders(AVFormatContext *fmt_ctx) +{ + int ret; + ret = get_decoder_by_name(audio_codec_name, &fmt_ctx->audio_codec); + if (ret < 0) return ret; + ret = get_decoder_by_name(data_codec_name, &fmt_ctx->data_codec); + if (ret < 0) return ret; + ret = get_decoder_by_name(subtitle_codec_name, &fmt_ctx->subtitle_codec); + if (ret < 0) return ret; + ret = get_decoder_by_name(video_codec_name, &fmt_ctx->video_codec); + if (ret < 0) return ret; + return 0; +} + +static const AVCodec *get_decoder_for_stream(AVFormatContext *fmt_ctx, AVStream *stream) +{ + const AVCodec *codec = NULL; + switch (stream->codecpar->codec_type) { + case AVMEDIA_TYPE_VIDEO: codec = fmt_ctx->video_codec; break; + case AVMEDIA_TYPE_AUDIO: codec = fmt_ctx->audio_codec; break; + case AVMEDIA_TYPE_SUBTITLE: codec = fmt_ctx->subtitle_codec; break; + case AVMEDIA_TYPE_DATA: codec = fmt_ctx->data_codec; break; + } + + if (codec != NULL) + return codec; + + if (stream->codecpar->codec_id == AV_CODEC_ID_PROBE) { + av_log(NULL, AV_LOG_WARNING, + "Failed to probe codec for input stream %d\n", stream->index); + return NULL; + } + + codec = avcodec_find_decoder(stream->codecpar->codec_id); + if (codec == NULL) { + av_log(NULL, AV_LOG_WARNING, + "Unsupported codec with id %d for input stream %d\n", + stream->codecpar->codec_id, stream->index); + return NULL; + } + + return codec; +} + static int open_input_file(InputFile *ifile, const char *filename, const char *print_filename) { @@ -2296,6 +2360,9 @@ static int open_input_file(InputFile *ifile, const char *filename, if (!fmt_ctx) return AVERROR(ENOMEM); + err = set_decoders(fmt_ctx); + if (err < 0) + return err; if (!av_dict_get(format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE)) { av_dict_set(&format_opts, "scan_all_pmts", "1", AV_DICT_DONT_OVERWRITE); scan_all_pmts_set = 1; @@ -2350,20 +2417,10 @@ static int open_input_file(InputFile *ifile, const char *filename, ist->st = stream; - if (stream->codecpar->codec_id == AV_CODEC_ID_PROBE) { - av_log(NULL, AV_LOG_WARNING, - "Failed to probe codec for input stream %d\n", - stream->index); + codec = get_decoder_for_stream(fmt_ctx, stream); + if (!codec) continue; - } - codec = avcodec_find_decoder(stream->codecpar->codec_id); - if (!codec) { - av_log(NULL, AV_LOG_WARNING, - "Unsupported codec with id %d for input stream %d\n", - stream->codecpar->codec_id, stream->index); - continue; - } { AVDictionary *opts; @@ -2510,6 +2567,10 @@ end: av_freep(&selected_streams); av_freep(&streams_with_closed_captions); av_freep(&streams_with_film_grain); + av_freep(&audio_codec_name); + av_freep(&data_codec_name); + av_freep(&subtitle_codec_name); + av_freep(&video_codec_name); return ret; } @@ -2964,6 +3025,36 @@ static int opt_sections(void *optctx, const char *opt, const char *arg) return 0; } +static int opt_codec(void *optctx, const char *opt, const char *arg) +{ + const char *spec = strchr(opt, ':'); + const char **name; + if (!spec) { + av_log(NULL, AV_LOG_ERROR, + "No media specifier was specified for '%s' in option '%s'. Use -%s: " + "where can be one of: 'a' (audio), 'v' (video), 's' (subtitle), 'd' (data)\n", + arg, opt, opt); + return AVERROR(EINVAL); + } + spec++; + + switch (spec[0]) { + case 'a' : name = &audio_codec_name; break; + case 'd' : name = &data_codec_name; break; + case 's' : name = &subtitle_codec_name; break; + case 'v' : name = &video_codec_name; break; + default: + av_log(NULL, AV_LOG_ERROR, + "Invalid media specifier '%s' in option '%s'. " + "Must be one of: 'a' (audio), 'v' (video), 's' (subtitle), 'd' (data)\n", spec, opt); + return AVERROR(EINVAL); + } + + av_freep(name); + *name = av_strdup(arg); + return *name ? 0 : AVERROR(ENOMEM); +} + static int opt_show_versions(void *optctx, const char *opt, const char *arg) { mark_section_show_entries(SECTION_ID_PROGRAM_VERSION, 1, NULL); @@ -3039,6 +3130,8 @@ static const OptionDef real_options[] = { { "print_filename", OPT_TYPE_FUNC, OPT_FUNC_ARG, {.func_arg = opt_print_filename}, "override the printed input filename", "print_file"}, { "find_stream_info", OPT_TYPE_BOOL, OPT_INPUT | OPT_EXPERT, { &find_stream_info }, "read and decode the streams to fill missing information with heuristics" }, + { "c", OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_codec}, "force decoder", "decoder_name" }, + { "codec", OPT_TYPE_FUNC, OPT_FUNC_ARG, { .func_arg = opt_codec}, "alias for -c (force decoder)", "decoder_name" }, { NULL, }, }; -- 2.50.0.727.gbf7dc18ff4-goog --===============0182058272718467107== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============0182058272718467107==--