From patchwork Wed Aug 3 13:58:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37104 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp458005pzb; Wed, 3 Aug 2022 07:00:09 -0700 (PDT) X-Google-Smtp-Source: AA6agR4o9oi1cfi3lDpM+OTFDal01WluHAi3YzSRaJ8FkNvDEpwiY9B1SpSeDCXDaiuPnArWo/Wc X-Received: by 2002:a17:906:cc0c:b0:730:8bbb:69ac with SMTP id ml12-20020a170906cc0c00b007308bbb69acmr10786149ejb.392.1659535209425; Wed, 03 Aug 2022 07:00:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659535209; cv=none; d=google.com; s=arc-20160816; b=Aaril2qXdjf1AZfU/u5bcAu+N8OL9JcBS5S9dPm0sx04avq7rxMurmftB7XlzIixqO 45DNZWsiuFUM7Qq4TFHAMlPghQkqhyPC70Mw3BxKzM8D4fTpCjTqWUcUoCpu2rS7YpZk FYYlyQlCtCJAwBnf+KLNp8ZfLF83BDKTQKeVVWKAXhTeXpc9DfyJHXnpf8cSE5nwfvMV SZDXlXh52dCLhNZWdnGzze58GZuBlV9QZ7o6830JXItoy19UdrLMtNhK2j1BzdJtDSfv wM0Krfrtl5q7oOTI0G7t08/bwyLfgbra1WwMhwgUYRflz+geKasiITt/siUvYMlxp7IQ IJmQ== 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=2mLmImSZeoD4Iqnxiw+sMZyqC/B8h+c6G8fEyMSIDqg=; b=rj1bnoeJPcw8dklx1zUaFUYN3iOixQkUkNYUQ61AO6eg5p2vGMn3NiDMAu3hV5miQS 3G1fhFTIYiL7efIHDPztNZ8NNGXF9beAt44ByUaLcWc73TJ+8u3f6j3hAxpLIbtwDB9B ClJQF6VspYuq6z6vXPSdWvjFWu4G6ERU3fs9OVVxk0Ap3fiSHHSOKbCzu4TidJnzlrDd CWwuTSF2dekLbNy9L3nR6DTdTIo9f3wlJZn1iztqp/crwhopcC5MvnsaLgWTZPa3nGPc yHFFIkrpZ8I9v7tnKPmZa7su8IPIBipjlymOfCv20LyoSYuDYyH2OyUQPFeDr8XyacI8 6reQ== 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 a21-20020a1709066d5500b00730a1a86524si3406961ejt.112.2022.08.03.07.00.08; Wed, 03 Aug 2022 07:00:09 -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 8EFA668B906; Wed, 3 Aug 2022 16:59:09 +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 E8D7D68B7EB for ; Wed, 3 Aug 2022 16:59:02 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0387324017E for ; Wed, 3 Aug 2022 15:59:02 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 0WAp0JOHfEUj for ; Wed, 3 Aug 2022 15:59:01 +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 00F5C240590 for ; Wed, 3 Aug 2022 15:58:55 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 55B423A0A45; Wed, 3 Aug 2022 15:58:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 15:58:44 +0200 Message-Id: <20220803135844.16662-25-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220803135844.16662-1-anton@khirnov.net> References: <20220803135844.16662-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 25/25] fftools/ffmpeg: move handling corrupt packets to the input thread 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: s1gMDyW11Anx --- fftools/ffmpeg.c | 7 ------- fftools/ffmpeg_demux.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a9eda3c33e..09a4d20028 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3729,13 +3729,6 @@ static int process_input(int file_index) if (ist->discard) goto discard_packet; - if (pkt->flags & AV_PKT_FLAG_CORRUPT) { - av_log(NULL, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, - "%s: corrupt input packet in stream %d\n", is->url, pkt->stream_index); - if (exit_on_error) - exit_program(1); - } - if (debug_ts) { av_log(NULL, AV_LOG_INFO, "demuxer -> ist_index:%d type:%s " "next_dts:%s next_dts_time:%s next_pts:%s next_pts_time:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s off:%s off_time:%s\n", diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index af54ea3de1..097a6e3d1d 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -165,6 +165,17 @@ static void *input_thread(void *arg) continue; } + if (pkt->flags & AV_PKT_FLAG_CORRUPT) { + av_log(NULL, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, + "%s: corrupt input packet in stream %d\n", + f->ctx->url, pkt->stream_index); + if (exit_on_error) { + av_packet_unref(pkt); + ret = AVERROR_INVALIDDATA; + break; + } + } + msg.pkt = av_packet_alloc(); if (!msg.pkt) { av_packet_unref(pkt);