From patchwork Wed Aug 3 13:58:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37112 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp459055pzb; Wed, 3 Aug 2022 07:01:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Cn0gPRgdW5uvBmiw3itG1qCKf43dnUtUb7pLxQ/xjePQe0rE81wTT+ZJpJfRQ3IqT7QRZ X-Received: by 2002:a17:907:762f:b0:730:95d9:9955 with SMTP id jy15-20020a170907762f00b0073095d99955mr8826355ejc.505.1659535295890; Wed, 03 Aug 2022 07:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659535295; cv=none; d=google.com; s=arc-20160816; b=HcfWD3Sods2NnkJGRVBbftdefffbBZsASoZxhAERQB2nR+2ZVLjqetOfW3fm51E9E3 YJ/p7b9e3Lpx7OsWh91AoYoeoQDXL7xTLS6goQSyfAatWmqac4RfFjdUMLzRbnayx3+O ul3pRHwXNJ5JV/2roJSPs8LgV9KubfCexcEXWzfj3sugkrcpkaTwNMXDa2f3UTtKnKZm lwFfMsdE44hP9IrUDhnabPUuxahuzr96rQmNaQGkxoI2JtB3pjdIPYyrWvpZA2Z3vs1Y qgxsxBaB3i11wS/WtY84jtOvbzzX7Q6SExMBc+uHqfKd+f8ZUfREPNN3JEa+cqXBo8WF AY5g== 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=rZRdWy60VUoLIBfDfmlMzqeQRQJ4SmkMF9LIkAWfinI=; b=qZHvzYy7uPe6MfhtoXMQufbn1AmW+XRWOPbrvKqp3RH7FFYJReMsUMPyYfvI1Pssn/ zt2+EYe+30dGOEJbHAB2JV+fljp17m8vz2RoxPybBQ5A9liCXdXiFUsJD+suIIdTB6/n 3p9zIThYaJPL8OCXypOudshHJLaUTAN29ubbPf1Zm0DWGlrEak2fiqd/ZrMQFUJVMCrD hbXWopcXRJEmgwbOJ1+WzlNSOwlfgMao4GJftaa3Ut070DAbvFGIQ+pckJA3Bq9EFrsH N6v0HKpCdVdtYBi72MGfJ8wBB8YXdhRhin+diUbGtEzVj/d3M/v2Sz7nbY61U/FH9FpO RD+w== 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 j36-20020a05640223a400b0043a6defcbafsi14440681eda.219.2022.08.03.07.01.33; Wed, 03 Aug 2022 07: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; 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 7EDF568B971; Wed, 3 Aug 2022 16:59:17 +0300 (EEST) 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 AEBBF68B8A0 for ; Wed, 3 Aug 2022 16:59:01 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 814F324050B for ; Wed, 3 Aug 2022 15:58:59 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id FAj9OvY2YM6g for ; Wed, 3 Aug 2022 15:58:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [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 DDDE7240512 for ; Wed, 3 Aug 2022 15:58:54 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 1F76A3A04AB; Wed, 3 Aug 2022 15:58:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 15:58:32 +0200 Message-Id: <20220803135844.16662-13-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220803135844.16662-1-anton@khirnov.net> References: <20220803135844.16662-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/25] fftools/ffmpeg: store the input file index in 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: FrflcuAnfgwG Use it to simplify some code and fix two off-by-one errors. Similar to what was previously done for OutputFile. --- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_opt.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 6b09846825..23b249780b 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -408,6 +408,8 @@ typedef struct InputStream { } InputStream; typedef struct InputFile { + int index; + AVFormatContext *ctx; int eof_reached; /* true if eof reached */ int eagain; /* true if last read attempt returned EAGAIN */ diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index bd3a34960c..25aa9aaff5 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1383,6 +1383,7 @@ static int open_input_file(OptionsContext *o, const char *filename) f = ALLOC_ARRAY_ELEM(input_files, nb_input_files); f->ctx = ic; + f->index = nb_input_files - 1; f->ist_index = nb_input_streams - ic->nb_streams; f->start_time = o->start_time; f->recording_time = o->recording_time; @@ -1398,11 +1399,11 @@ static int open_input_file(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", nb_input_files, f->readrate); + av_log(NULL, AV_LOG_ERROR, "Option -readrate for Input #%d is %0.3f; it must be non-negative.\n", f->index, 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", nb_input_files, f->readrate); + av_log(NULL, AV_LOG_WARNING, "Both -readrate and -re set for Input #%d. Using -readrate %0.3f.\n", f->index, f->readrate); f->rate_emu = 0; } @@ -1435,7 +1436,7 @@ static int open_input_file(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 : "", nb_input_files - 1, + option->help ? option->help : "", f->index, filename); exit_program(1); } @@ -1445,7 +1446,7 @@ static int open_input_file(OptionsContext *o, const char *filename) "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 : "", nb_input_files - 1, filename); + option->help ? option->help : "", f->index, filename); } av_dict_free(&unused_opts);