From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BD4DB498CA for ; Wed, 21 Feb 2024 09:58:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 060D268D1A0; Wed, 21 Feb 2024 11:58:00 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA7B168D173 for ; Wed, 21 Feb 2024 11:57:50 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=SD3NDtfv; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7DB8AFE1 for ; Wed, 21 Feb 2024 10:57:50 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id owy7eahP56lA for ; Wed, 21 Feb 2024 10:57:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708509469; bh=IROCoH6iZF0R3PtTWoHdnPKtqoo8SfHY4IRiSroNE7I=; h=From:To:Subject:Date:In-Reply-To:References:From; b=SD3NDtfv7s336BWbf+ad69sLilN7FAxMjPXIy6L92sAWQtN62xuN9Dys3QRMJsHJ7 yW+idksBmipVz4F7HjZHNimMVngYnl38vSjBreYOi7EpFqGYpqi1kqkQPPUmtrr37b 8GjNu95lOcLoT4nzZrhxzaxnU8giYeQceaqdOBRzPyjBBOJQYCt8OV+/ed1VloTdOQ i32UqVdx+k4fDZpdMaBZCTT/lQ+5lYME0c4JBBZTITIZzDDozp+qUjOL+hhSOwTj3J +XVL/dFJmuMIyVWGhPAPp0M+nQAZk5FAMLZdX3ckgB6iIS/kPmQPTCrrkkkCDbMxJP 8fAswgWHaC4Pg== 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 mail1.khirnov.net (Postfix) with ESMTPS id 21D3D4462 for ; Wed, 21 Feb 2024 10:57:49 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 095DE3A218D for ; Wed, 21 Feb 2024 10:57:49 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Feb 2024 10:56:48 +0100 Message-ID: <20240221095648.5175-3-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240221095648.5175-1-anton@khirnov.net> References: <20240221095648.5175-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_sched: remove a triggerable assert in send_to_enc_sq() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It can be triggered when send_to_enc_thread() returns AVERROR(ENOMEM). Propagate the error to the caller instead. Reported-by: Andreas Rheinhardt --- fftools/ffmpeg_sched.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/fftools/ffmpeg_sched.c b/fftools/ffmpeg_sched.c index cb9d8c6905..1144fce958 100644 --- a/fftools/ffmpeg_sched.c +++ b/fftools/ffmpeg_sched.c @@ -1541,31 +1541,34 @@ static int send_to_enc_sq(Scheduler *sch, SchEnc *enc, AVFrame *frame) // TODO: the SQ API should be extended to allow returning EOF // for individual streams ret = sq_receive(sq->sq, -1, SQFRAME(sq->frame)); - if (ret == AVERROR(EAGAIN)) { - ret = 0; - goto finish; - } else if (ret < 0) { - // close all encoders fed from this sync queue - for (unsigned i = 0; i < sq->nb_enc_idx; i++) { - int err = send_to_enc_thread(sch, &sch->enc[sq->enc_idx[i]], NULL); - - // if the sync queue error is EOF and closing the encoder - // produces a more serious error, make sure to pick the latter - ret = err_merge((ret == AVERROR_EOF && err < 0) ? 0 : ret, err); - } - goto finish; + if (ret < 0) { + ret = (ret == AVERROR(EAGAIN)) ? 0 : ret; + break; } enc = &sch->enc[sq->enc_idx[ret]]; ret = send_to_enc_thread(sch, enc, sq->frame); if (ret < 0) { - av_assert0(ret == AVERROR_EOF); av_frame_unref(sq->frame); + if (ret != AVERROR_EOF) + break; + sq_send(sq->sq, enc->sq_idx[1], SQFRAME(NULL)); continue; } } + if (ret < 0) { + // close all encoders fed from this sync queue + for (unsigned i = 0; i < sq->nb_enc_idx; i++) { + int err = send_to_enc_thread(sch, &sch->enc[sq->enc_idx[i]], NULL); + + // if the sync queue error is EOF and closing the encoder + // produces a more serious error, make sure to pick the latter + ret = err_merge((ret == AVERROR_EOF && err < 0) ? 0 : ret, err); + } + } + finish: pthread_mutex_unlock(&sq->lock); -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".