From patchwork Thu Jun 16 19:55:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36269 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1128284pzb; Thu, 16 Jun 2022 13:05:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ubgvcySa9fq9+FqBLekCE5gIuR+G1U7j1YD0moSH5vLWcNAXFTYq1DDvTKAgeNMO3xUC/U X-Received: by 2002:a17:906:f84e:b0:70e:6ec8:cc4a with SMTP id ks14-20020a170906f84e00b0070e6ec8cc4amr5873283ejb.694.1655409935072; Thu, 16 Jun 2022 13:05:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655409935; cv=none; d=google.com; s=arc-20160816; b=kWGpIb/UFZv377Dpwbi8P4HW2PmKqRKkqvN0IEG3t27Sc3GkUPf4FKa4rG5e15663Q wQoz1T0UcUDWK/PT3WGkWhgPEGWyeGFsWoKU564qdy1k1kIKIE7gu7LudVX3qZNO6UXt WjcUX1tlAcA+LvmhtqK+4PUzPXk4RypX5ACa7HZW3PPqNRybuUKxd4FWSRz8yxH8QCdJ 2NQJs1jlYRE0dJRzU5ihizzUA15pgAdwg0fem1eK8T4IZUUJFb3ItjnOKhJrtaGRwpHa wTX+vxb/fKy1PtosKrg55xtyF0tHt6eJ4m6epDe14SqjrdZyxvaHDsR0pux/IHt34X1R GHRw== 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=3OuIg2aGho/voGEiIzneXL+iCQ7UeBiZ0T84ZGvbThE=; b=VQ6mj+4yI20l6EsETRwhNsEPlXLYoc50fV67VJJa3vrnDz22xCLLP1eZVF1eMn29vP JKn4o2t1HB8g4rJ5SfdnxAZynpbp8da7z+F7MIkz3Bn8+jOaH5OVNQZy4L2HVAeVy/xg vr+YXIG3Hduns0Xj3Yry35SLeLi2xS41B6EGFF+urQSRTPI4TdIihofxZsIepOOYRP73 wt7AiczL2iA2iJDaVzqH1Goa2lz8X2tGPEh3KyIuCxzHqzkpyOQC1Hrv5xKnKZDUViDv vdJQHom2xoO0fUtFWGicbPDVqbXLF9omc0HWPOig3RvLxSh3k3FiJJApFCWzXl2CimaU wr1w== 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 c30-20020a1709063f1e00b0070eb188249bsi2646808ejj.358.2022.06.16.13.05.34; Thu, 16 Jun 2022 13:05: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 B01F568B81D; Thu, 16 Jun 2022 23:03: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 4FDA168B817 for ; Thu, 16 Jun 2022 23:03:44 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B4CE724017C for ; Thu, 16 Jun 2022 22:03:43 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id iZ5Lb88bQwgl for ; Thu, 16 Jun 2022 22:03:43 +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 45CFE2400F5 for ; Thu, 16 Jun 2022 22:03:34 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 02E323A2193; Thu, 16 Jun 2022 22:03:31 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Jun 2022 21:55:27 +0200 Message-Id: <20220616195534.5278-28-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220616195534.5278-1-anton@khirnov.net> References: <20220616195534.5278-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 28/35] fftools/ffmpeg_mux: return errors from of_submit_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: rawcTMfN7q3E Do not call exit_program(), as that would conflict with moving this code into a separate thread. --- fftools/ffmpeg.c | 54 +++++++++++++++++++++++++++++++------------- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_mux.c | 6 +++-- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 4321652848..5df453c2d9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -713,6 +713,7 @@ static void close_output_stream(OutputStream *ost) static void output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof) { + const char *err_msg; int ret = 0; if (!eof && pkt->dts != AV_NOPTS_VALUE) @@ -720,28 +721,49 @@ static void output_packet(OutputFile *of, AVPacket *pkt, /* apply the output bitstream filters */ if (ost->bsf_ctx) { + int bsf_eof = 0; + ret = av_bsf_send_packet(ost->bsf_ctx, eof ? NULL : pkt); + if (ret < 0) { + err_msg = "submitting a packet for bitstream filtering"; + goto fail; + } + + while (!bsf_eof) { + ret = av_bsf_receive_packet(ost->bsf_ctx, pkt); + if (ret == AVERROR(EAGAIN)) + return; + else if (ret == AVERROR_EOF) + bsf_eof = 1; + else if (ret < 0) { + err_msg = "applying bitstream filters to a packet"; + goto fail; + } + + ret = of_submit_packet(of, bsf_eof ? NULL : pkt, ost); + if (ret < 0) + goto mux_fail; + } + } else { + ret = of_submit_packet(of, eof ? NULL : pkt, ost); if (ret < 0) - goto finish; - while ((ret = av_bsf_receive_packet(ost->bsf_ctx, pkt)) >= 0) - of_submit_packet(of, pkt, ost); - if (ret == AVERROR_EOF) - of_submit_packet(of, NULL, ost); - if (ret == AVERROR(EAGAIN)) - ret = 0; - } else - of_submit_packet(of, eof ? NULL : pkt, ost); + goto mux_fail; + } if (eof) ost->finished |= MUXER_FINISHED; -finish: - if (ret < 0 && ret != AVERROR_EOF) { - av_log(NULL, AV_LOG_ERROR, "Error applying bitstream filters to an output " - "packet for stream #%d:%d.\n", ost->file_index, ost->index); - if(exit_on_error) - exit_program(1); - } + return; + +mux_fail: + err_msg = "submitting a packet to the muxer"; + +fail: + av_log(NULL, AV_LOG_ERROR, "Error %s for output stream #%d:%d.\n", + err_msg, ost->file_index, ost->index); + if (exit_on_error) + exit_program(1); + } static int check_recording_time(OutputStream *ost) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index c757f72c0e..91f5b4024b 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -705,7 +705,7 @@ int of_check_init(OutputFile *of); int of_write_trailer(OutputFile *of); void of_close(OutputFile **pof); -void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost); +int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost); int of_finished(OutputFile *of); int64_t of_filesize(OutputFile *of); AVChapter * const * diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index c44ff0f1df..490e0e54eb 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -232,7 +232,7 @@ static void submit_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) } } -void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) +int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) { int ret; @@ -243,9 +243,11 @@ void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) ret = queue_packet(of, ost, pkt); if (ret < 0) { av_packet_unref(pkt); - exit_program(1); + return ret; } } + + return 0; } static int print_sdp(void)