From patchwork Mon Oct 31 10:56:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Haupt X-Patchwork-Id: 39086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp836525pzj; Mon, 31 Oct 2022 03:57:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5W/1/RF81ok+Khh29SNin5oJ4dqRbXz8U+x0WvkqOdx59S+vQqxddwDpy0LXl0TUlWyyiR X-Received: by 2002:a17:907:1b1f:b0:72f:56db:cce9 with SMTP id mp31-20020a1709071b1f00b0072f56dbcce9mr11855685ejc.605.1667213831938; Mon, 31 Oct 2022 03:57:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667213831; cv=none; d=google.com; s=arc-20160816; b=a4RTbq1mtTZ8jNN35G38vrxqcYNynaXyUUM16OP67hRFUTnMMWVU7wErNNomjh58Rb m9u4AKHWKrGb84WunWPA2XiBUcMbZ9YMcYJX4ApBt/JL6PuBAk7DedfHvwmc0+AUAcV6 Mvs140RDGNG8s9Eg6eumGpUvVyQRq4r96vlmoMOPSA0LVtMeaYNt/PraRK+oe2hZuVke T4cRlLogRyIhA7NFFZZiNoGweS9BI1tUmyyPmU+g8nHczRSf0tw4Z/A0CGaOdi1OTuEn oW9SROP4Z/TgB1TJEn7eSHwO1Mbftr7dbEdD1L7iAJgIZ64Ef2byFjrnwwvpVJN9b1t5 sKfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:dkim-signature:delivered-to; bh=hsGH4qECqYLRpPwc9DlJfIhi69NuVRsGsy6NC6NhG/k=; b=LtTDfHk6Id/WoHZW6YqmVb+H32nYUd/cuWYZyXwLr+exUnAASX5M9BUEw3QypYkPi2 413WT9xlRmP1IZ4GtHnUWIcCw3UsOY9G/MU0e18j9yQCQtEmMHswpJ6tHC+c/GgSgpKv 735SaR2UTggGj3cda8LpDdMpW9e+hShJI20u5HZ+8s/MIfxDOHGY3XlUrj7jD3e6L64a oNa7B1i3MqgJ7UrC6E92TRPJCGYFY5CFL+8VuDyYV0QEDmJj4/GUwOUW4szzOHaJuJfI r9u6dgkYLoP/ev22tHTzJ35UHtldF8TMJ0BUpsqXtVLNGu0EUIdcZ1lx/2f3lcxU3SoL 4Fhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="f/7GpB+c"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a70-20020a509ecc000000b0046195676c75si6911478edf.536.2022.10.31.03.57.11; Mon, 31 Oct 2022 03:57:11 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="f/7GpB+c"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B54D68BD7D; Mon, 31 Oct 2022 12:57:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F005668BE02 for ; Mon, 31 Oct 2022 12:56:56 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id cl5so3751307wrb.9 for ; Mon, 31 Oct 2022 03:56:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FJ1/iJqKyLzddttR6Sgx1p1t4PoOLaeCIhGqWBsjoiM=; b=f/7GpB+cKBgKQ+m21dPyZFUXuABdhpknsLfE20gQavy5WiCIFDh3Fx+OaLDMvKDPPn wj1BsQoKv1rsDDrB5Iq14bklDXSDRRWkWHD/micbZ/eziJNeTBi7djG35HbaTBSc+Kh0 ce7aOLSzlHkvtUlZ6gvgyvjAGpgj+AYOHfUxzWW1QURFQX1IuquScYvP7NrSO0GuRTSl xbKHfgKoKsg3z8PsJtSI3E3NERcqqrxJw/L3kkiX7u+WvQCJ+IOLcUKk0qOmNjH+ZzJ5 CXIViAp3Wta1FldFrECvwR+ihCZfqhe27LtpDY+r8dtz0q+AYiy1ZpfgzPP8+FStkECQ 1Ftg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FJ1/iJqKyLzddttR6Sgx1p1t4PoOLaeCIhGqWBsjoiM=; b=sLClaLtSbg2JAjGotdput0QnUiLUWFXaXuVoNPEMdipSSLJ2q3+ETf3J2SiHEVwIdD ZZJimCHV76FZm1WUZOb2sfhn7SJKd58yfhQ9xBrZ1WG6B8sOusfjlWw4bDSQITkdScgu qqqooQcvqDsuE/Co3MshJ6fvqKpQk0Ej2OQ1ZBnavRAqZxoEX2PfbgizPufYf72uVjnY 8n1vgSDwh+PZmpYYfKh63YzvLyELqVsGmiQ6FnbYa2O5nPONG+/a3nBXkNibCcHqskLo RJcCQBmNt3ANDDpstRghA/hbpnax2KKkvURc98PLysOUAQekim2ou7zJN9yXV4ssYrla fYGQ== X-Gm-Message-State: ACrzQf3Cx1jSbVQziFwOEYaCV4MGkDvli3nrx7SeDvH7NBv4bvUkaAGq jz7vFSZDPvg+fXEG5U7x+aJAJPhriZ4= X-Received: by 2002:a05:6000:5c4:b0:236:cbbb:5576 with SMTP id bh4-20020a05600005c400b00236cbbb5576mr2934182wrb.591.1667213816152; Mon, 31 Oct 2022 03:56:56 -0700 (PDT) Received: from localhost.localdomain ([80.122.30.74]) by smtp.gmail.com with ESMTPSA id s4-20020a7bc384000000b003c6f3e5ba42sm6828347wmj.46.2022.10.31.03.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 03:56:55 -0700 (PDT) From: Wolfgang Haupt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Oct 2022 11:56:45 +0100 Message-Id: <20221031105645.75816-2-haupt.wolfgang@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031105645.75816-1-haupt.wolfgang@gmail.com> References: <20221031105645.75816-1-haupt.wolfgang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] Add "no packet" timeout option for mpegts 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 Cc: Wolfgang Haupt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BBTZZiBNE5cw Retrieving an mpegts stream with only stuffed PAT, results in endless reading. This change adds a new timeout that specifies a timespan in AV_TIME_BASE units until when a full packet must be read successfully. Signed-off-by: Wolfgang Haupt --- libavformat/mpegts.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d97702fcd7..5b615cca63 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -32,6 +32,7 @@ #include "libavutil/opt.h" #include "libavutil/avassert.h" #include "libavutil/dovi_meta.h" +#include "libavutil/time.h" #include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" #include "libavcodec/get_bits.h" @@ -180,6 +181,12 @@ struct MpegTSContext { AVStream *epg_stream; AVBufferPool* pools[32]; + + /** + * Timeout in AV_TIME_BASE units, until at least one packet is read + * from the stream. + */ + int64_t packet_read_timeout; }; #define MPEGTS_OPTIONS \ @@ -203,6 +210,8 @@ static const AVOption options[] = { {.i64 = 0}, 0, 1, 0 }, {"max_packet_size", "maximum size of emitted packet", offsetof(MpegTSContext, max_packet_size), AV_OPT_TYPE_INT, {.i64 = 204800}, 1, INT_MAX/2, AV_OPT_FLAG_DECODING_PARAM }, + {"packet_read_timeout", "Maximum time utnil at least one packet is successfully read from the stream", offsetof(MpegTSContext, packet_read_timeout), AV_OPT_TYPE_INT64, + {.i64 = 0 }, 0, INT64_MAX, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, }; @@ -2972,6 +2981,8 @@ static int handle_packets(MpegTSContext *ts, int64_t nb_packets) const uint8_t *data; int64_t packet_num; int ret = 0; + time_t start = 0; + time_t now = 0; if (avio_tell(s->pb) != ts->last_pos) { int i; @@ -2996,8 +3007,15 @@ static int handle_packets(MpegTSContext *ts, int64_t nb_packets) ts->stop_parse = 0; packet_num = 0; memset(packet + TS_PACKET_SIZE, 0, AV_INPUT_BUFFER_PADDING_SIZE); + start = av_gettime_relative(); for (;;) { packet_num++; + now = av_gettime_relative(); + if (now - start > ts->packet_read_timeout) { + av_log(ts->stream, AV_LOG_TRACE, "No packet after %"PRId64"ms\n", ts->packet_read_timeout/1000); + break; + } + if (nb_packets != 0 && packet_num >= nb_packets || ts->stop_parse > 1) { ret = AVERROR(EAGAIN);