From patchwork Sat Dec 31 16:56:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bodecs Bela X-Patchwork-Id: 2000 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp3312272vsb; Sat, 31 Dec 2016 08:56:19 -0800 (PST) X-Received: by 10.194.231.8 with SMTP id tc8mr43330391wjc.193.1483203379685; Sat, 31 Dec 2016 08:56:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lf8si13603334wjc.41.2016.12.31.08.56.19; Sat, 31 Dec 2016 08:56:19 -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; 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 6F2BB689C39; Sat, 31 Dec 2016 18:56:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.vivacom.hu (mail.vivacom.hu [217.173.41.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59B66689214 for ; Sat, 31 Dec 2016 18:56:06 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by mail.vivacom.hu (Postfix) with ESMTP id 5A68B872A4 for ; Sat, 31 Dec 2016 17:56:10 +0100 (CET) X-Virus-Scanned: amavisd-new at example.com Received: from mail.vivacom.hu ([127.0.0.1]) by localhost (mail.vivacom.intra [127.0.0.1]) (amavisd-new, port 10024) with LMTP id hUJL2M4GIlzV for ; Sat, 31 Dec 2016 17:56:07 +0100 (CET) Received: from [192.168.3.9] (pool-dsl-2f-00fd.externet.hu [217.173.47.253]) by mail.vivacom.hu (Postfix) with ESMTPA id 7BEC2879A0 for ; Sat, 31 Dec 2016 17:56:06 +0100 (CET) References: <20161230171111.GA26868@sunshine.barsnick.net> <8e080f1c-0567-eba6-ccd1-e1bd94abf7ac@vivanet.hu> To: ffmpeg-devel@ffmpeg.org From: Bodecs Bela Message-ID: <37d0a6e0-0681-95ef-02d9-c3ffacc0467d@vivanet.hu> Date: Sat, 31 Dec 2016 17:56:09 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] libavformat/hlsenc: default segment name and, use_localtime X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" 2016.12.31. 14:19 keltezéssel, Steven Liu írta: > 2016-12-31 19:16 GMT+08:00 Bodecs Bela : > >> >> 2016.12.31. 11:48 keltezéssel, Steven Liu írta: >> >>> 2016-12-31 1:24 GMT+08:00 Bodecs Bela : >>> >>> 2016.12.30. 18:11 keltezéssel, Moritz Barsnick írta: >>>> On Fri, Dec 30, 2016 at 15:38:25 +0100, Bodecs Bela wrote: >>>>> is not available on all system/environment. This patch checks %s >>>>>> availabilty at runtine and alter the default format string if >>>>>> necessary. >>>>>> >>>>>> You forgot to add the patch. >>>>> please, forgive me. I attached it now. >>>> >>>> Moritz >>>>> _______________________________________________ >>>>> ffmpeg-devel mailing list >>>>> ffmpeg-devel@ffmpeg.org >>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>> >>>>> Bela >>>> _______________________________________________ >>>> ffmpeg-devel mailing list >>>> ffmpeg-devel@ffmpeg.org >>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>> >>>> Signed-off-by: Bela Bodecs >>>> >>> --- >>> libavformat/hlsenc.c | 11 ++++++++++- >>> 1 file changed, 10 insertions(+), 1 deletion(-) >>> >>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c >>> index c9d8e3c..76b85e8 100644 >>> --- a/libavformat/hlsenc.c >>> +++ b/libavformat/hlsenc.c >>> @@ -829,13 +829,22 @@ fail: >>> return err; >>> } >>> >>> +static const char * get_default_pattern_localtime_fmt(void) >>> +{ >>> + char b[21]; >>> + time_t t = time(NULL); >>> + struct tm *p, tmbuf; >>> + p = localtime_r(&t, &tmbuf); >>> + return (strftime(b, sizeof(b), "%s", p) > 2) ? "-%s.ts" : >>> "-%Y%m%d%H%I%S.ts"; >>> Why check strftime result bigger than 2,not 1 not 3? >>> >> I have faced different strftime behaviours on two different environments >> where unknown specifier was in format string. >> On one of them strftime returned 0, this was the expected return value by >> me. >> But on the other one, strftime returned 2 and put unknown specifier (%s) >> as is into the result buffer. >> So >2 will handle each cases. In normal behaviour, nowadays, length of >> seconds string will be always longer than 2. >> Should I put a comment about it into the code? > Maybe add a comment for the value 2 is better. you are right. I have changed the testing line to be more self-explanatory. I have attached the new patch. >> >> +} >>> + >>> static int hls_write_header(AVFormatContext *s) >>> { >>> HLSContext *hls = s->priv_data; >>> int ret, i; >>> char *p; >>> const char *pattern = "%d.ts"; >>> - const char *pattern_localtime_fmt = "-%s.ts"; >>> + const char *pattern_localtime_fmt = >>> get_default_pattern_localtime_fmt(); >>> const char *vtt_pattern = "%d.vtt"; >>> AVDictionary *options = NULL; >>> int basename_size; >>> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel From 5f1b673d9ee48139ebe5f3d26bae9c2195e92678 Mon Sep 17 00:00:00 2001 From: Bela Bodecs Date: Fri, 31 Dec 2016 17:54:39 +0100 Subject: [PATCH] libavformat/hlsenc: default segment name and use_localtime in hlcenc.c, in the hls_write_header() function the default format string for strftime() function contains %s specifier when use_localtime is true. This %s specifier will insert the seconds since EPOCH. But %s is not available on all system/environment. This patch check %s availabilty at runtine and alter the default format string if necessary. Signed-off-by: Bela Bodecs --- libavformat/hlsenc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index c9d8e3c..57fc9c1 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -829,13 +829,23 @@ fail: return err; } +static const char * get_default_pattern_localtime_fmt(void) +{ + char b[21]; + time_t t = time(NULL); + struct tm *p, tmbuf; + p = localtime_r(&t, &tmbuf); + // no %s support when strftime returned error or left format string unchanged + return (!strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%I%S.ts" : "-%s.ts"; +} + static int hls_write_header(AVFormatContext *s) { HLSContext *hls = s->priv_data; int ret, i; char *p; const char *pattern = "%d.ts"; - const char *pattern_localtime_fmt = "-%s.ts"; + const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(); const char *vtt_pattern = "%d.vtt"; AVDictionary *options = NULL; int basename_size; -- 2.5.3.windows.1