From patchwork Sat Jul 15 10:45:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42714 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4239991pzb; Sat, 15 Jul 2023 03:49:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlESW1J+fxiE8vpGCnVFfwYLOshmi2FtMHjdiLFZaWTUWqHzmvVMQXjxVuHsIbx7/Auw3Fdq X-Received: by 2002:a17:906:50e:b0:993:b8b5:489 with SMTP id j14-20020a170906050e00b00993b8b50489mr5438666eja.47.1689418180430; Sat, 15 Jul 2023 03:49:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689418180; cv=none; d=google.com; s=arc-20160816; b=ZShKeWkummifl/0wvaU1DqzfDuZJJdF1TeT5n7lw0TvbB8PJz5GhB/sLvSP5Xsot0t dX4D6UvtDfSdZZBeZmH9CEWbMY+DdVEP1401nvIgNrcTbc7zWOKK2WjR7uzx2nH8Z5Rb SbPuHdsAGfyKWFvwtonGWsxyyFzS6+RaAmhBoROG9NWo9Fgx63j6PqECQwR1D8UOPx5o 0FTacaH7Ny7/CwU2lDIJXH4MW1lRIkAUIH56TGfXPteF2raePcEBy3V46A4YWMpraJrv NAuFCyrVoNkYf3yPqrg5Vft3x8tqKWWURvSbmNazBxO17LQ0MptJt1AN394jxoZu/UEh zWPg== 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=WNT6vI+rDbWl761g0qQQcDm/Z0uXb+s5pIHAOKv72gk=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=v8ZuCrKgAD5+7b3sHcelct19kEsDA1tDoDtDqPeULQsVws9p6j9zc5IOh8h8EOsLP1 ggmqFJU58sEUozaQS9MgZFMkQLc8ocx9Je7INct702eFixaNQ1xGFPwNYgqtKhZHnaXJ vS0jDaZk3t8IzLcA+xUu3Gk+ZPVk9zJMthViHSNZa17qOMW57M/fb2Q9DHSKqz9R00SS Y6Lsai8cxZtDKGlQLXi3rQpeCVLNTZUxNUUgoQUC7IFSccs4MF2pSUIZbBK9xOlnAKmN wp+nquhCZxTLvoBzljIWsEfdk2+6O11wqpr1Cr5oRCa+PAhiRnO2Mlg26jKowwCvoCLH Yakg== 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 i13-20020aa7dd0d000000b0051e19aae8d1si10346102edv.378.2023.07.15.03.49.40; Sat, 15 Jul 2023 03:49:40 -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 12D0368C6D5; Sat, 15 Jul 2023 13:46:57 +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 B524968C655 for ; Sat, 15 Jul 2023 13:46:40 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 7C5532404EA for ; Sat, 15 Jul 2023 12:46:40 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id IuolQEIVipy4 for ; Sat, 15 Jul 2023 12:46:39 +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 F1834240D1B for ; Sat, 15 Jul 2023 12:46:26 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 88EB23A15FA for ; Sat, 15 Jul 2023 12:46:20 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 12:45:37 +0200 Message-Id: <20230715104611.17902-13-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 13/47] fftools/ffmpeg_mux: return errors from of_output_packet() instead of aborting 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: vEC0P5vp31+d --- fftools/ffmpeg.c | 4 +++- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_enc.c | 12 ++++++++---- fftools/ffmpeg_mux.c | 20 +++++++++----------- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 926fdea23a..ddb011741a 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1120,7 +1120,9 @@ static int process_input(int file_index) OutputStream *ost = ist->outputs[oidx]; OutputFile *of = output_files[ost->file_index]; close_output_stream(ost); - of_output_packet(of, ost, NULL); + ret = of_output_packet(of, ost, NULL); + if (ret < 0) + return ret; } } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 7329df6607..62b56a8cd8 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -831,7 +831,7 @@ void of_close(OutputFile **pof); void of_enc_stats_close(void); -void of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt); +int of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt); /** * @param dts predicted packet dts in AV_TIME_BASE_Q diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 9ca3940b93..01e1b0656c 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -563,7 +563,9 @@ int enc_subtitle(OutputFile *of, OutputStream *ost, const AVSubtitle *sub) } pkt->dts = pkt->pts; - of_output_packet(of, ost, pkt); + ret = of_output_packet(of, ost, pkt); + if (ret < 0) + return ret; } return 0; @@ -756,8 +758,8 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) av_assert0(frame); // should never happen during flushing return 0; } else if (ret == AVERROR_EOF) { - of_output_packet(of, ost, NULL); - return ret; + ret = of_output_packet(of, ost, NULL); + return ret < 0 ? ret : AVERROR_EOF; } else if (ret < 0) { av_log(ost, AV_LOG_ERROR, "%s encoding failed\n", type_desc); return ret; @@ -794,7 +796,9 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) e->packets_encoded++; - of_output_packet(of, ost, pkt); + ret = of_output_packet(of, ost, pkt); + if (ret < 0) + return ret; } av_assert0(0); diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index a6cc824496..24cdf00469 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -330,7 +330,7 @@ static int submit_packet(Muxer *mux, AVPacket *pkt, OutputStream *ost) return 0; } -void of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) +int of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) { Muxer *mux = mux_from_of(of); MuxStream *ms = ms_from_ost(ost); @@ -359,7 +359,7 @@ void of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) while (!bsf_eof) { ret = av_bsf_receive_packet(ms->bsf_ctx, ms->bsf_pkt); if (ret == AVERROR(EAGAIN)) - return; + return 0; else if (ret == AVERROR_EOF) bsf_eof = 1; else if (ret < 0) { @@ -377,16 +377,14 @@ void of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) goto mux_fail; } - return; + return 0; mux_fail: err_msg = "submitting a packet to the muxer"; fail: av_log(ost, AV_LOG_ERROR, "Error %s\n", err_msg); - if (exit_on_error) - exit_program(1); - + return exit_on_error ? ret : 0; } int of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) @@ -405,10 +403,8 @@ int of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) pkt = NULL; // EOF: flush output bitstream filters. - if (!pkt) { - of_output_packet(of, ost, NULL); - return 0; - } + if (!pkt) + return of_output_packet(of, ost, NULL); if (!ms->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) && !ms->copy_initial_nonkeyframes) @@ -461,7 +457,9 @@ int of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) } } - of_output_packet(of, ost, opkt); + ret = of_output_packet(of, ost, opkt); + if (ret < 0) + return ret; ms->streamcopy_started = 1;