From patchwork Mon Dec 18 08:47:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 6853 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp15208jad; Mon, 18 Dec 2017 00:48:09 -0800 (PST) X-Google-Smtp-Source: ACJfBov/R+Kb431XOPOImyNJkObG+8E6Hh92HDHCRC07hCfQLK9XiO4m74+LyJVESk0DrEZULioB X-Received: by 10.28.192.24 with SMTP id q24mr11041735wmf.98.1513586889752; Mon, 18 Dec 2017 00:48:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513586889; cv=none; d=google.com; s=arc-20160816; b=BLlz2OiXFl18YmxDQn+EDnlG6NYsEm/DkLQp1AhM1BaKKzKculFQ99iZiIH6NDE7sF Zout2GiRpYYWBLps/zSt0RLL0/CtKWPS3vZuT3Y1GkEb0UBh0OcSu7PqXKDCH8vjeHMV nGBMBbusYGGyR7EKOPaSJTnaF9h8ghoDOTs1wVic6mL71U8xq5U+fOt5iQawmKNBIUpu 03iTVVdhlCeIPShlOkAcO0OOuDkJcrp+iicuistDwazyhKDsnExT6iw7TmmzR3rGleDK LV6agRp32uTJZ/QmLZ+q9dduah6on9+ev6tT4FMdWAwf70MGvj3LUuW2w/AQgSlquTDq HdKQ== 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=OLtTCojH3lLIKA+BwNKqdLfSFVVoqFLyF4QiTHhBhUo=; b=VBtbGcztUiEgWAW9Hg6dyP6r1z5l0T/HxAFWavRHpHrkUtruCA4+RP5q23+K3OBuiX O4rjbYe677wwi6tBMn2B1gBFqVdOCS1UiBSOV/209FANcgcTkkZtLUfoF8DyWSTPxGEG xEGvp0xxvzOhto7jdBY+7v29RVezZlEO8ewywQ7cLJuBuK8SpeGQlbBDNHtagvMKXjfO csmqKSDgKAbCbdHzx4WIEYTvyxAAXNaK60iuotv4tYCRpRedW8jdDde63L9tY6FZvNi2 Hy2LUPfcGOfLI9kWURrvBVcyKgzzqVvZXibRWFhnx4oHu+c9jsoqfpQ++VwsgQKof3Un vKmQ== 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 v195si8422900wmf.83.2017.12.18.00.48.09; Mon, 18 Dec 2017 00:48:09 -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 22790689CF6; Mon, 18 Dec 2017 10:47:53 +0200 (EET) 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 4FD2F68053E for ; Mon, 18 Dec 2017 10:47:50 +0200 (EET) X-QQ-mid: bizesmtp16t1513586876t1kl8nqi Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 18 Dec 2017 16:47:56 +0800 (CST) X-QQ-SSF: 01100000008000F0FJ90B00A0000000 X-QQ-FEAT: L1ZyZUZgqgboaYEuuLQ8PZ6JcedecaAicdsyMvEHyW3Hl3/Sknbsm58Qi2XwH HgGJQIJEgdx2Bmf2bC0AnPBUTYVu06GEPmEHFoX4j91uLaGJ5uuNEFyUW0e/I2B1+sTrfo/ pItUTyX2O0RS0l6P37H2M98XGr4si2J/CsDNHNxLzoOPpGFnTKtQ30OoovoVUt06fDZ+JB1 mbhuiVLbWBNV5AF4NAvjaRmspWnXZ5EUNBiNfUUc7LtDyMQdgkH6z0Km7BvJhw93yPvf6cv y1Vf8OsbrvP55q6bpim1wmDxtescXihlvU2A== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Dec 2017 16:47:54 +0800 Message-Id: <20171218084754.14053-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:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/hlsenc: add http options to m3u8 hlsenc 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 0cb75ff198..636b7db183 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1723,6 +1723,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) int stream_index = 0; int range_length = 0; uint8_t *buffer = NULL; + AVDictionary *options = NULL; VariantStream *vs = NULL; for (i = 0; i < hls->nb_varstreams; i++) { @@ -1835,7 +1836,8 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } if (hls->segment_type == SEGMENT_TYPE_FMP4) { - ret = hlsenc_io_open(s, &vs->out, vs->avf->filename, NULL); + set_http_options(s, &options, hls); + ret = hlsenc_io_open(s, &vs->out, vs->avf->filename, &options); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Failed to open file '%s'\n", vs->avf->filename); @@ -1899,6 +1901,7 @@ static int hls_write_trailer(struct AVFormatContext *s) HLSContext *hls = s->priv_data; AVFormatContext *oc = NULL; AVFormatContext *vtt_oc = NULL; + AVDictionary *options = NULL; char *old_filename = NULL; int i; int ret = 0; @@ -1916,7 +1919,8 @@ static int hls_write_trailer(struct AVFormatContext *s) } if ( hls->segment_type == SEGMENT_TYPE_FMP4) { int range_length = 0; - ret = hlsenc_io_open(s, &vs->out, vs->avf->filename, NULL); + set_http_options(s, &options, hls); + ret = hlsenc_io_open(s, &vs->out, vs->avf->filename, &options); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Failed to open file '%s'\n", vs->avf->filename); return AVERROR(ENOENT);