From patchwork Mon Apr 4 11:30: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: 35205 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a02:aa92:0:0:0:0:0 with SMTP id u18csp3587679jai; Mon, 4 Apr 2022 04:39:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRaPbViOcYvMnxeFLUtNT92USvAKl0sYpuolpi9Hp8GFiwhXqcMM4rYtPMOvwFbsDJlafM X-Received: by 2002:a05:6402:1255:b0:419:3808:3d98 with SMTP id l21-20020a056402125500b0041938083d98mr32455145edw.134.1649072374584; Mon, 04 Apr 2022 04:39:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649072374; cv=none; d=google.com; s=arc-20160816; b=tL7CRhBB6S/kbUdjSPMSI9hDvk1yIQ6VUt/8jauEF9XbiatdI3nO5ho4PZRfdcd12V Vo0OFE2TGBZyxi/kLnFHh0BN/qHm3wkfPsRcC6CxeBei8irBL/e1gFQsjEjb6u7dp/0h dokfML45uUKzRvxIbwK3f0Cmzg5YGhlwZ3DIWs0kYdD5YkMHrV7mcqbiaT65vukVkPmg nT0XTqcmGPWyYNijKwGThBMnOr3RtyXtwrJGHCDIlPdt+xlE52KLjyGNGBHEf6m7UcDG tIMeoyoZojcInmEmSgZAuy5hgsB12TdR8t4EpHjkyNgFGD9qpxZcwvwLyeDLVwn7STxo XPaQ== 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=RnR3BQLDeZO22zEsVGReq7C4cZVlv8ZZM8XBaVxjyk0=; b=m8wxZidqh/XE/HoPbOMfd52XekWbYK7qtUJGTCSNORyuQ3EzKU3K2FegnVh1/6tDt+ +F7Q2LdRuGiWWVPOknfbkEB2D+1mdPiy4L0nZdgYNZmabcoUG3ZQ9qtVvGpgSHCQZc3E 268JKTyzTCmkkSJXYOByapXPxr/72NnSXdPfiQUsfFYfaefAtpKWBshFltvWxhUJZUL4 5PSFVZxvvT0edFDEAf2y3EpKdRoms1j5Db+a3LbGfTHEz61MKNn+oKT0J0qWcel6nU5k R1AAmKQgqaZexc4zNokUL5V6vx3H7OXpqCabGY2SAHyN7GXH2xWBf2b7EQFhqpqabc4q tYTg== 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 t19-20020aa7db13000000b0041cc16201e3si2653324eds.459.2022.04.04.04.39.34; Mon, 04 Apr 2022 04:39:34 -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 A7E2768B367; Mon, 4 Apr 2022 14:37:53 +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 90AE968B2AE for ; Mon, 4 Apr 2022 14:37:45 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3DB632404FE 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 K8nys_H13_z0 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 B25F7240555 for ; Mon, 4 Apr 2022 13:37:41 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 32C373A0DFA; Mon, 4 Apr 2022 13:32:12 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 13:30:27 +0200 Message-Id: <20220404113037.13070-40-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 39/49] 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: FcMUaaKJ8On0 Content-Length: 4729 --- fftools/ffmpeg.c | 54 +++++++++++++++++++++++++++++++------------- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_mux.c | 12 ++++++---- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 7e9ac943de..9987b15888 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -712,6 +712,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) @@ -719,25 +720,46 @@ 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) - goto finish; - while ((ret = av_bsf_receive_packet(ost->bsf_ctx, pkt)) >= 0) - of_submit_packet(of, pkt, ost, 0); - if (ret == AVERROR_EOF) - of_submit_packet(of, pkt, ost, 1); - if (ret == AVERROR(EAGAIN)) - ret = 0; - } else - of_submit_packet(of, pkt, ost, eof); + if (ret < 0) { + err_msg = "submitting a packet for bitstream filtering"; + goto fail; + } -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); + 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, pkt, ost, ret == AVERROR_EOF); + if (ret < 0) + goto mux_fail; + } + } else { + ret = of_submit_packet(of, pkt, ost, eof); + if (ret < 0) + goto mux_fail; } + + 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 2ba58b492f..fef66c2325 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -704,7 +704,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 eof); +int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof); 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 0a8bdc36d9..3ea7636380 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -269,7 +269,7 @@ static void submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) } } -void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof) +int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof) { if (ost->sq_idx_mux >= 0) { int ret = sq_send(of->sq_mux, ost->sq_idx_mux, @@ -278,22 +278,24 @@ void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof) av_packet_unref(pkt); if (ret == AVERROR_EOF) { ost->finished |= MUXER_FINISHED; - return; + return 0; } else - exit_program(1); + return ret; } while (1) { ret = sq_receive(of->sq_mux, -1, SQPKT(pkt)); if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) - return; + return 0; else if (ret < 0) - exit_program(1); + return ret; submit_packet(of, pkt, output_streams[of->ost_index + ret]); } } else if (!eof) submit_packet(of, pkt, ost); + + return 0; } static int print_sdp(void)