From patchwork Sat Feb 11 07:44:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1975143pzk; Fri, 10 Feb 2023 23:44:54 -0800 (PST) X-Google-Smtp-Source: AK7set8rBYklmdU6RWiPfngI5eSBKhI/19NN8Ce6qz7wp7q7Ugo0wmBMa0Z3i1RT5RrdMIvbVY/P X-Received: by 2002:a17:906:fcb4:b0:881:9531:35a0 with SMTP id qw20-20020a170906fcb400b00881953135a0mr17769035ejb.73.1676101494725; Fri, 10 Feb 2023 23:44:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676101494; cv=none; d=google.com; s=arc-20160816; b=T3OtI3pJGD7h5itryzZv+og4h5SsBe9+aoaKEzxEHhzU1my/eEZoJkI7Wk2LridfRg V1bW5qNj7dUyUxa438AC38q/mvYuFA7OVCrmIrzTmxShPs2YEbRuo2aQZWf4PpmQErlS tP0JhhC5IBZOj8/sSUjfCvkaX2pyyWWETScGW0GoZgPwe4xMhNgxiQN/60afZ8xMzfgg y2mldhdLiuxClEsJmoAX2I8dRalU+HGtAcRDoQmHoj/W3Af57qvmBpCJunaPkcFLHAsq 0/qzLy08uXIlmWfRDHeUTVL2athvx8JEfx/s+xD2I8oNN9UJcsj+ht/Ip1BntuU7tbTT psWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=wEn5HoMEt5OpzGTDkvi+/Med5g9k5oIRWn4GpcxgN6g=; b=YYrQpFGq3RtWj15R1B9vqyR6XS4/CIFnS0ZD2Mi9fV7aMYJ89xuupTGx0Nte6sJ9H8 p6At6/MQvYFEDmY0J0GC0qSRmsVg+UQCsVEyz4iBRS5AwAP/Mq4Zs46s/pHkbJ7MqQqv M8i+gc9xwiOc+GVDF0aYp1J5rVFsivO4sB0RuzCSqfhQColOyT0vyYIN51IBYhuLSxJr fc7TLuDfmRplE7I/iGo+cHQLaYBfUp4AR2MCqJB/tALsmaJrfZq1UaW24W0rtW8e0UKl FgrlpGYqLcDepNSY4UDumgBId1dsfezoFVeDBk5W104gOBioVRL4foPbvBYq/9bHjbWC gvoQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v9-20020a17090651c900b0088e467b39f7si8867459ejk.160.2023.02.10.23.44.54; Fri, 10 Feb 2023 23:44:54 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 136E168BDD0; Sat, 11 Feb 2023 09:44:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5BE468B611 for ; Sat, 11 Feb 2023 09:44:26 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id AA8052404EE for ; Sat, 11 Feb 2023 08:44:26 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ld84ARThhC-Q for ; Sat, 11 Feb 2023 08:44:25 +0100 (CET) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id DE8DB2404EC for ; Sat, 11 Feb 2023 08:44:24 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8A95C3A029F for ; Sat, 11 Feb 2023 08:44:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Feb 2023 08:44:08 +0100 Message-Id: <20230211074412.29495-1-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] fftools/ffmpeg_demux: add an AVClass to Demuxer/InputFile 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: Ok47vcX2JYBA Use it for logging. This makes log messages related to this input file more consistent. --- fftools/ffmpeg.h | 2 + fftools/ffmpeg_demux.c | 106 ++++++++++++++++++++++++++--------------- 2 files changed, 69 insertions(+), 39 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index f1412f6446..c657f55911 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -448,6 +448,8 @@ typedef struct LastFrameDuration { } LastFrameDuration; typedef struct InputFile { + const AVClass *class; + int index; AVFormatContext *ctx; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index ffece60720..9f5d8fec24 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -55,6 +55,9 @@ static const char *const opt_name_display_vflips[] = {"display_vflip" typedef struct Demuxer { InputFile f; + // name used for logging + char log_name[32]; + /* number of times input stream should be looped */ int loop; /* actual duration of the longest stream in a file at the moment when @@ -91,11 +94,10 @@ static void report_new_stream(Demuxer *d, const AVPacket *pkt) if (pkt->stream_index < d->nb_streams_warn) return; - av_log(NULL, AV_LOG_WARNING, - "New %s stream %d:%d at pos:%"PRId64" and DTS:%ss\n", + av_log(d, AV_LOG_WARNING, + "New %s stream with index %d at pos:%"PRId64" and DTS:%ss\n", av_get_media_type_string(st->codecpar->codec_type), - d->f.index, pkt->stream_index, - pkt->pos, av_ts2timestr(pkt->dts, &st->time_base)); + pkt->stream_index, pkt->pos, av_ts2timestr(pkt->dts, &st->time_base)); d->nb_streams_warn = pkt->stream_index + 1; } @@ -273,10 +275,10 @@ static void *input_thread(void *arg) } if (ret == AVERROR_EOF) - av_log(NULL, AV_LOG_VERBOSE, "EOF in input file %d\n", f->index); + av_log(d, AV_LOG_VERBOSE, "EOF while reading input\n"); else - av_log(NULL, AV_LOG_ERROR, "Error demuxing input file %d: %s\n", - f->index, av_err2str(ret)); + av_log(d, AV_LOG_ERROR, "Error during demuxing: %s\n", + av_err2str(ret)); break; } @@ -295,9 +297,9 @@ static void *input_thread(void *arg) } if (pkt->flags & AV_PKT_FLAG_CORRUPT) { - av_log(NULL, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, - "%s: corrupt input packet in stream %d\n", - f->ctx->url, pkt->stream_index); + av_log(d, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, + "corrupt input packet in stream %d\n", + pkt->stream_index); if (exit_on_error) { av_packet_unref(pkt); ret = AVERROR_INVALIDDATA; @@ -339,7 +341,7 @@ finish: av_packet_free(&pkt); - av_log(NULL, AV_LOG_VERBOSE, "Terminating demuxer thread %d\n", f->index); + av_log(d, AV_LOG_VERBOSE, "Terminating demuxer thread\n"); return NULL; } @@ -396,7 +398,7 @@ static int thread_start(Demuxer *d) } if ((ret = pthread_create(&d->thread, NULL, input_thread, d))) { - av_log(NULL, AV_LOG_ERROR, "pthread_create failed: %s. Try to increase `ulimit -v` or decrease `ulimit -s`.\n", strerror(ret)); + av_log(d, AV_LOG_ERROR, "pthread_create failed: %s. Try to increase `ulimit -v` or decrease `ulimit -s`.\n", strerror(ret)); ret = AVERROR(ret); goto fail; } @@ -839,6 +841,32 @@ static void dump_attachment(AVStream *st, const char *filename) avio_close(out); } +static const char *input_file_item_name(void *obj) +{ + const Demuxer *d = obj; + + return d->log_name; +} + +static const AVClass input_file_class = { + .class_name = "InputFile", + .version = LIBAVUTIL_VERSION_INT, + .item_name = input_file_item_name, + .category = AV_CLASS_CATEGORY_DEMUXER, +}; + +static Demuxer *demux_alloc(void) +{ + Demuxer *d = allocate_array_elem(&input_files, sizeof(*d), &nb_input_files); + + d->f.class = &input_file_class; + d->f.index = nb_input_files - 1; + + snprintf(d->log_name, sizeof(d->log_name), "in#%d", d->f.index); + + return d; +} + int ifile_open(const OptionsContext *o, const char *filename) { Demuxer *d; @@ -860,15 +888,18 @@ int ifile_open(const OptionsContext *o, const char *filename) int64_t stop_time = o->stop_time; int64_t recording_time = o->recording_time; + d = demux_alloc(); + f = &d->f; + if (stop_time != INT64_MAX && recording_time != INT64_MAX) { stop_time = INT64_MAX; - av_log(NULL, AV_LOG_WARNING, "-t and -to cannot be used together; using -t.\n"); + av_log(d, AV_LOG_WARNING, "-t and -to cannot be used together; using -t.\n"); } if (stop_time != INT64_MAX && recording_time == INT64_MAX) { int64_t start = start_time == AV_NOPTS_VALUE ? 0 : start_time; if (stop_time <= start) { - av_log(NULL, AV_LOG_ERROR, "-to value smaller than -ss; aborting.\n"); + av_log(d, AV_LOG_ERROR, "-to value smaller than -ss; aborting.\n"); exit_program(1); } else { recording_time = stop_time - start; @@ -877,7 +908,7 @@ int ifile_open(const OptionsContext *o, const char *filename) if (o->format) { if (!(file_iformat = av_find_input_format(o->format))) { - av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format); + av_log(d, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format); exit_program(1); } } @@ -964,9 +995,13 @@ int ifile_open(const OptionsContext *o, const char *filename) if (err < 0) { print_error(filename, err); if (err == AVERROR_PROTOCOL_NOT_FOUND) - av_log(NULL, AV_LOG_ERROR, "Did you mean file:%s?\n", filename); + av_log(d, AV_LOG_ERROR, "Did you mean file:%s?\n", filename); exit_program(1); } + + av_strlcat(d->log_name, "/", sizeof(d->log_name)); + av_strlcat(d->log_name, ic->iformat->name, sizeof(d->log_name)); + if (scan_all_pmts_set) av_dict_set(&o->g->format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE); remove_avoptions(&o->g->format_opts, o->g->codec_opts); @@ -989,7 +1024,7 @@ int ifile_open(const OptionsContext *o, const char *filename) av_freep(&opts); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename); + av_log(d, AV_LOG_FATAL, "could not find codec parameters\n"); if (ic->nb_streams == 0) { avformat_close_input(&ic); exit_program(1); @@ -998,23 +1033,23 @@ int ifile_open(const OptionsContext *o, const char *filename) } if (start_time != AV_NOPTS_VALUE && start_time_eof != AV_NOPTS_VALUE) { - av_log(NULL, AV_LOG_WARNING, "Cannot use -ss and -sseof both, using -ss for %s\n", filename); + av_log(d, AV_LOG_WARNING, "Cannot use -ss and -sseof both, using -ss\n"); start_time_eof = AV_NOPTS_VALUE; } if (start_time_eof != AV_NOPTS_VALUE) { if (start_time_eof >= 0) { - av_log(NULL, AV_LOG_ERROR, "-sseof value must be negative; aborting\n"); + av_log(d, AV_LOG_ERROR, "-sseof value must be negative; aborting\n"); exit_program(1); } if (ic->duration > 0) { start_time = start_time_eof + ic->duration; if (start_time < 0) { - av_log(NULL, AV_LOG_WARNING, "-sseof value seeks to before start of file %s; ignored\n", filename); + av_log(d, AV_LOG_WARNING, "-sseof value seeks to before start of file; ignored\n"); start_time = AV_NOPTS_VALUE; } } else - av_log(NULL, AV_LOG_WARNING, "Cannot use -sseof, duration of %s not known\n", filename); + av_log(d, AV_LOG_WARNING, "Cannot use -sseof, file duration not known\n"); } timestamp = (start_time == AV_NOPTS_VALUE) ? 0 : start_time; /* add the stream start time */ @@ -1040,16 +1075,12 @@ int ifile_open(const OptionsContext *o, const char *filename) } ret = avformat_seek_file(ic, -1, INT64_MIN, seek_timestamp, seek_timestamp, 0); if (ret < 0) { - av_log(NULL, AV_LOG_WARNING, "%s: could not seek to position %0.3f\n", - filename, (double)timestamp / AV_TIME_BASE); + av_log(d, AV_LOG_WARNING, "could not seek to position %0.3f\n", + (double)timestamp / AV_TIME_BASE); } } - d = allocate_array_elem(&input_files, sizeof(*d), &nb_input_files); - f = &d->f; - f->ctx = ic; - f->index = nb_input_files - 1; f->start_time = start_time; f->recording_time = recording_time; f->input_sync_ref = o->input_sync_ref; @@ -1063,11 +1094,11 @@ int ifile_open(const OptionsContext *o, const char *filename) f->readrate = o->readrate ? o->readrate : 0.0; if (f->readrate < 0.0f) { - av_log(NULL, AV_LOG_ERROR, "Option -readrate for Input #%d is %0.3f; it must be non-negative.\n", f->index, f->readrate); + av_log(d, AV_LOG_ERROR, "Option -readrate is %0.3f; it must be non-negative.\n", f->readrate); exit_program(1); } if (f->readrate && f->rate_emu) { - av_log(NULL, AV_LOG_WARNING, "Both -readrate and -re set for Input #%d. Using -readrate %0.3f.\n", f->index, f->readrate); + av_log(d, AV_LOG_WARNING, "Both -readrate and -re set. Using -readrate %0.3f.\n", f->readrate); f->rate_emu = 0; } @@ -1100,19 +1131,16 @@ int ifile_open(const OptionsContext *o, const char *filename) if (!(option->flags & AV_OPT_FLAG_DECODING_PARAM)) { - av_log(NULL, AV_LOG_ERROR, "Codec AVOption %s (%s) specified for " - "input file #%d (%s) is not a decoding option.\n", e->key, - option->help ? option->help : "", f->index, - filename); + av_log(d, AV_LOG_ERROR, "Codec AVOption %s (%s) is not a decoding " + "option.\n", e->key, option->help ? option->help : ""); exit_program(1); } - av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for " - "input file #%d (%s) has not been used for any stream. The most " - "likely reason is either wrong type (e.g. a video option with " - "no video streams) or that it is a private option of some decoder " - "which was not actually used for any stream.\n", e->key, - option->help ? option->help : "", f->index, filename); + av_log(d, AV_LOG_WARNING, "Codec AVOption %s (%s) has not been used " + "for any stream. The most likely reason is either wrong type " + "(e.g. a video option with no video streams) or that it is a " + "private option of some decoder which was not actually used " + "for any stream.\n", e->key, option->help ? option->help : ""); } av_dict_free(&unused_opts); From patchwork Sat Feb 11 07:44:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40367 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1975212pzk; Fri, 10 Feb 2023 23:45:03 -0800 (PST) X-Google-Smtp-Source: AK7set9q9/ovI70+OtCGlPzCgYNU66az1B4SMWyQxuN2Bwnz4mAH4bcOAguFhMy1GOEtZ8MnFSxs X-Received: by 2002:a17:906:da1b:b0:86d:7c2d:f65b with SMTP id fi27-20020a170906da1b00b0086d7c2df65bmr19443452ejb.27.1676101503618; Fri, 10 Feb 2023 23:45:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676101503; cv=none; d=google.com; s=arc-20160816; b=GycjO4JfNS7NhI+2yGzovffA6Pmk2ptxxYERrjxrCPX3b56HQ0kBkAeAnhDKfkqIAl o1zMe+LqsF7nAgBp6J4D4jSD85x3GWJoDmFsEBnH3bN6QlxApiPl+7lsRcqPJzfKSDAH B1ckqYkER0FW0i7jesyGdlQR5WLJwtyG5KrTHTZnw3LylgXEB7fQfvrbqT8tSrd5aQlt bzmp6LltgiUxTYnji/FVFxOfACBb22UToQFtLFgVAHKfttz9LdX6v+fTPz/60aOGM0sR JFkrC90JeFp1lLKdLfOLvv4Stkuwzy5Yt1q6njI++pcKTxC1Bstno/5kRxMor6VoGEHf 5BXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=ZUFZ22Lzfq5K3wDfm6blW47OK9HCHdax0gpwAT2vWBw=; b=h6RZDp3UTMQholw9m7tmpFCplKpivCYmWPt/p1IOF5FUONS5gIwJuOjuHX2oF7zbph rxGR69b8kBMGplnETuNbyXHtc2HbnWUl7LoRtmyfsQGEE21hyp72Nv7b+fKe51mbig9A tO8h3B7nvoezb7hgiS3sUkXGOWcBO2IyNqfxwfkFpsxIclcmQo0xQsH9UHnMA7RKsd3/ sw1H0wPgx6wNo79buu8b2ZqwWGSBFuev0d3omaO5E8kNUyUPLs7bjcBWSYCLrev9dDhz W8xUXOR4TYUjHiRCyc67PZp8n2c40kP06SuVB07gUYoNGe/a/7WVXB/bvlG2/OQZmKFT 677g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u23-20020a170906109700b0087bda7465bcsi8953493eju.844.2023.02.10.23.45.03; Fri, 10 Feb 2023 23:45:03 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2352968B611; Sat, 11 Feb 2023 09:44:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F046F68BD5F for ; Sat, 11 Feb 2023 09:44:27 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id AB04D2404EC for ; Sat, 11 Feb 2023 08:44:27 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vBG0jsMMoKtB for ; Sat, 11 Feb 2023 08:44:26 +0100 (CET) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E5454240591 for ; Sat, 11 Feb 2023 08:44:24 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 9846A3A02ED for ; Sat, 11 Feb 2023 08:44:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Feb 2023 08:44:09 +0100 Message-Id: <20230211074412.29495-2-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211074412.29495-1-anton@khirnov.net> References: <20230211074412.29495-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] fftools/ffmpeg_demux: add InputStream private data 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: yfbTULpSXrAL Move {min,max}_pts to it, which is not used outside of ffmpeg_demux. --- fftools/ffmpeg.h | 3 -- fftools/ffmpeg_demux.c | 63 ++++++++++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index c657f55911..2d48a147b8 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -377,9 +377,6 @@ typedef struct InputStream { int64_t filter_in_rescale_delta_last; - int64_t min_pts; /* pts with the smallest value in a current stream */ - int64_t max_pts; /* pts with the higher value in a current stream */ - // when forcing constant input framerate through -r, // this contains the pts that will be given to the next decoded frame int64_t cfr_next_pts; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 9f5d8fec24..b6b6b21271 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -52,6 +52,13 @@ static const char *const opt_name_display_rotations[] = {"display_rotati static const char *const opt_name_display_hflips[] = {"display_hflip", NULL}; static const char *const opt_name_display_vflips[] = {"display_vflip", NULL}; +typedef struct DemuxStream { + InputStream ist; + + int64_t min_pts; /* pts with the smallest value in a current stream */ + int64_t max_pts; /* pts with the higher value in a current stream */ +} DemuxStream; + typedef struct Demuxer { InputFile f; @@ -83,6 +90,11 @@ typedef struct DemuxMsg { int repeat_pict; } DemuxMsg; +static DemuxStream *ds_from_ist(InputStream *ist) +{ + return (DemuxStream*)ist; +} + static Demuxer *demuxer_from_ifile(InputFile *f) { return (Demuxer*)f; @@ -101,20 +113,20 @@ static void report_new_stream(Demuxer *d, const AVPacket *pkt) d->nb_streams_warn = pkt->stream_index + 1; } -static void ifile_duration_update(Demuxer *d, InputStream *ist, +static void ifile_duration_update(Demuxer *d, DemuxStream *ds, int64_t last_duration) { /* the total duration of the stream, max_pts - min_pts is * the duration of the stream without the last frame */ - if (ist->max_pts > ist->min_pts && - ist->max_pts - (uint64_t)ist->min_pts < INT64_MAX - last_duration) - last_duration += ist->max_pts - ist->min_pts; + if (ds->max_pts > ds->min_pts && + ds->max_pts - (uint64_t)ds->min_pts < INT64_MAX - last_duration) + last_duration += ds->max_pts - ds->min_pts; if (!d->duration || av_compare_ts(d->duration, d->time_base, - last_duration, ist->st->time_base) < 0) { + last_duration, ds->ist.st->time_base) < 0) { d->duration = last_duration; - d->time_base = ist->st->time_base; + d->time_base = ds->ist.st->time_base; } } @@ -122,7 +134,6 @@ static int seek_to_start(Demuxer *d) { InputFile *ifile = &d->f; AVFormatContext *is = ifile->ctx; - InputStream *ist; int ret; ret = avformat_seek_file(is, -1, INT64_MIN, is->start_time, is->start_time, 0); @@ -136,19 +147,21 @@ static int seek_to_start(Demuxer *d) int got_durations = 0; while (got_durations < ifile->audio_duration_queue_size) { + DemuxStream *ds; LastFrameDuration dur; ret = av_thread_message_queue_recv(ifile->audio_duration_queue, &dur, 0); if (ret < 0) return ret; got_durations++; - ist = ifile->streams[dur.stream_idx]; - ifile_duration_update(d, ist, dur.duration); + ds = ds_from_ist(ifile->streams[dur.stream_idx]); + ifile_duration_update(d, ds, dur.duration); } } else { for (int i = 0; i < ifile->nb_streams; i++) { int64_t duration = 0; - ist = ifile->streams[i]; + InputStream *ist = ifile->streams[i]; + DemuxStream *ds = ds_from_ist(ist); if (ist->framerate.num) { duration = av_rescale_q(1, av_inv_q(ist->framerate), ist->st->time_base); @@ -158,7 +171,7 @@ static int seek_to_start(Demuxer *d) duration = 1; } - ifile_duration_update(d, ist, duration); + ifile_duration_update(d, ds, duration); } } @@ -172,6 +185,7 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict) { InputFile *ifile = &d->f; InputStream *ist = ifile->streams[pkt->stream_index]; + DemuxStream *ds = ds_from_ist(ist); const int64_t start_time = ifile->start_time_effective; int64_t duration; @@ -216,8 +230,8 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict) duration = av_rescale_q(d->duration, d->time_base, ist->st->time_base); if (pkt->pts != AV_NOPTS_VALUE) { pkt->pts += duration; - ist->max_pts = FFMAX(pkt->pts, ist->max_pts); - ist->min_pts = FFMIN(pkt->pts, ist->min_pts); + ds->max_pts = FFMAX(pkt->pts, ds->max_pts); + ds->min_pts = FFMIN(pkt->pts, ds->min_pts); } if (pkt->dts != AV_NOPTS_VALUE) @@ -590,6 +604,18 @@ static void add_display_matrix_to_stream(const OptionsContext *o, vflip_set ? vflip : 0); } +static DemuxStream *demux_stream_alloc(Demuxer *d, AVStream *st) +{ + InputFile *f = &d->f; + DemuxStream *ds = allocate_array_elem(&f->streams, sizeof(*ds), + &f->nb_streams); + + ds->ist.st = st; + ds->ist.file_index = f->index; + + return ds; +} + /* Add all the streams from the given input file to the demuxer */ static void add_input_streams(const OptionsContext *o, Demuxer *d) { @@ -600,6 +626,7 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) for (i = 0; i < ic->nb_streams; i++) { AVStream *st = ic->streams[i]; AVCodecParameters *par = st->codecpar; + DemuxStream *ds; InputStream *ist; char *framerate = NULL, *hwaccel_device = NULL; const char *hwaccel = NULL; @@ -611,15 +638,15 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) const AVOption *discard_opt = av_opt_find(&cc, "skip_frame", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ); - ist = ALLOC_ARRAY_ELEM(f->streams, f->nb_streams); - ist->st = st; - ist->file_index = f->index; + ds = demux_stream_alloc(d, st); + ist = &ds->ist; + ist->discard = 1; st->discard = AVDISCARD_ALL; ist->nb_samples = 0; ist->first_dts = AV_NOPTS_VALUE; - ist->min_pts = INT64_MAX; - ist->max_pts = INT64_MIN; + ds->min_pts = INT64_MAX; + ds->max_pts = INT64_MIN; ist->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); From patchwork Sat Feb 11 07:44:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40365 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1975091pzk; Fri, 10 Feb 2023 23:44:46 -0800 (PST) X-Google-Smtp-Source: AK7set/zB3O7CMKZiexnsNuaslcUblO5wGT67agbaNiKagm+tw5+PhlMNlMFJYBg9oZamRRyY5h5 X-Received: by 2002:a17:906:a194:b0:877:a7ec:5ff with SMTP id s20-20020a170906a19400b00877a7ec05ffmr18023447ejy.10.1676101486532; Fri, 10 Feb 2023 23:44:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676101486; cv=none; d=google.com; s=arc-20160816; b=KrASWqYuAcyAALZalrDK/tEQvIkqhpiiyd6/Gnh7Yvi16st1vcxr2g2Ap3aecpfkQY XjzW/SS3YXhKfVI8NznTiB7P/8pSB7QfBxVfAol7wZICppxaIuQGS9+JRocOvHsX37Nv lndc6CaE3s5jQrftwiVQY2mhZWUHtfdhUOEOX5YQ9h+ccuqZNtwTzzwPOfJMcD9wipKB O2HupZayQPqUIfsdlhmk5tDYR5Jd41B2S5xdzLXrvR5EOs2y9dhWBX/CvqECR5dCfqtC vioOYXwHn9bTi9OMeqku4f/42MkeaVGMWzJdQ3ZN4ItzOI0jANY/0QjI+gJGOKgiaxdn i1tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=dB8bQra2Y2W+i1IJRjEFZsVJkdaZIbgT3YMd1B9cKh0=; b=03lU/OZHbhGlxfu/+VRS859qAaAE92gvUxUyb/aT/TpzAMy+VqwrokKLisEFG0IRlz rUGYWGX6ZXU/Z/e30fsCH8XmHYoGiY1Dqg7Qctiq41Fi71j4EO3dCeVkeDx6N2ocvBQV 9CIt3ulZsMRraVI8TDI7pkOG1PKkzw0Ee6sUnluun2aneJKueHSF44B1WCJU2oH3VDNl mAZZRwKdi+3i3caDzHAq4W7i9PXIIFDmmWW9ORenrbSCebg7UjNJgcjuHPwLoAzWzU0l 4Tzu+9r5qOH/inLNk1lCiOZjX3/2SUmeCL+f2IYHb+wq09VvWL5MePDLvodIcAlI+Kvb j2Xw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wg1-20020a1709078f0100b008779b708a5bsi6585394ejc.288.2023.02.10.23.44.46; Fri, 10 Feb 2023 23:44:46 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5D4868BDBC; Sat, 11 Feb 2023 09:44:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA0F168B611 for ; Sat, 11 Feb 2023 09:44:26 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 79AAC2404F5 for ; Sat, 11 Feb 2023 08:44:26 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id fLUTeHM1Xpol for ; Sat, 11 Feb 2023 08:44:24 +0100 (CET) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E084B2404EE for ; Sat, 11 Feb 2023 08:44:24 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A32943A0317 for ; Sat, 11 Feb 2023 08:44:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Feb 2023 08:44:10 +0100 Message-Id: <20230211074412.29495-3-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211074412.29495-1-anton@khirnov.net> References: <20230211074412.29495-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] fftools/ffmpeg_demux: move InputStream.guess_layout_max to stack 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: W+zhfNTm8akG It is only needed while processing the stream in add_input_streams(), no reason to store it in the context. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_demux.c | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 2d48a147b8..66dda45f70 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -388,7 +388,6 @@ typedef struct InputStream { AVDictionary *decoder_opts; AVRational framerate; /* framerate forced with -r */ int top_field_first; - int guess_layout_max; int autorotate; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index b6b6b21271..ac0431233e 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -552,14 +552,14 @@ static const AVCodec *choose_decoder(const OptionsContext *o, AVFormatContext *s } } -static int guess_input_channel_layout(InputStream *ist) +static int guess_input_channel_layout(InputStream *ist, int guess_layout_max) { AVCodecContext *dec = ist->dec_ctx; if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) { char layout_name[256]; - if (dec->ch_layout.nb_channels > ist->guess_layout_max) + if (dec->ch_layout.nb_channels > guess_layout_max) return 0; av_channel_layout_default(&dec->ch_layout, dec->ch_layout.nb_channels); if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) @@ -800,11 +800,12 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) ist->framerate_guessed = av_guess_frame_rate(ic, st, NULL); break; - case AVMEDIA_TYPE_AUDIO: - ist->guess_layout_max = INT_MAX; - MATCH_PER_STREAM_OPT(guess_layout_max, i, ist->guess_layout_max, ic, st); - guess_input_channel_layout(ist); + case AVMEDIA_TYPE_AUDIO: { + int guess_layout_max = INT_MAX; + MATCH_PER_STREAM_OPT(guess_layout_max, i, guess_layout_max, ic, st); + guess_input_channel_layout(ist, guess_layout_max); break; + } case AVMEDIA_TYPE_DATA: case AVMEDIA_TYPE_SUBTITLE: { char *canvas_size = NULL; From patchwork Sat Feb 11 07:44:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1975509pzk; Fri, 10 Feb 2023 23:45:12 -0800 (PST) X-Google-Smtp-Source: AK7set/HHPmRKywxxFl1U5KB4O698eu+/lq38rgexZyeeoJIB/LThVhxs0zAopVg+J1DuS7P66B+ X-Received: by 2002:a17:907:7292:b0:8ae:b008:9b5a with SMTP id dt18-20020a170907729200b008aeb0089b5amr15857459ejc.69.1676101512744; Fri, 10 Feb 2023 23:45:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676101512; cv=none; d=google.com; s=arc-20160816; b=WDl896gbq6JKMHaz0Xy5jqyVe9Lso93UwgZQplet+5vNrush8S32lteqvLUnX50HgG 9xYqmM0DOjQEFEHbVBHMkpjbAV1xyM85Bd0kYWZZKJcdN3fERxVDD7ix7GOpa8h/7BIs 5QWNFdJa/xcXqaHHlt3LPAAR1unEfDPXS0vtAqXhE74xag+JiZCew8K7Gz9LDffzD/xn /m7QUvwOK0COd7cfhPh9mO5Amt7DnVOz8EGOmr6SX9gwZ1E5+kBxp9Kilzi6ahP+JAyL 04vt9I2RZ6STYI3qvvTo40I9Sn3XozZgqF3JyrXck5rjfhC48b+I8YsMrE8eIMftk9xz ++GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=2rfEfGiVmCWrUKovXKdCWEcYXQMn2efmbDYeG/M0HDQ=; b=KnIlKM6jRQopQrtcIcZA0V80dZAVHuzJsrRNxfFlHrx5KumS6C+OaXVY8ajaoEjsDP 27Trw7Fi5DM/cJG6L8gBV2aMcgBPo7kLx5WZPVAM8wiQjdqjwpJJSFxh57miRTuqJwZv sghtbkLP7h1/Zlco8Nv6CyZ65V+edWX+WmL6dbWGz5+jfWfBjOSBEipN4rsRGH8djJGj PLbuComzyUPa8sujI3WrhWJOPcKifw63qsFN3vYDeg26W0lgT3MQVOnZdqg0ljfcRkm0 qZxBr9dkUOVm2mGjPlOwqc/EtSpihcS9nnmDwmVG9d8yyvHMOSla7T0eJBpAr0qp/nZH j1ZQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 15-20020a170906004f00b00880d1517c8esi1288717ejg.221.2023.02.10.23.45.12; Fri, 10 Feb 2023 23:45:12 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1411068BDFA; Sat, 11 Feb 2023 09:44:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B970868BDBB for ; Sat, 11 Feb 2023 09:44:28 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 58FF8240591 for ; Sat, 11 Feb 2023 08:44:28 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id F5Y9UfGfjiJ3 for ; Sat, 11 Feb 2023 08:44:26 +0100 (CET) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E3B8F2404F8 for ; Sat, 11 Feb 2023 08:44:24 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id ADF033A0370 for ; Sat, 11 Feb 2023 08:44:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Feb 2023 08:44:11 +0100 Message-Id: <20230211074412.29495-4-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211074412.29495-1-anton@khirnov.net> References: <20230211074412.29495-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] fftools/ffmpeg_demux: add an AVClass to DemuxStream/InputStream 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: 9PP7qPFqqKh1 Use it for logging. This makes log messages related to this input stream more consistent. --- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_demux.c | 79 ++++++++++++++++++++++++++---------------- 2 files changed, 52 insertions(+), 29 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 66dda45f70..401f424f79 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -333,6 +333,8 @@ typedef struct FilterGraph { } FilterGraph; typedef struct InputStream { + const AVClass *class; + int file_index; AVStream *st; int discard; /* true if stream data should be discarded */ diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index ac0431233e..f2a1391a29 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -55,6 +55,9 @@ static const char *const opt_name_display_vflips[] = {"display_vflip" typedef struct DemuxStream { InputStream ist; + // name used for logging + char log_name[32]; + int64_t min_pts; /* pts with the smallest value in a current stream */ int64_t max_pts; /* pts with the higher value in a current stream */ } DemuxStream; @@ -190,9 +193,8 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict) int64_t duration; if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "demuxer -> ist_index:%d:%d type:%s " + av_log(ist, AV_LOG_INFO, "demuxer -> type:%s " "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s\n", - ifile->index, pkt->stream_index, av_get_media_type_string(ist->st->codecpar->codec_type), av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ist->st->time_base), av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ist->st->time_base), @@ -565,15 +567,15 @@ static int guess_input_channel_layout(InputStream *ist, int guess_layout_max) if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) return 0; av_channel_layout_describe(&dec->ch_layout, layout_name, sizeof(layout_name)); - av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for Input Stream " - "#%d.%d : %s\n", ist->file_index, ist->st->index, layout_name); + av_log(ist, AV_LOG_WARNING, "Guessed Channel Layout: %s\n", layout_name); } return 1; } static void add_display_matrix_to_stream(const OptionsContext *o, - AVFormatContext *ctx, AVStream *st) + AVFormatContext *ctx, InputStream *ist) { + AVStream *st = ist->st; double rotation = DBL_MAX; int hflip = -1, vflip = -1; int hflip_set = 0, vflip_set = 0, rotation_set = 0; @@ -592,7 +594,7 @@ static void add_display_matrix_to_stream(const OptionsContext *o, buf = (int32_t *)av_stream_new_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9); if (!buf) { - av_log(NULL, AV_LOG_FATAL, "Failed to generate a display matrix!\n"); + av_log(ist, AV_LOG_FATAL, "Failed to generate a display matrix!\n"); exit_program(1); } @@ -604,14 +606,34 @@ static void add_display_matrix_to_stream(const OptionsContext *o, vflip_set ? vflip : 0); } +static const char *input_stream_item_name(void *obj) +{ + const DemuxStream *ds = obj; + + return ds->log_name; +} + +static const AVClass input_stream_class = { + .class_name = "InputStream", + .version = LIBAVUTIL_VERSION_INT, + .item_name = input_stream_item_name, + .category = AV_CLASS_CATEGORY_DEMUXER, +}; + static DemuxStream *demux_stream_alloc(Demuxer *d, AVStream *st) { + const char *type_str = av_get_media_type_string(st->codecpar->codec_type); InputFile *f = &d->f; DemuxStream *ds = allocate_array_elem(&f->streams, sizeof(*ds), &f->nb_streams); ds->ist.st = st; ds->ist.file_index = f->index; + ds->ist.class = &input_stream_class; + + snprintf(ds->log_name, sizeof(ds->log_name), "%cist#%d:%d/%s", + type_str ? *type_str : '?', d->f.index, st->index, + avcodec_get_name(st->codecpar->codec_id)); return ds; } @@ -663,20 +685,20 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) } if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { - add_display_matrix_to_stream(o, ic, st); + add_display_matrix_to_stream(o, ic, ist); MATCH_PER_STREAM_OPT(hwaccels, str, hwaccel, ic, st); MATCH_PER_STREAM_OPT(hwaccel_output_formats, str, hwaccel_output_format, ic, st); if (!hwaccel_output_format && hwaccel && !strcmp(hwaccel, "cuvid")) { - av_log(NULL, AV_LOG_WARNING, + av_log(ist, AV_LOG_WARNING, "WARNING: defaulting hwaccel_output_format to cuda for compatibility " "with old commandlines. This behaviour is DEPRECATED and will be removed " "in the future. Please explicitly set \"-hwaccel_output_format cuda\".\n"); ist->hwaccel_output_format = AV_PIX_FMT_CUDA; } else if (!hwaccel_output_format && hwaccel && !strcmp(hwaccel, "qsv")) { - av_log(NULL, AV_LOG_WARNING, + av_log(ist, AV_LOG_WARNING, "WARNING: defaulting hwaccel_output_format to qsv for compatibility " "with old commandlines. This behaviour is DEPRECATED and will be removed " "in the future. Please explicitly set \"-hwaccel_output_format qsv\".\n"); @@ -688,7 +710,7 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) } else if (hwaccel_output_format) { ist->hwaccel_output_format = av_get_pix_fmt(hwaccel_output_format); if (ist->hwaccel_output_format == AV_PIX_FMT_NONE) { - av_log(NULL, AV_LOG_FATAL, "Unrecognised hwaccel output " + av_log(ist, AV_LOG_FATAL, "Unrecognised hwaccel output " "format: %s", hwaccel_output_format); } } else { @@ -712,15 +734,15 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) } if (!ist->hwaccel_id) { - av_log(NULL, AV_LOG_FATAL, "Unrecognized hwaccel: %s.\n", + av_log(ist, AV_LOG_FATAL, "Unrecognized hwaccel: %s.\n", hwaccel); - av_log(NULL, AV_LOG_FATAL, "Supported hwaccels: "); + av_log(ist, AV_LOG_FATAL, "Supported hwaccels: "); type = AV_HWDEVICE_TYPE_NONE; while ((type = av_hwdevice_iterate_types(type)) != AV_HWDEVICE_TYPE_NONE) - av_log(NULL, AV_LOG_FATAL, "%s ", + av_log(ist, AV_LOG_FATAL, "%s ", av_hwdevice_get_type_name(type)); - av_log(NULL, AV_LOG_FATAL, "\n"); + av_log(ist, AV_LOG_FATAL, "\n"); exit_program(1); } } @@ -752,7 +774,7 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) ist->user_set_discard = AVDISCARD_ALL; if (discard_str && av_opt_eval_int(&cc, discard_opt, discard_str, &ist->user_set_discard) < 0) { - av_log(NULL, AV_LOG_ERROR, "Error parsing discard %s.\n", + av_log(ist, AV_LOG_ERROR, "Error parsing discard %s.\n", discard_str); exit_program(1); } @@ -766,7 +788,7 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) ret = avcodec_parameters_to_context(ist->dec_ctx, par); if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Error initializing the decoder context.\n"); + av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); exit_program(1); } @@ -789,7 +811,7 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) MATCH_PER_STREAM_OPT(frame_rates, str, framerate, ic, st); if (framerate && av_parse_video_rate(&ist->framerate, framerate) < 0) { - av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n", + av_log(ist, AV_LOG_ERROR, "Error parsing framerate %s.\n", framerate); exit_program(1); } @@ -813,7 +835,7 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) MATCH_PER_STREAM_OPT(canvas_sizes, str, canvas_size, ic, st); if (canvas_size && av_parse_video_size(&ist->dec_ctx->width, &ist->dec_ctx->height, canvas_size) < 0) { - av_log(NULL, AV_LOG_FATAL, "Invalid canvas size: %s.\n", canvas_size); + av_log(ist, AV_LOG_FATAL, "Invalid canvas size: %s.\n", canvas_size); exit_program(1); } break; @@ -831,35 +853,34 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) ret = avcodec_parameters_from_context(ist->par, ist->dec_ctx); if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Error initializing the decoder context.\n"); + av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); exit_program(1); } } } -static void dump_attachment(AVStream *st, const char *filename) +static void dump_attachment(InputStream *ist, const char *filename) { + AVStream *st = ist->st; int ret; AVIOContext *out = NULL; const AVDictionaryEntry *e; if (!st->codecpar->extradata_size) { - av_log(NULL, AV_LOG_WARNING, "No extradata to dump in stream #%d:%d.\n", - nb_input_files - 1, st->index); + av_log(ist, AV_LOG_WARNING, "No extradata to dump.\n"); return; } if (!*filename && (e = av_dict_get(st->metadata, "filename", NULL, 0))) filename = e->value; if (!*filename) { - av_log(NULL, AV_LOG_FATAL, "No filename specified and no 'filename' tag" - "in stream #%d:%d.\n", nb_input_files - 1, st->index); + av_log(ist, AV_LOG_FATAL, "No filename specified and no 'filename' tag"); exit_program(1); } assert_file_overwrite(filename); if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, &int_cb, NULL)) < 0) { - av_log(NULL, AV_LOG_FATAL, "Could not open file %s for writing.\n", + av_log(ist, AV_LOG_FATAL, "Could not open file %s for writing.\n", filename); exit_program(1); } @@ -1175,11 +1196,11 @@ int ifile_open(const OptionsContext *o, const char *filename) for (i = 0; i < o->nb_dump_attachment; i++) { int j; - for (j = 0; j < ic->nb_streams; j++) { - AVStream *st = ic->streams[j]; + for (j = 0; j < f->nb_streams; j++) { + InputStream *ist = f->streams[j]; - if (check_stream_specifier(ic, st, o->dump_attachment[i].specifier) == 1) - dump_attachment(st, o->dump_attachment[i].u.str); + if (check_stream_specifier(ic, ist->st, o->dump_attachment[i].specifier) == 1) + dump_attachment(ist, o->dump_attachment[i].u.str); } } From patchwork Sat Feb 11 07:44:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40364 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1975055pzk; Fri, 10 Feb 2023 23:44:37 -0800 (PST) X-Google-Smtp-Source: AK7set965u4KuwQ7gjrl24sUFXJiyE8ALdTTdWc2gI+B/uk1Xlf9iWdXDnJi7fKFsBo/jhhRpylm X-Received: by 2002:a17:906:9c93:b0:8af:3fef:52c9 with SMTP id fj19-20020a1709069c9300b008af3fef52c9mr7602428ejc.22.1676101476886; Fri, 10 Feb 2023 23:44:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676101476; cv=none; d=google.com; s=arc-20160816; b=A6ErpQrFCffklSn8KQJK/DKQPumJZNY1hjbIxWNNZ3ahRI/heQ1CxV0/r0lDio/+Bh osaHJbUIFIm5bm1PZXaAbNpon56UJ13/wiVa1Jvnv54gzH/eBuWVTdhNosFQeU8euoB5 LWetW4CR0AXgn7prTvkjo7GyT4RNb1SnG+Xz2XcVI8RUnQ7vIgzA62tsDOHh+kX3UN13 sP8RMtECKa2DbsliPE7vh1fW6FVDX50gGMiFbNm7dSOM1SUDHvxtIYg4A7Nyht210uly ygGSkW9vjZ1FK5b8ZnJl+RQ+Dt16raG5ygG+LL9Cr5KUOX1m7KjtaO3/eyinAoDLD/Q7 cKlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=gJghiJUVvcxo5WT53BgWZD8dbrWQw2EgXwXEFuwQWbI=; b=P5AA6sWy0Mhg8+hraJ9RppQjSrhiRrtLBmSHZrDGnS+BF2+xSk2LMVavrFHjRxQhOS kpdko4+jJV7DicOTLBDueR7olb/W3OgCg+FrxADSBIPF0C/aGk8JAhj2rMgY+K0aRpXW +++aTetVJG8WtFRDsLW0sKKt68rORIs5SyTyqeryI06Oy/KGTSPekMD1fcPLfr4sPK2e MYzdKTSK12T0XBkLKwmhLS3zLtMpAmhGTPOiA4mCA2iGO2rPTFMf4nB32QDeIlje67tW 6JMiqahP3SSOOb/kQZ6K1Yf9yd7/IB4Lfo81SPBOjSK4PYnd1oBfF9DztC5FbbKnx7so Pfaw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 10-20020a17090602ca00b00855da26bccasi9223346ejk.974.2023.02.10.23.44.36; Fri, 10 Feb 2023 23:44:36 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B15386804FB; Sat, 11 Feb 2023 09:44:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2034668A360 for ; Sat, 11 Feb 2023 09:44:26 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B2C2B2405B5 for ; Sat, 11 Feb 2023 08:44:25 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id q7NdYhBHoymw for ; Sat, 11 Feb 2023 08:44:24 +0100 (CET) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id E23472404F5 for ; Sat, 11 Feb 2023 08:44:24 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id B8C1F3A0567 for ; Sat, 11 Feb 2023 08:44:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Feb 2023 08:44:12 +0100 Message-Id: <20230211074412.29495-5-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211074412.29495-1-anton@khirnov.net> References: <20230211074412.29495-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] fftools/ffmpeg: move ts_scale to DemuxStream 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: zJtJzLJiP856 It is not needed outside of ffmpeg_demux. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_demux.c | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 401f424f79..4d4433f5ba 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -385,7 +385,6 @@ typedef struct InputStream { int64_t nb_samples; /* number of samples in the last decoded audio frame before looping */ - double ts_scale; int saw_first_ts; AVDictionary *decoder_opts; AVRational framerate; /* framerate forced with -r */ diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index f2a1391a29..2033c1de54 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -58,6 +58,8 @@ typedef struct DemuxStream { // name used for logging char log_name[32]; + double ts_scale; + int64_t min_pts; /* pts with the smallest value in a current stream */ int64_t max_pts; /* pts with the higher value in a current stream */ } DemuxStream; @@ -225,9 +227,9 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict) pkt->pts += av_rescale_q(ifile->ts_offset, AV_TIME_BASE_Q, ist->st->time_base); if (pkt->pts != AV_NOPTS_VALUE) - pkt->pts *= ist->ts_scale; + pkt->pts *= ds->ts_scale; if (pkt->dts != AV_NOPTS_VALUE) - pkt->dts *= ist->ts_scale; + pkt->dts *= ds->ts_scale; duration = av_rescale_q(d->duration, d->time_base, ist->st->time_base); if (pkt->pts != AV_NOPTS_VALUE) { @@ -670,8 +672,8 @@ static void add_input_streams(const OptionsContext *o, Demuxer *d) ds->min_pts = INT64_MAX; ds->max_pts = INT64_MIN; - ist->ts_scale = 1.0; - MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); + ds->ts_scale = 1.0; + MATCH_PER_STREAM_OPT(ts_scale, dbl, ds->ts_scale, ic, st); ist->autorotate = 1; MATCH_PER_STREAM_OPT(autorotate, i, ist->autorotate, ic, st);