From patchwork Fri Jul 21 10:35:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 4412 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp740359vsb; Fri, 21 Jul 2017 03:35:32 -0700 (PDT) X-Received: by 10.223.175.225 with SMTP id y33mr7269063wrd.61.1500633332754; Fri, 21 Jul 2017 03:35:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500633332; cv=none; d=google.com; s=arc-20160816; b=wHqf6COMeos+qcbWzErILnSdmvTMZvEjoOq8k+eTV8KcPYRIE59ov7f6xSMyKPzOln VpfNbxngXhlkqRcFJiflqBmAwfsJ2ZECtiNZFuruViKhjIdXlDby3JtFhj+fx49jjm4F qzGgJ/VPGHADrIgAq6tabqv3WsQO6k98duNnL0SECj2RTZGcml1uJBxA/nrInnXenYPK ejGLeJvxxFc9TTi3rbosRkvpUDdZuELao0ykbPNygr+38SqhPnnrCgLI1Enjew2kzSaE 2nYLdIg+XFNUVoFQ8JX4AQzZZ/9puUSggng2k5dbiAm3R0/MZ+P+utugMv4De4gQu9n2 Mp8Q== 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:message-id:date:to:from :delivered-to:arc-authentication-results; bh=CHq+9d4V7AyBQT39H0jdAorrDQBFWL6anonw4f7r7Zo=; b=d7cu3ShFl2iiASnqfpuPaUKnvZI1gE0V9dBHU/2gFTl+ymiatPkQ729xbG8aNHhQKP OY+nbMCDFTXtM9koeJIHJ7HQp9/Mu7QwTI4vTLZBewi4VLJDW8n2brJKJeXZH1OamVrl BAPLvtX42EQSM1NV0G+YrSVONddTWI6Ypjw2ifVuhvjlfr/KSQAOlR62/oMi10ekk297 mGrmvFiSEiIgZ8WNjcV4ztahE4FcotR00CfAbNVj5WXHeLtOxtPeGU15XhmQtoQv9urw YXG/VWFAs5n87TLShOx7KPfH/+u5vkotE+7BYk14bGpb5xesFoutg2B6pG2+9uEyhGiP fYqg== 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 16si3601234wrw.245.2017.07.21.03.35.32; Fri, 21 Jul 2017 03:35:32 -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 22B35689C96; Fri, 21 Jul 2017 13:35: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 9D13D689AA6 for ; Fri, 21 Jul 2017 13:35:14 +0300 (EEST) X-QQ-mid: bizesmtp13t1500633316tlgoucwv Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Fri, 21 Jul 2017 18:35:15 +0800 (CST) X-QQ-SSF: 01100000004000F0FG41000A0000000 X-QQ-FEAT: YSSoAXAEBlFz+RUqJuz2CAXyJeO0VoLZ3IV6uVYU27JcAzcY50xlDMucVLoVN 6SuhqsvQMzOu0Zuhm6HHjrhVG5DAS6WmUwoGm5H0PBGpIDz7qFspCG4aubSfTcMG6pghw3w hgqQrcBkIFbOgD7dgYCrPXBaUk1y1Z39lCNgogp0P6izbYnt6CdNiQb8EqMamrkzUPCL89J 1SznXD4ByzsTmg+NzaJxaQRySfw3HR653v5qjoJEYVHp56odlx8K7LvObRyWTYcmbvu+WTD faNmc/MwQTjscF X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jul 2017 18:35:13 +0800 Message-Id: <20170721103513.25505-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 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. Found-by: JohnPi Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 8a233270b5..0c1bbd04cb 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,28 @@ 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); + } } if (!hls->use_localtime) { ret = sls_flag_check_duration_size_index(hls); @@ -1686,6 +1717,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);