From patchwork Mon Apr 4 11:30:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35204 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a02:aa92:0:0:0:0:0 with SMTP id u18csp3587532jai; Mon, 4 Apr 2022 04:39:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUN3mu3Y8sZsfLLmg/qfIXk55iR/ZECqiX/HzFliUsy6fGDVhLUC3dOg8Ssyye1TS6i96l X-Received: by 2002:a05:6402:d0e:b0:418:f011:275e with SMTP id eb14-20020a0564020d0e00b00418f011275emr32242004edb.323.1649072359905; Mon, 04 Apr 2022 04:39:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649072359; cv=none; d=google.com; s=arc-20160816; b=WtsylvwtHk4/EQWh9SUGa4amDjQYdyZbDDYSbriYhLdruX2TDl0GJLDyT2gz3OFtsm vPHuZrFttQbT75h2PvdxYYFadoN7PQ+/0acsTGmtmxwkllPcsYPH79fsKTYkc9B2y0+0 cHnZn70sqPOkwLFfgkdkQCE0/llda40CVWKc8M3lbdsSDhTgxjgMZil32cqqo/ibEOvn NRvHoaJ7oBmioZiAGXV5Dd+mQCST8+0TdtCmVFiDXdd4jCo838dmkOCjzBuRPJ3I6azo A7laexFjnbTFvyadmzrzmhIoQ6mLrROw9T+4hUgY41GtCxHEs/PCape4TUo98/xVwPjk d2hw== 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=30Wu2uzhkv58yK0895mupt9vuWRZGQmovTQt5b4hxDA=; b=jc5yFYEG3QlVMI7hgUkq9OeklsxM1n7ak88vxRgGlkSakz5KKPH4cH/ych60Prya1J NkaeZE41Hv20njiV0oFQ3CegN8taRWrQOLp0YwwTvCXvmR6XPN+kyXKxT9PurGeIKIzo 9MGy2lGrta4UqkGsd/ZSYQTd+zIfxjWssEkEKK4PMLHV7ek0qL9fbwc76OaLwsX3Zjtt BGKAMeV44Q3UgVeAFlab8DbO6V5VhOb9s/xZD7n7cAZFSByqorzfgVZ2htk6mhLNkzYj 3BEt9D6RXVxtAsRvEx1F6IbDeqlJVj/idX2jDZ2AacmvAdqjD+s/DL7UkJ95ydsS+Q92 ml6Q== 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 cb9-20020a0564020b6900b0041cd678a7c7si1205939edb.55.2022.04.04.04.39.19; Mon, 04 Apr 2022 04:39:19 -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 2D73268B34F; Mon, 4 Apr 2022 14:37:52 +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 62B7F68B2DF for ; Mon, 4 Apr 2022 14:37:45 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0F8DF24017E for ; Mon, 4 Apr 2022 13:37:45 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 75hTg92qodbL for ; Mon, 4 Apr 2022 13:37:44 +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 B25C624052D for ; Mon, 4 Apr 2022 13:37:41 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 39EE43A0E24; Mon, 4 Apr 2022 13:32:12 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 13:30:29 +0200 Message-Id: <20220404113037.13070-42-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220404113037.13070-1-anton@khirnov.net> References: <20220404113037.13070-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 41/49] fftools/ffmpeg_mux: return errors from write_packet() 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: jel6L/35r7fR Content-Length: 2755 --- fftools/ffmpeg_mux.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 69af2c8d46..37ae61fee8 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -166,7 +166,7 @@ static int queue_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) return 0; } -static void write_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) +static int write_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) { MuxStream *ms = &of->mux->streams[ost->index]; AVFormatContext *s = of->mux->fc; @@ -211,10 +211,8 @@ static void write_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) av_log(s, loglevel, "Non-monotonous DTS in output stream " "%d:%d; previous: %"PRId64", current: %"PRId64"; ", ost->file_index, ost->st->index, ms->last_mux_dts, pkt->dts); - if (exit_on_error) { - av_log(NULL, AV_LOG_FATAL, "aborting.\n"); - exit_program(1); - } + if (exit_on_error) + return AVERROR(EINVAL); av_log(s, loglevel, "changing to %"PRId64". This may result " "in incorrect timestamps in the output file.\n", max); @@ -250,7 +248,10 @@ static void write_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) print_error("av_interleaved_write_frame()", ret); main_return_code = 1; close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED); + return ret; } + + return 0; } static int submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) @@ -258,7 +259,7 @@ static int submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) int ret; if (of->mux->header_written) { - write_packet(of, ost, pkt); + return write_packet(of, ost, pkt); } else { /* the muxer is not initialized yet, buffer the packet */ ret = queue_packet(of, ost, pkt); @@ -401,8 +402,10 @@ int of_check_init(OutputFile *of) while (av_fifo_read(ms->muxing_queue, &pkt, 1) >= 0) { ms->muxing_queue_data_size -= pkt->size; - write_packet(of, ost, pkt); + ret = write_packet(of, ost, pkt); av_packet_free(&pkt); + if (ret < 0) + return ret; } }