From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 95FF846228
for <ffmpegdev@gitmailbox.com>; Thu, 13 Jul 2023 11:01:04 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55A6A68C716;
Thu, 13 Jul 2023 13:58:13 +0300 (EEST)
Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0788C68C6A4
for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Jul 2023 13:57:49 +0300 (EEST)
Received: from localhost (localhost [IPv6:::1])
by mail0.khirnov.net (Postfix) with ESMTP id DFCA62404EE
for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Jul 2023 12:57:47 +0200 (CEST)
Received: from mail0.khirnov.net ([IPv6:::1])
by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024)
with ESMTP id Q76JzpLa-77G for <ffmpeg-devel@ffmpeg.org>;
Thu, 13 Jul 2023 12:57:47 +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 9760E2406CE
for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Jul 2023 12:57:41 +0200 (CEST)
Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1])
by libav.khirnov.net (Postfix) with ESMTP id D61EE3A1A05
for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Jul 2023 12:57:35 +0200 (CEST)
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 13 Jul 2023 12:55:40 +0200
Message-Id: <20230713105553.21052-20-anton@khirnov.net>
X-Mailer: git-send-email 2.40.1
In-Reply-To: <20230713105553.21052-1-anton@khirnov.net>
References: <20230713105553.21052-1-anton@khirnov.net>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 20/33] fftools/ffmpeg: handle error codes
from process_input_packet()
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20230713105553.21052-20-anton@khirnov.net/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
None are returned for now, but that will change in future commits.
---
fftools/ffmpeg.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 68924d21e0..dd7cfcf632 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1103,6 +1103,8 @@ static int process_input(int file_index)
ret = process_input_packet(ist, NULL, 0);
if (ret>0)
return 0;
+ else if (ret < 0)
+ return ret;
}
/* mark all outputs that don't go through lavfi as finished */
@@ -1124,11 +1126,11 @@ static int process_input(int file_index)
sub2video_heartbeat(ifile, pkt->pts, pkt->time_base);
- process_input_packet(ist, pkt, 0);
+ ret = process_input_packet(ist, pkt, 0);
av_packet_free(&pkt);
- return 0;
+ return ret < 0 ? ret : 0;
}
/**
@@ -1219,7 +1221,8 @@ static int transcode(int *err_rate_exceeded)
float err_rate;
if (!input_files[ist->file_index]->eof_reached) {
- process_input_packet(ist, NULL, 0);
+ int err = process_input_packet(ist, NULL, 0);
+ ret = err_merge(ret, err);
}
err_rate = (ist->frames_decoded || ist->decode_errors) ?
--
2.40.1
_______________________________________________
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".