From patchwork Sat Jul 15 10:45:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42735 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4241649pzb; Sat, 15 Jul 2023 03:54:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlGngz8IujADrVutnhWFIdWLkgtzHALRlzeq0jFnxB+xqgv719kHTfV/RIZ4/+ac0G5Hn/1Z X-Received: by 2002:a05:6402:542:b0:51e:3427:63ea with SMTP id i2-20020a056402054200b0051e342763eamr6225966edx.8.1689418460536; Sat, 15 Jul 2023 03:54:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689418460; cv=none; d=google.com; s=arc-20160816; b=Sscg/BCzYonwCe/Xoh3uRMus0MHTmaU7q1c+jTEKL4G1rKY2bUnHVrBy33FTTqUdl+ +HqIfOqtVyeQGWRjVIRRaBJmtAJ7MDzBNOZxlAUr+VFg38EuygCV61EA6YgZyMoua8gL hrotEkSxiY9NOrPxDPCyTlutI5M230sL4tzBTdp7qxA7UOGN3UcHGZeOza8M9tnYMTO1 nOMCgPkQV1gAlVNX3rzS3lZX4iLNSmLs9jd19puGANpp9/Ah1kPnYMvPzqkZKSFOlCqf icUFCyVi54y9UbN4ILYBiLZHaEFmQ4HetmUazVHq5nm+T8HWaZNRT6YSevVWx9M8g4Pl Nlog== 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=KHMBbpSH2OjyuossMdF3zLffwXZIYJoiFqECbHhF1z8=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=wCtQX6wXa7L8flqQBShiWJxPcUzhKic/upz05Cq/RHJLFtfeoPlvforOQ490JGhXPr 5X+0XxmTd0QJJTFpzXcAzZNEhHAAagkjyQbW/TvHP2cPmQrjQxrVFOc9infVVQKtRt+0 y59qERBqq0LHSr3NMJ9+UH0A329r13b2sQplx2qjy28ayLamN1qEdTWWZYcIVZoSDgX5 oWMnXmhV23fEjHESp9Cf+c9TvDG0c55L48IRAN3cJViuJ3A1Uxu9d++LhHioi9Hj5LUW DBwR1LIAYiyLyjZKjPo74AjUS7NCpLUOn14qcf9pYhoRhhA69YyBHtttKQ1TItJfgIe/ v8JQ== 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 b3-20020aa7c6c3000000b0051e2936779fsi4586676eds.380.2023.07.15.03.54.20; Sat, 15 Jul 2023 03:54:20 -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 A06A368C782; Sat, 15 Jul 2023 13:53:45 +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 CDD2068C75C for ; Sat, 15 Jul 2023 13:53:38 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 83C5A2404EA for ; Sat, 15 Jul 2023 12:53:37 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id cBRZvzsWuNtc for ; Sat, 15 Jul 2023 12:53:36 +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 EC8952405B5 for ; Sat, 15 Jul 2023 12:53:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5B4563A21C7 for ; Sat, 15 Jul 2023 12:46:21 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 12:45:54 +0200 Message-Id: <20230715104611.17902-30-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230715104611.17902-1-anton@khirnov.net> References: <20230715104611.17902-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 30/47] fftools/ffmpeg_opt: replace exit_program() with returning error codes 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: iD9mmyaWXd2U --- fftools/ffmpeg_opt.c | 49 ++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 5a5a26d0a5..293397a8b7 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -190,7 +190,7 @@ int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_id else if (!is_global && !av_strcasecmp(arg, "auto")) *vsync_var = VSYNC_AUTO; else if (!is_global) { av_log(NULL, AV_LOG_FATAL, "Invalid value %s specified for fps_mode of #%d:%d.\n", arg, file_idx, st_idx); - exit_program(1); + return AVERROR(EINVAL); } if (is_global && *vsync_var == VSYNC_AUTO) { @@ -250,12 +250,12 @@ static int apply_sync_offsets(void) if (self->input_sync_ref == -1 || self->input_sync_ref == i) continue; if (self->input_sync_ref >= nb_input_files || self->input_sync_ref < -1) { av_log(NULL, AV_LOG_FATAL, "-isync for input %d references non-existent input %d.\n", i, self->input_sync_ref); - exit_program(1); + return AVERROR(EINVAL); } if (copy_ts && !start_at_zero) { av_log(NULL, AV_LOG_FATAL, "Use of -isync requires that start_at_zero be set if copyts is set.\n"); - exit_program(1); + return AVERROR(EINVAL); } ref = input_files[self->input_sync_ref]; @@ -397,7 +397,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg) m->linklabel = av_get_token(&c, "]"); if (!m->linklabel) { av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map); - exit_program(1); + return AVERROR(EINVAL); } } else { if (allow_unused = strchr(map, '?')) @@ -405,7 +405,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg) file_idx = strtol(map, &p, 0); if (file_idx >= nb_input_files || file_idx < 0) { av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx); - exit_program(1); + return AVERROR(EINVAL); } if (negative) /* disable some already defined maps */ @@ -443,11 +443,11 @@ static int opt_map(void *optctx, const char *opt, const char *arg) } else if (disabled) { av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches disabled streams.\n" "To ignore this, add a trailing '?' to the map.\n", arg); - exit_program(1); + return AVERROR(EINVAL); } else { av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n" "To ignore this, add a trailing '?' to the map.\n", arg); - exit_program(1); + return AVERROR(EINVAL); } } @@ -509,7 +509,7 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) if (n != 3 && n != 5) { av_log(NULL, AV_LOG_FATAL, "Syntax error, mapchan usage: " "[file.stream.channel|-1][:syncfile:syncstream]\n"); - exit_program(1); + goto fail; } if (n != 5) // only file.stream.channel specified @@ -519,19 +519,19 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) if (m->file_idx < 0 || m->file_idx >= nb_input_files) { av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file index: %d\n", m->file_idx); - exit_program(1); + goto fail; } if (m->stream_idx < 0 || m->stream_idx >= input_files[m->file_idx]->nb_streams) { av_log(NULL, AV_LOG_FATAL, "mapchan: invalid input file stream index #%d.%d\n", m->file_idx, m->stream_idx); - exit_program(1); + goto fail; } st = input_files[m->file_idx]->ctx->streams[m->stream_idx]; if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) { av_log(NULL, AV_LOG_FATAL, "mapchan: stream #%d.%d is not an audio stream.\n", m->file_idx, m->stream_idx); - exit_program(1); + goto fail; } /* allow trailing ? to map_channel */ if (allow_unused = strchr(mapchan, '?')) @@ -545,12 +545,15 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) av_log(NULL, AV_LOG_FATAL, "mapchan: invalid audio channel #%d.%d.%d\n" "To ignore this, add a trailing '?' to the map_channel.\n", m->file_idx, m->stream_idx, m->channel_idx); - exit_program(1); + goto fail; } } av_free(mapchan); return 0; +fail: + av_free(mapchan); + return AVERROR(EINVAL); } #endif @@ -602,7 +605,7 @@ static int opt_init_hw_device(void *optctx, const char *opt, const char *arg) AV_HWDEVICE_TYPE_NONE) printf("%s\n", av_hwdevice_get_type_name(type)); printf("\n"); - exit_program(0); + return AVERROR_EXIT; } else { return hw_device_init_from_string(arg, NULL); } @@ -819,7 +822,7 @@ static int opt_target(void *optctx, const char *opt, const char *arg) av_log(NULL, AV_LOG_FATAL, "Could not determine norm (PAL/NTSC/NTSC-Film) for target.\n"); av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", \"ntsc-\" or \"film-\",\n"); av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n"); - exit_program(1); + return AVERROR(EINVAL); } if (!strcmp(arg, "vcd")) { @@ -931,7 +934,7 @@ static int opt_vstats(void *optctx, const char *opt, const char *arg) if (!today) { // maybe tomorrow av_log(NULL, AV_LOG_FATAL, "Unable to get current time: %s\n", strerror(errno)); - exit_program(1); + return AVERROR(errno); } snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", today->tm_hour, today->tm_min, @@ -983,6 +986,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) FILE *f=NULL; char filename[1000], line[1000], tmp_line[1000]; const char *codec_name = NULL; + int ret = 0; tmp_line[0] = *opt; tmp_line[1] = 0; @@ -993,7 +997,7 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) av_log(NULL, AV_LOG_FATAL, "Please use -preset -qp 0\n"); }else av_log(NULL, AV_LOG_FATAL, "File for preset '%s' not found\n", arg); - exit_program(1); + return AVERROR(ENOENT); } while (fgets(line, sizeof(line), f)) { @@ -1005,7 +1009,8 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) if (!av_strtok(key, "=", &value) || !av_strtok(value, "\r\n", &endptr)) { av_log(NULL, AV_LOG_FATAL, "%s: Invalid syntax: '%s'\n", filename, line); - exit_program(1); + ret = AVERROR(EINVAL); + goto fail; } av_log(NULL, AV_LOG_DEBUG, "ffpreset[%s]: set '%s' = '%s'\n", filename, key, value); @@ -1016,13 +1021,15 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) else if (opt_default_new(o, key, value) < 0) { av_log(NULL, AV_LOG_FATAL, "%s: Invalid option or argument: '%s', parsed as '%s' = '%s'\n", filename, line, key, value); - exit_program(1); + ret = AVERROR(EINVAL); + goto fail; } } +fail: fclose(f); - return 0; + return ret; } static int opt_old2new(void *optctx, const char *opt, const char *arg) @@ -1310,7 +1317,9 @@ int ffmpeg_parse_options(int argc, char **argv) correct_input_start_times(); - apply_sync_offsets(); + ret = apply_sync_offsets(); + if (ret < 0) + goto fail; ret = check_filter_outputs(); if (ret < 0)