From patchwork Fri Jul 21 15:33:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4419 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1059912vsb; Fri, 21 Jul 2017 08:33:33 -0700 (PDT) X-Received: by 10.223.143.68 with SMTP id p62mr11061351wrb.20.1500651213243; Fri, 21 Jul 2017 08:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500651213; cv=none; d=google.com; s=arc-20160816; b=tyWbSIc3KLLbsp3YOARhrXRKHEC9qLrOLnTUTKqNZ+coF0VKxVGXUZOLBXd3zlBgDs QUNDNvs8l2NgTPIQNUms+N0CgiMqkN0x7GlPla1nkAXNkPLan0wWMbYUVC1p11YVlt+E TAZh0Iymcr7wm8ARw1ruNy1vV547K2ke/ceeQJb2rPtOoVgCQwI2fqpah3n7bz07bjwh DrGsgzKjZxCt1WBbBSWA1bmsyIStDz6eNMEgZb9v9dKLcAACaOUX7WtXUJTZZTUf+H4A cEeaRD+cDGLDQ6w34Ud79rh4+ZfFgwAm+oQEGSx05LZnouNAu4Ls0vZ1mEKzXMVnlTWD 2eKA== 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=5ebXOj42nEsuj+zw10jxUrhbwN1L0MVUwkYir3XCfT4=; b=Y6AdSL6iGGl4WOL+26t4ihEo8M1ukeqj9uG73/ruKHF8m94H3YsQmpU5aHxEtdNZDn 45HyvngOf8j/XTIjvmdrlAfsZNnrmfgfIiGC5bhW0ibbJzbvpWKX1yU0w7Rj2BqpGaTj aYzYASzvKFqMTr+jMeKuYIY+0OTze0olnEKIFv37DkjnnV0izUSRa++vlnIMKTvhKNBF u8EKVyvJBZNENNCgiQ3dgmJqPeZlS0BBVF0aKZoanq59FvPmuEF6ny8roR8i5uxUg6fH TKMKhhminXHnmdDEF0MMcBfG6Z4heW/qrtDG9AAy7K11MPbYREReokzaUzYSOx6P+qUi 2kVA== 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 16si4029088wrw.245.2017.07.21.08.33.32; Fri, 21 Jul 2017 08:33:33 -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 60A24689D9A; Fri, 21 Jul 2017 18:33:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17BF6689D4F for ; Fri, 21 Jul 2017 18:33:13 +0300 (EEST) X-QQ-mid: bizesmtp15t1500651195tf74lz6e Received: from localhost (unknown [111.192.116.160]) by esmtp4.qq.com (ESMTP) with id ; Fri, 21 Jul 2017 23:33:14 +0800 (CST) X-QQ-SSF: 01100000004000F0FG50000A0000000 X-QQ-FEAT: nSUdqPGu3tu+nOpL+M8lKTSJMfPYspGFDfS++oOegxt1t8MOV4raLCyFj96O5 lehMAVl2LHt3POrnpWYQCRvsW81zzgabBPRTnrtkad/U5yDuq7esoxu7dJShwZnXrrc778H WaW46ebaGJFnKazzuWWxJHx3mVZbbDLjesnaCgi9HHmE3X+dOFRrV4PSZcvR0FED5DppYVB exh+CusBBRhdnbTH26h37rrF73dVTOTyORn8MRI3gjbGEtcTuLe0/8kisRaMWLnBRi6FmAK DHGPEdCjJfosKj X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jul 2017 23:33:13 +0800 Message-Id: <20170721153313.47643-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170721103513.25505-1-lq@chinaffmpeg.org> References: <20170721103513.25505-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v3] 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. Found-by: JohnPi Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 8a233270b5..b0625dc9d4 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -147,6 +147,7 @@ typedef struct HLSContext { HLSSegment *old_segments; char *basename; + char *base_output_dirname; char *vtt_basename; char *vtt_m3u8_name; char *baseurl; @@ -584,7 +585,7 @@ static int hls_mux_init(AVFormatContext *s) if (hls->segment_type == SEGMENT_TYPE_FMP4) { hls->fmp4_init_mode = 1; - if ((ret = s->io_open(s, &oc->pb, hls->fmp4_init_filename, AVIO_FLAG_WRITE, NULL)) < 0) { + if ((ret = s->io_open(s, &oc->pb, hls->base_output_dirname, AVIO_FLAG_WRITE, NULL)) < 0) { av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", hls->fmp4_init_filename); return ret; } @@ -1286,14 +1287,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 +1309,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)) { @@ -1412,6 +1421,31 @@ static int hls_write_header(AVFormatContext *s) } else { av_strlcat(hls->basename, pattern, basename_size); } + + if (av_strcasecmp(hls->fmp4_init_filename, "init.mp4")) { + int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1; + hls->base_output_dirname = av_malloc(fmp4_init_filename_len); + if (!hls->base_output_dirname) { + ret = AVERROR(ENOMEM); + goto fail; + } + av_strlcpy(hls->base_output_dirname, hls->fmp4_init_filename, fmp4_init_filename_len); + } else { + hls->base_output_dirname = av_malloc(basename_size); + if (!hls->base_output_dirname) { + ret = AVERROR(ENOMEM); + goto fail; + } + + av_strlcpy(hls->base_output_dirname, s->filename, basename_size); + p = strrchr(hls->base_output_dirname, '/'); + if (p) { + *(p + 1) = '\0'; + av_strlcat(hls->base_output_dirname, hls->fmp4_init_filename, basename_size); + } else { + av_strlcpy(hls->base_output_dirname, hls->fmp4_init_filename, basename_size); + } + } } if (!hls->use_localtime) { ret = sls_flag_check_duration_size_index(hls); @@ -1686,6 +1720,7 @@ static int hls_write_trailer(struct AVFormatContext *s) ff_format_io_close(s, &vtt_oc->pb); } av_freep(&hls->basename); + av_freep(&hls->base_output_dirname); av_freep(&hls->key_basename); avformat_free_context(oc);