From patchwork Tue Nov 7 00:31:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Johansen X-Patchwork-Id: 44540 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7aa7:b0:181:818d:5e7f with SMTP id u39csp6999pzh; Mon, 6 Nov 2023 16:31:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFi0TbEpbOY6fi/JJJD8fA2nr3bCqSsc8eHNQXza/hmAQHrIDpeJD3iLBWCP+0dYsFbee7F X-Received: by 2002:a05:6402:19:b0:531:14c4:ae30 with SMTP id d25-20020a056402001900b0053114c4ae30mr988244edu.0.1699317112361; Mon, 06 Nov 2023 16:31:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699317112; cv=none; d=google.com; s=arc-20160816; b=gGCHE3nvnKdgzkXHwrQ26b033Lrnf8MwydrqbRklE+WsO8F2QdoqGms18QKl+aXlDj PMlqiiFQUcMwTGGBMb4DipFWohAzbZR2nhK41bf3UKD4qaSO0sHloBwKCroiv8kAAje/ QzD5rtvd0ADLVimUtXR2n40JbkYpIySJBA59gi6TXDjYe1lt55QbIcTPzsAgKWket0ZZ R8/1jxSYy5beZwGOxPZKJHAkNa3IXroiWFtv6tzHVDydj/oyjtGn2a6rtI8tA5KIBkOT Y86xMwQQszx4MZutaToZb4De75K8mXyHJfP/gEOSqAzFHmESvZFQoHAroZX+wlsAjmLU x5Ug== 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=9S8AydRDtStkw1V8hHxbh4Vh5aILMlmCP176ZHg3tlo=; fh=BNczk7MtTFTHa4uMdKY29AxmcfAa404kNGyDf0xbsP0=; b=T8tdjtaH2OvDbVYhbkQkYCzPk++N0M6LcBIAKzsn4HHfdDXDI3S7FHaZgMhmokKwxU f0MEtAMzh1srfuWoIxVGEz14Q0MO0WQGT8YdRW4OS2KFTv32I4/tAq4r2zWKvQy8ohDO JsUsHkY42ekVzBoJyke6rEgjhb5Pj6GdqY7FJGkQ/EN8ykTm8HYL0I17SYOhpWV8sqS7 CtYuh16dw9MCLE19qqhI1sQNBxp23UZKhhTyFGJid2d7G/x9D8DIfeNhqkgxqq4I6qc8 iW0SBP27EbCEOjPwWIG7p6xhryiluRS6Ej3KSobvh2G+i+Nl2D1IhkvIxvg9D1GPx/R6 NKbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=E6Qr3PEj; 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 i9-20020a05640242c900b005435bfe2c1bsi5052642edc.37.2023.11.06.16.31.51; Mon, 06 Nov 2023 16:31:52 -0800 (PST) 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=20230601 header.b=E6Qr3PEj; 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 120C968CAEE; Tue, 7 Nov 2023 02:31:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC1C268CADC for ; Tue, 7 Nov 2023 02:31:41 +0200 (EET) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6b497c8575aso5438417b3a.1 for ; Mon, 06 Nov 2023 16:31:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699317099; x=1699921899; darn=ffmpeg.org; 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=TR1GBkn2k1vHvI6q7WtbSfKqFC13Me78zaEOSv+oGGA=; b=E6Qr3PEjskkttJ0Othsma6nOV99iIq40yzs7UDXkZClCrtQVSXbFq+EERT++AZOUyI dGAxtMc2FIPm3vBj/zIaUc1FtVfHgjkcFFap6XZm0f6rdQOdEBN++T4Cen9SQ0BqQpJm dlFsVwYP8TXg2t0IewsP+lNHaqdiJtNiVKj/wyLcDDyNjN8BW7UA122zCLMC7tv5ZNS3 y5DjJ/MHebuxGe0EHQpkoEJoZ5aDsHOJEUftfmm7MhdIigwamL0nOo5Zs6EfokZJGLzm PGzIC3uSdayqNBvAQ1E0/Uh5IHBQQ2z7d5nc453+4xnUHYfpTGLC8y0m9IticRD0HZYJ SqCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699317099; x=1699921899; 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=TR1GBkn2k1vHvI6q7WtbSfKqFC13Me78zaEOSv+oGGA=; b=VX3wMgX/KqiYegu7j5rm+9sEAdKs/SDxepJ69z5MO72Q6HK5k48CcCJznJto6Jd8Po 0pm2dYA8qkGCjpYKB/N71QhTcNPBBVaDvZInGvRjkW8fRO1QalNNxMxQSrFFX24F74uF 3qKvqVAafWsWNd4IbnJytXmcpR052FHt9UOzNwa/6bOHx0uuVyXA/ulECr/2brE3k2dX ZUtYhjBOEAkv9dUaAHKTj1z2tz/b4Zr7AFMPnvezEzOT3A3Ey0Ta1ExkhedL6nYHq08J VEFTKWxHccduSSeUd0rqgpK3il7pcsUU7WfDR6LUKhg2suvm66y03wEhj0NkYUd7QUnj rlqQ== X-Gm-Message-State: AOJu0YwyixQkfCzCwkDiEWcNzsBhZeFMbBA2CiMcMNSGtB96FfcpeH3G +450ExO6VkcBEx+kAHI71UgDOc1C46OkOA== X-Received: by 2002:a05:6a20:a103:b0:13a:6bca:7a84 with SMTP id q3-20020a056a20a10300b0013a6bca7a84mr32935675pzk.44.1699317099196; Mon, 06 Nov 2023 16:31:39 -0800 (PST) Received: from localhost.localdomain ([2605:a601:a98f:6200:d85b:a019:b2dc:2b7e]) by smtp.gmail.com with ESMTPSA id u22-20020a1709026e1600b001c444f185b4sm6573501plk.237.2023.11.06.16.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:31:38 -0800 (PST) From: Dave Johansen To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Nov 2023 17:31:35 -0700 Message-Id: <20231107003135.15169-1-davejohansen@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <544b328c-e2a2-981-9f9c-e692d1d33c18@passwd.hu> References: <544b328c-e2a2-981-9f9c-e692d1d33c18@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Use existing function to parse time 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: Dave Johansen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xpdNMU3lIwvz --- libavformat/hlsenc.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index e1714d4eed..1baefe852f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -35,6 +35,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "libavutil/log.h" +#include "libavutil/parseutils.h" #include "libavutil/random_seed.h" #include "libavutil/time.h" #include "libavutil/time_internal.h" @@ -1251,27 +1252,6 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, return 0; } -static double parse_iso8601(const char *ptr) { - struct tm program_date_time; - int y,M,d,h,m; - double s; - int num_scanned = sscanf(ptr, "%d-%d-%dT%d:%d:%lf", &y, &M, &d, &h, &m, &s); - - if (num_scanned < 6) { - return -1; - } - - program_date_time.tm_year = y - 1900; - program_date_time.tm_mon = M - 1; - program_date_time.tm_mday = d; - program_date_time.tm_hour = h; - program_date_time.tm_min = m; - program_date_time.tm_sec = 0; - program_date_time.tm_isdst = -1; - - return mktime(&program_date_time) + s; -} - static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs) { HLSContext *hls = s->priv_data; @@ -1281,6 +1261,7 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs char line[MAX_URL_SIZE]; const char *ptr; const char *end; + int64_t parsed_time; double discont_program_date_time = 0; if ((ret = ffio_open_whitelist(&in, url, AVIO_FLAG_READ, @@ -1337,11 +1318,11 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs } } } else if (av_strstart(line, "#EXT-X-PROGRAM-DATE-TIME:", &ptr)) { - discont_program_date_time = parse_iso8601(ptr); - if (discont_program_date_time < 0) { + if (av_parse_time(&parsed_time, ptr, 0)) { ret = AVERROR_INVALIDDATA; goto fail; } + discont_program_date_time = parsed_time / 1000000.0; } else if (av_strstart(line, "#", NULL)) { continue; } else if (line[0]) { @@ -2933,6 +2914,7 @@ static int hls_init(AVFormatContext *s) int i = 0; int j = 0; HLSContext *hls = s->priv_data; + int64_t parsed_time; const char *pattern; VariantStream *vs = NULL; const char *vtt_pattern = hls->flags & HLS_SINGLE_FILE ? ".vtt" : "%d.vtt"; @@ -2942,11 +2924,11 @@ static int hls_init(AVFormatContext *s) double initial_program_date_time; if (hls->init_program_date_time) { - initial_program_date_time = parse_iso8601(hls->init_program_date_time); - if (initial_program_date_time < 0) { + if (av_parse_time(&parsed_time, hls->init_program_date_time, 0)) { av_log(s, AV_LOG_ERROR, "Invalid init_program_date_time\n"); return AVERROR(EINVAL); } + initial_program_date_time = parsed_time / 1000000.0; } else { initial_program_date_time = av_gettime() / 1000000.0; }