From patchwork Thu Jun 16 19:55:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36282 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1129312pzb; Thu, 16 Jun 2022 13:07:40 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tFqRVTPNQA6qhSt84TP4zjOrXrZwBWrTgCdWeqw3Jk5MrRBPiDEVywg/8yuHXbzT+4qyGB X-Received: by 2002:a05:6402:2812:b0:434:dcb3:c85 with SMTP id h18-20020a056402281200b00434dcb30c85mr8660277ede.1.1655410059843; Thu, 16 Jun 2022 13:07:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655410059; cv=none; d=google.com; s=arc-20160816; b=Ndj7s0vepNWhcBZkzDeZbmpHOBtfop/a5HPUZOqBWBwF34AU7UkzOJbO5et3duB29N dtKBefhCAV0vQd/4NUbJbqT8NKnHsk1z0jVWoNRlbkvIh0mrJNOtMcB3oUwFUzWrsmX3 r07bmkqPwus5kT7jp5lZ/cbno2OPmOhUSluzf3PDn+/q2hV5CAb9lOv6S/1sZQLXB3Zl K5QDMhb/FH/tLJqcDR+ONKGQifTX/cYHTujQDMO0dBa5r/KpxFC8CR1InZj7X2Qx4q/B VtQhYyarUJspVAQjifEU/EOsG6qCrse9ITPhLPlNBj3w8mr9ZEAVc0QC3PFArjESTsHR VpUQ== 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=nwK4feh3pF40cDXx98VX5sfWbwAVDQcF8iY25QhvfGA=; b=Zc2+3y8W/2lUUVPKutSLdqN6BlD27Wp4BnhcrmwYJJEltOFHvtXHp4OMtmn/fPpEr9 +3dTt+KbLKM76g80YZTQ5BgJoghuJzG1upDej+APhsaJ7jE8mWcQCVojEJlOemh4S+me /UpfqKeuUcrzx6tZgw5Ym+H/laEFbcCnjqVc0LIF4GbUi+goIEtNDWwn8TqB84WQR3+/ LjhHeSy6EwCf3L3qtNb79QFwCyuprguFOGUdUAIWEwiAF/LWo6W/fgJAUXKztnOhBdk6 1HCNoLCuohYu7Q2jqjEivB9iHC39K/eEhy5B5IWWnI0SgrNDFMCUSc/wnzAUNvClhJ1E qvOA== 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 er17-20020a056402449100b004355e4ebcd3si112232edb.344.2022.06.16.13.07.39; Thu, 16 Jun 2022 13:07:39 -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 2B05868B8D5; Thu, 16 Jun 2022 23:04:05 +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 AC81668B874 for ; Thu, 16 Jun 2022 23:03:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6E2E6240175 for ; Thu, 16 Jun 2022 22:03:47 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Z7UDBqecv3J3 for ; Thu, 16 Jun 2022 22:03:46 +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 91EB224069A for ; Thu, 16 Jun 2022 22:03:34 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 0771A3A21BB; Thu, 16 Jun 2022 22:03:31 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Jun 2022 21:55:28 +0200 Message-Id: <20220616195534.5278-29-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 29/35] fftools/ffmpeg_mux: return errors from 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: ZQ8b9Uk1JXDc Do not call exit_program(), as that would conflict with moving this code into a separate thread. --- fftools/ffmpeg_mux.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 490e0e54eb..98d3adaeac 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -200,7 +200,7 @@ static void write_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) } } -static void submit_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) +static int submit_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) { if (ost->sq_idx_mux >= 0) { int ret = sq_send(of->sq_mux, ost->sq_idx_mux, SQPKT(pkt)); @@ -209,17 +209,17 @@ static void submit_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) 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(of->mux->sq_pkt)); if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) - return; + return 0; else if (ret < 0) - exit_program(1); + return ret; write_packet(of, output_streams[of->ost_index + ret], of->mux->sq_pkt); @@ -230,6 +230,8 @@ static void submit_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) else ost->finished |= MUXER_FINISHED; } + + return 0; } int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) @@ -237,7 +239,7 @@ int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) int ret; if (of->mux->header_written) { - submit_packet(of, ost, pkt); + return submit_packet(of, ost, pkt); } else { /* the muxer is not initialized yet, buffer the packet */ ret = queue_packet(of, ost, pkt); @@ -348,11 +350,13 @@ int of_check_init(OutputFile *of) ost->mux_timebase = ost->st->time_base; while (av_fifo_read(ms->muxing_queue, &pkt, 1) >= 0) { - submit_packet(of, ost, pkt); + ret = submit_packet(of, ost, pkt); if (pkt) { ms->muxing_queue_data_size -= pkt->size; av_packet_free(&pkt); } + if (ret < 0) + return ret; } }