From patchwork Sat Jul 15 10:45:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42702 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4239564pzb; Sat, 15 Jul 2023 03:48:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlHzeWYWWRfgXMZ3/4UGBzg4+o/XOdIKBEhnJbKGSQWmWdc3vE5i/OevsZmdPsVSsmYp/3Bg X-Received: by 2002:a17:907:3d9e:b0:993:eddd:6df4 with SMTP id he30-20020a1709073d9e00b00993eddd6df4mr7422675ejc.10.1689418098825; Sat, 15 Jul 2023 03:48:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689418098; cv=none; d=google.com; s=arc-20160816; b=gcm7A5EWZbjnVx/smT7HSnmSrLge4qBY5zu9tSqFLWhBXZ8Re2JsT8ueYNjjMkZhtQ YqMLwpNZiILnM7lJBvTquTTDncjejVWhhqMsd4HtfYi3PwPDcY+dU6tnrMX7GRbONKuH 7/r8hANvbIdxlR0yDkpBOeIgxs7sni8jDo3lz2F8+zY5cnScbpb+L9Ff0pUnC0FBQN36 6OE98zncY5TiaunPFs2OFvk3owqBwVpBfbkcr6Gi7q/9hbMKvYAWvPdqIc46GfayL7kw /hCsyNeBVJIVRYKe6giQ8OzAjDdSN2K8Nf3ivg5hxADy7c3s+9HKebUT3jyCf6x87CkS 467Q== 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=BXBG9O/+l4X3je2LB0520Uok2TPXf4jqlPPAT59vqjU=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=g4cziV3c3hzqizV6NkhLp8tK54BeNQ5a0TwkP+waoGVH2eKM7u7o7aSyU40kIimZjF bSMXNSGdfc92SyHUiEVRHMTGEvEka9dKRy4RhOqBsBRnJPNkUIUwETzKCGOciQ7LnNf6 E2rxoDPVQD3Bqzy0vNdH/27zp8la/erfhelbpOWbed9mizQzIL/OypPTjzqg3G1jjEJ6 pSe1zAZxjL2/FLU2/Mlww5XK3H8M6WAsQ2zVzVVAgGaOiY55/YaUFXC6r6983K+k75rF 1/CnnvqZB+Ga1bV6Xfu2ugTqiOwRYN9kWLdW+EwHWs1z7tBE0bS+QvS27ol1ni6eZ05T VWNg== 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 d2-20020a170906344200b009888e599645si10392010ejb.771.2023.07.15.03.48.18; Sat, 15 Jul 2023 03:48:18 -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 940CE68C6D6; Sat, 15 Jul 2023 13:46:46 +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 9DAE868C657 for ; Sat, 15 Jul 2023 13:46:33 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2E9CE2406CA for ; Sat, 15 Jul 2023 12:46:32 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id A7vGq5DtDyWL for ; Sat, 15 Jul 2023 12:46:29 +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 9D32F2405B5 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 4E8133A12E0 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:32 +0200 Message-Id: <20230715104611.17902-8-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 08/47] fftools/ffmpeg_enc: return errors from enc_frame() 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: SwpzZUVaoygs --- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_enc.c | 6 ++++-- fftools/ffmpeg_filter.c | 12 +++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 0189bee0f3..38f2b1ef66 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -815,7 +815,7 @@ void enc_free(Encoder **penc); int enc_open(OutputStream *ost, AVFrame *frame); int enc_subtitle(OutputFile *of, OutputStream *ost, const AVSubtitle *sub); -void enc_frame(OutputStream *ost, AVFrame *frame); +int enc_frame(OutputStream *ost, AVFrame *frame); void enc_flush(void); /* diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 1489b2f179..6130e3e221 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -1133,17 +1133,19 @@ static void do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame) av_frame_move_ref(e->last_frame, frame); } -void enc_frame(OutputStream *ost, AVFrame *frame) +int enc_frame(OutputStream *ost, AVFrame *frame) { OutputFile *of = output_files[ost->file_index]; int ret; ret = enc_open(ost, frame); if (ret < 0) - exit_program(1); + return ret; if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO) do_video_out(of, ost, frame); else do_audio_out(of, ost, frame); + + return 0; } void enc_flush(void) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 49e0800e6e..d373d8c002 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1722,8 +1722,11 @@ int reap_filters(FilterGraph *fg, int flush) av_log(fgp, AV_LOG_WARNING, "Error in av_buffersink_get_frame_flags(): %s\n", av_err2str(ret)); } else if (flush && ret == AVERROR_EOF && ofp->got_frame && - av_buffersink_get_type(filter) == AVMEDIA_TYPE_VIDEO) - enc_frame(ost, NULL); + av_buffersink_get_type(filter) == AVMEDIA_TYPE_VIDEO) { + ret = enc_frame(ost, NULL); + if (ret < 0) + return ret; + } break; } @@ -1759,8 +1762,11 @@ int reap_filters(FilterGraph *fg, int flush) if (ost->type == AVMEDIA_TYPE_VIDEO) fd->frame_rate_filter = av_buffersink_get_frame_rate(filter); - enc_frame(ost, filtered_frame); + ret = enc_frame(ost, filtered_frame); av_frame_unref(filtered_frame); + if (ret < 0) + return ret; + ofp->got_frame = 1; } }