From patchwork Mon Oct 31 12:55:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Haupt X-Patchwork-Id: 39088 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp899320pzj; Mon, 31 Oct 2022 05:55:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM64czDgdfhy1zW80jFM2rQy/u+s00oo3e/kHi7zHOygZWT2sxkJhEVDy1pVV2dD0iHt6AHN X-Received: by 2002:a17:907:6d8a:b0:7ad:d3a1:cbf6 with SMTP id sb10-20020a1709076d8a00b007add3a1cbf6mr4187868ejc.533.1667220957133; Mon, 31 Oct 2022 05:55:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667220957; cv=none; d=google.com; s=arc-20160816; b=lAuUOH9ytP1bFZbjHBv9TddH2i+e5Cp6l20FcyjuSIt7vVVwYVR3wIx7als6srBHrz SejxeUBJcA6zv1eRWzaaPQSCuKI5m3aCRpm8bPqoB2flb1snDrovXBLycKoYD16KeG0j IVJR9D2hnksj0b3Qw92lFaMW4Ryc/glQPjKHnl6MmlYXV5J59N2iX/5wSXGo0medDF3+ OrMbIBStD01WOT9Qq40CPyi88Y3SWKANYXfiAHmQzQxOmDovooU5DabI+B9Vwkd6Azhx lu0hNPhFkH0rYol+BXPaUllksepyXtjzbf8X7AVnXeBQnOb6i9TnfDGIJ5qQThufmzYK C60A== 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=YljsDJX5V+ytZwbwzcBskJO+W6Uh7bPAvCjqWhJIt8w=; b=qYGOS9jpVFlVIbQrt+7aN0beufElfz1or4g/TGuynOuTOuvpwP6PjErkCvRJqEmkx8 j7dxLN6Ar21tFCygOC8I4txrtDEjuus8YBr+VIAYqKSojzitElnKUvntPUDVE7ejBCyH PXWtVPgOXtz2aKH1gRjpKb4jfc+zwcvOCbtxq/DKhunXp8tHvuqiPpP4/T7+Mu6B1Qnw 7iysHsETbV/FXWlOi3F/exaBRA+s/CmNk9i0hqd61SO+phYb96RFgUiF7AIFQAHDtWXu O6orZXMNipT3a2PCi6PZ0EGokjA0ErA6YEvIzC/LV1pWW7bVUV3IyLNxmtF0mM3Ftc2c 74tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZPN8cBMA; 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 hq28-20020a1709073f1c00b00782bb167cb6si8911156ejc.80.2022.10.31.05.55.56; Mon, 31 Oct 2022 05:55:57 -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=ZPN8cBMA; 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 B266D68BE2B; Mon, 31 Oct 2022 14:55:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 586AB68BE1B for ; Mon, 31 Oct 2022 14:55:45 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id k8so15874595wrh.1 for ; Mon, 31 Oct 2022 05:55:45 -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=cdwqTebHFEgwRqIWtZrSMVpJk52SnFCfOg/kNRElkpg=; b=ZPN8cBMAk1n2NMuffy9abCJEinX1zGLifo5KQopcQvxSHeUZEDtwykcCXia0naXzWu GrMwazlDlHkWIdZA21OMCkfjDUN6ToEpUX9RSH7AYvYmzk4c0J8hIfNtv81yZof5QjX3 K0mBmzUmmygIANpGi0bHR1JO2T0wZvGZlg6DGVjC1KDtZZup/1J/9T7zzwpwmj9/LQtl 1f5+rjHVI6l4pat5FcRiMgOnm1+fh5OKUEAw8PW3bn/ZjRYm7ABd8Ai51t8kOIM109YH KrW2kjssFwK5uxbufxE5JHtq9WkDUMA9QrSv44gSdRdskawh1ir4W9IFi0hebOzIJwOk xZPA== 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=cdwqTebHFEgwRqIWtZrSMVpJk52SnFCfOg/kNRElkpg=; b=SYwJQ8nEIOr4eET67k1AQ6SNOp7tRwV0u1h0HeoOUPb5hZe/Hf7g7JdmySy5dtpTBU hQBO8fCgPGMuk5ro1QjtSB0RkIzHFaLYxsZf2y4ZMjdOCVqjyCYzQoaXjcJ+Lkxl56fQ gjdUxHyPaZPNQjHsFljbquv5Cy88UgywWzYLs4D3ibSgnd/jGoMLDdkkrz1vrJkaMVTH gPPqp8AbD2C7UxKy0JSP+UGgTj96Yb36sTxDE78AjYkiLV2ebbddlHKMrgW8/oPYAw6c vKO5Dd2/14FOs5fpOjYPhGqJguImrkMpmsPOPl5IQzsSLADmutX/ELposbRgdf/Q2PCI j+cA== X-Gm-Message-State: ACrzQf2JPrz/jBHUELhC7ZGtclaoHOxTxsw92U5Viz+2JXr/OZAOQdco Jl7we03k1mq8HT9pHbFC+B6+3RPIchQ= X-Received: by 2002:adf:e484:0:b0:236:6a2e:154e with SMTP id i4-20020adfe484000000b002366a2e154emr7882574wrm.664.1667220944469; Mon, 31 Oct 2022 05:55:44 -0700 (PDT) Received: from localhost.localdomain ([80.122.30.74]) by smtp.gmail.com with ESMTPSA id q8-20020a05600c46c800b003b4868eb71bsm6837295wmo.25.2022.10.31.05.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 05:55:44 -0700 (PDT) From: Wolfgang Haupt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Oct 2022 13:55:37 +0100 Message-Id: <20221031125537.214216-2-haupt.wolfgang@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031125537.214216-1-haupt.wolfgang@gmail.com> References: <20221031105645.75816-2-haupt.wolfgang@gmail.com> <20221031125537.214216-1-haupt.wolfgang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mpegts: Add "no packet" timeout option 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: s8ZLsDdztki0 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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d97702fcd7..45bf82f61c 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,7 @@ 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; if (avio_tell(s->pb) != ts->last_pos) { int i; @@ -2996,8 +3006,14 @@ 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++; + if (ts->packet_read_timeout > 0 && (av_gettime_relative() - 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);