From patchwork Thu Jul 20 09:52:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4383 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1921948vsb; Thu, 20 Jul 2017 02:55:02 -0700 (PDT) X-Received: by 10.223.151.135 with SMTP id s7mr2998393wrb.231.1500544502928; Thu, 20 Jul 2017 02:55:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500544502; cv=none; d=google.com; s=arc-20160816; b=QPeErxazTvqPQSxvgVwlGPo/ev2PxdemYUTRj0zhVWpN1q+xRm+6Z+nXbMhVZDbNKP k52P75Fg/OsunecmfeK1rb9SbWzfJa2Hn1IwgjHKhHIjyJvXE53b8QcEXqmY0N1Wnuw+ 56WH+SZzaOshwIpgugwrBzs+IH3mZjyEy3XQSb8sZ788ONtoWUgHebzBD3SBAGR34j+U WZu08+ncvIHLL06CJ/27kOqlpiXiZmb49G0En1BhSb9/5rjc6tDvc0FG74m8HoqQ/IC+ 9PbzzYUfP9zNSXwkWAeRgCAl5ogiTUSLsBfLnRoo/YL1hNC/x34Hvfx+4tDk9siaaRQT 5NLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=vsG8RRKe0Syn3ikUhkPQN8g4MB9OhueN8oylN8cdrbs=; b=FABBsnsBFiSzmThOeKfsnSGKDPwO61cXmdUzrgD4fwPKHscGwpeIt/C3pETP7w5DiJ ABWVHj5P+PPuVpEmAC4I+5yq1wR673Xz7NjYJpZXrAT2Cx4ZiqHgDaJq24TAbZ8837O8 g0v6lazCB3cVDqIh++yxk288ozS1bn6RnLdAEKGuJwuvBH4k3L64Y3vifKbByz30aKEh +72K6hzMD2Q5fraXUat6NHjiTHVuVRNzePqqK+oW/2P7AU4ISkh++wNVLie+REmCQPIz Ti0bfkRMD/4BDDiuV23m701joMqHTPXchIhYpPtNvcwTx+E3Q+rMRC8dZCkCeLHcTgJZ unFw== 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 93si5594251wro.213.2017.07.20.02.55.02; Thu, 20 Jul 2017 02:55:02 -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 DE6DE68839D; Thu, 20 Jul 2017 12:54:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg352.qq.com (SMTPBG352.QQ.COM [183.57.50.167]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9A3A680986 for ; Thu, 20 Jul 2017 12:54:44 +0300 (EEST) X-QQ-mid: bizesmtp16t1500544382tl1nn9oi Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Thu, 20 Jul 2017 17:53:01 +0800 (CST) X-QQ-SSF: 01100000004000F0FG41000A0000000 X-QQ-FEAT: IBShUBz8YqRq/OEUhEgY3qU5kR2ob9lCnCFVv+6kj6lgWgeSoShiVOPMTsi0g S6yiPbvCtazu8takvslmZ8s9roNWbgZ3V7RgYit/s4lD93FdX7D+FsUnGfWUmbE+qnqBwDl aLoYgC6xDa5OnCaLagqG06FzO1WAvnEP3xgyrTosGhgMBOIgncYna79nLKY4aPUBYp7/IVW NOF4C/uQPCgw/xytp/i/q94A0aZWDojUKTKYWRAxlY2diApcp9ccO3M4HuB0wkBlnMYc6wS mFCeVDiK+THPb5QmqLdO7Zf7I= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2017 17:52:57 +0800 Message-Id: <20170720095257.11314-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20170720060824.9057-1-lq@chinaffmpeg.org> References: <20170720060824.9057-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix hls fmp4 extention name bug 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 Cc: Steven Liu , Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ticket-id: #6541 when use hls fmp4 muxer, the extention name is not .m4s, this code can fix it. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 8a233270b5..911f6068c2 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1286,14 +1286,19 @@ fail: return err; } -static const char * get_default_pattern_localtime_fmt(void) +static const char * get_default_pattern_localtime_fmt(AVFormatContext *s) { char b[21]; time_t t = time(NULL); struct tm *p, tmbuf; + HLSContext *hls = s->priv_data; + p = localtime_r(&t, &tmbuf); // no %s support when strftime returned error or left format string unchanged // also no %s support on MSVC, which invokes the invalid parameter handler on unsupported format strings, instead of returning an error + if (hls->segment_type == SEGMENT_TYPE_FMP4) { + return (HAVE_LIBC_MSVCRT || !strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%M%S.m4s" : "-%s.m4s"; + } return (HAVE_LIBC_MSVCRT || !strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%M%S.ts" : "-%s.ts"; } @@ -1303,16 +1308,19 @@ static int hls_write_header(AVFormatContext *s) int ret, i; char *p; const char *pattern = "%d.ts"; - const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(); + const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s); const char *vtt_pattern = "%d.vtt"; AVDictionary *options = NULL; int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); int basename_size; int vtt_basename_size; - if (hls->segment_type == SEGMENT_TYPE_FMP4 && byterange_mode) { - av_log(s, AV_LOG_WARNING, "Have not support fmp4 byterange mode yet now\n"); - return AVERROR_PATCHWELCOME; + if (hls->segment_type == SEGMENT_TYPE_FMP4) { + if (byterange_mode) { + av_log(s, AV_LOG_WARNING, "Have not support fmp4 byterange mode yet now\n"); + return AVERROR_PATCHWELCOME; + } + pattern = "%d.m4s"; } if ((hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH) || (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_FORMATTED_DATETIME)) {