From patchwork Thu Jul 20 06:08:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4377 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1719970vsb; Wed, 19 Jul 2017 23:08:57 -0700 (PDT) X-Received: by 10.28.109.146 with SMTP id b18mr1559521wmi.34.1500530937452; Wed, 19 Jul 2017 23:08:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500530937; cv=none; d=google.com; s=arc-20160816; b=nClm+LvpGwsbTOciNiw0PJ0mXfW+kuVx1l0N458pyNVhHceGmegxKuqB23H6Jhea8U X5H/aGR6cIsPrBQHcRf18hCMl5eRK8NwyKK3hFbM+wnc8pj2ng/7zMDlo60E0LU42MFO 6lCLDL1KUqQim9u0qa9Q9ZLbVZQ1bfqWAi9uOe953ckXFzhU/fywCkrBSgiy4XfgMqRh MsXwK3JYyLXoVkDAfifl5kK7p5XfQeC4DlpX4/aTk7Pk3z/NLjl9oZEne2ElE5pHjiPy pusaKEuVccr4N2xV5YBPCNvUzPs0PR7Gi9QDbax6ICJEwczMgVKLHRocC4JKXpcRsN63 QOHA== 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=TSRB8rm9aqXHZD4O9nJwSl/d3AQEhS1eb5VB+o4KucU=; b=guoqpcTJV6QmsrORq994A3c4PT2B3yzTL9otRm33oAtPCtYnrrhfAZ0raa5geldZER WofGGH1FaQcSMa7CLOwAQOHD3V7+uqBuTxSWnsUyxVXJqGfpTZqcI+5/GYnIiGRd8r2D 37C5vK6NrzUBB7zb7SoTKr6hCU92jSzVAn4C/l5XV9eCGcPz28EhKiBAAd4FuJf2SSCG +CRq/N5amZsVu/Zn82tiKVISeaMGZMskxLR/aypb957kOQhBcPvFpA+MOkMaEvNCZRAK ewDMIp2NzgsClhdaXjoLV8LluAsrikNIIFouC56Ly2AnSaeZxkWC30HFGWJHqjFWWM3D 8Idw== 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 v10si5510809wra.229.2017.07.19.23.08.56; Wed, 19 Jul 2017 23:08:57 -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 F2467688357; Thu, 20 Jul 2017 09:08:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg202.qq.com (smtpbg202.qq.com [184.105.206.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08C62687ED5 for ; Thu, 20 Jul 2017 09:08:38 +0300 (EEST) X-QQ-mid: bizesmtp7t1500530909tidyos8hs Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Thu, 20 Jul 2017 14:08:28 +0800 (CST) X-QQ-SSF: 01100000000000F0FG41 X-QQ-FEAT: oIoGrveFQB/Yhew0p5w61yEnjMeRcZWkMlaK2mjaeDyx6k39yiVlRuBc6Y4SY e/A++KKTWUTJBF2Ku5X65zvVgcp7UUGBpy3u7QhW/SHm2LEGuRCglhJ/2AsfqEmGyHOMoUx SPRKQhzmAhX69MqHXk77V9epnCCwN4CW7CmZaGwIxVy/ksgRAcKVgMCZFm8AqFUznmMK4zu DURRjyTFUObAxYXx6QhTq9XtQ0vMZA4wTKNxW0ltg2GOwPAH8vbF3A7kyvOEctL7sNFSrFQ xWO2PyIP8iW5ri X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2017 14:08:24 +0800 Message-Id: <20170720060824.9057-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. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 8a233270b5..65650e03a4 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)) { @@ -1391,6 +1399,9 @@ static int hls_write_header(AVFormatContext *s) if (hls->flags & HLS_SINGLE_FILE) pattern = ".ts"; + if (hls->segment_type == SEGMENT_TYPE_FMP4) + pattern = "m4s"; + if (hls->use_localtime) { basename_size = strlen(s->filename) + strlen(pattern_localtime_fmt) + 1; } else {