From patchwork Tue Nov 21 04:54:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jeyapal, Karthick" X-Patchwork-Id: 6243 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4793100jah; Mon, 20 Nov 2017 20:54:59 -0800 (PST) X-Google-Smtp-Source: AGs4zMYi2OueKKlQ4I30K1UTy2GvJ4JRl+OgtypOjJ08FEZSMkC/GNhEICbd3XsBDR3LxwpjBaHK X-Received: by 10.28.153.150 with SMTP id b144mr145799wme.93.1511240099603; Mon, 20 Nov 2017 20:54:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511240099; cv=none; d=google.com; s=arc-20160816; b=IoksnfkjYfTkFJyhjHHSG8s2xI4G8/Q7ws36L8gdNmYZdEiegeaxIogjyCWje9vkjL BIK0ZXAF9TFknyxQ7jU3Hpamu/x1JMmtMqMIsfFjjOXh/xj80axbdrvFuRTsd8VKydX7 aWYD5r0W2Bq4p8/tPxGfYTK5DHurRMbj+oVKxGMqTcoY4YiSe1BKFc9GVI+lo0eBJt9p aHUfq4I4ia5hiW7Hm1AYBF7mNrQGIoLf6sxNQFl0CSB+wFxFBCE7Sefb2kWirODPX27F 4QM648ZeEuPtJEioSYW7rYOrV72zMlNPeIgxaWmLGs5irZBrzT5PsmQVMYsNqMdcqKVC wq9g== 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:dkim-signature:delivered-to :arc-authentication-results; bh=ldMfADJv/W5CNWUw9c1/3M3493Nyr8ir/hSzhSHiPzI=; b=OSMuxxBSeP9HK/+dJQjNOIr16qGaTj/oQiQoSFrtwh/Y4S4oC9Tn2kGgmQXKtg4uN/ /5PqZVB3iwMjMiIEw/jICnuyHXjEeFsVTsnnNn/8LFteq4vwn7HWGWjl8JcLyXY8A9GC xtlVisQE10j62rZVukmT8BTTmTZktE2Twz6pQXTaCeeoKOO0QDspKtoyBMOn7xcIuqiN o7YYXzwB+x5YT8a0ygcWWpXQoCCR9GiKKSHTIN9OtvW4IWC1P0iKralh7XA9mgwMAU0m 7jIoD34D8SwAz6zCvGwDcEuXI32eVPMYTP22gcMeK62gQN/CcGbz+0HM1dNsGc+etjrC ElZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=jzVkDD2N; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p68si292237wmf.105.2017.11.20.20.54.59; Mon, 20 Nov 2017 20:54:59 -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; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=jzVkDD2N; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C82B0689FB1; Tue, 21 Nov 2017 06:54:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C78C1689DEF for ; Tue, 21 Nov 2017 06:54:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1511240984; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=wtj2i/VGRtyJ8pj1rR8fF/Q9sNYdt6v5mrg8e3SbGiE=; b=jzVkDD2N ahwTHkVhdlZvcYYCN7N5XgXrnsDI/yOa71J6d8uhbDAibHzptdmolF8gduuWnG84gJMRMHcRN65B+ ns3iizfQl9tb7M7VI4OsUUJ/NLGFsfXDqRCh8B9mqLe8OGTe07yC/chZGY7Bp1Wzyt+GG/7g1JsJi XqyUQHQP9FJld4CBOFM4jBa4z1eEx7vQlKLJqYdBSuCx7VnzasPRzuOv8brRatigecJdg7K0zjiGn ZdrR0ivkKQTg4mCd1EEGEC6GvgsxI9CjATkIOzJKh0zVszAwQ1fkl5EBkCpHJQnAj38QV0bH92AIA SDR0gBPzEW34bfOTAM0Y42ktXg==; From: Karthick J To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Nov 2017 10:24:24 +0530 Message-Id: <1511240064-18791-3-git-send-email-kjeyapal@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511240064-18791-1-git-send-email-kjeyapal@akamai.com> References: <20171117110123.GB2728888@phare.normalesup.org> <1511240064-18791-1-git-send-email-kjeyapal@akamai.com> X-Smtpcorp-Track: 1-H0ZvNmF72JUv.EBGKz0yRT Feedback-ID: 337386m:337386asVRLGB:337386sbV4-HMrpm:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v2 3/3] libavformat/hlsenc: Persistent HTTP connections supported as an option 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: Karthick J MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- doc/muxers.texi | 3 +++ libavformat/hlsenc.c | 48 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 0bb8ad2..c1d753b 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -850,6 +850,9 @@ ffmpeg -re -i in.ts -f hls -master_pl_name master.m3u8 \ This example creates HLS master playlist with name master.m3u8 and keep publishing it repeatedly every after 30 segments i.e. every after 60s. +@item http_persistent +Use persistent HTTP connections. Applicable only for HTTP output. + @end table @anchor{ico} diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 3c47ced..32c99a0 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -45,6 +45,7 @@ #include "avformat.h" #include "avio_internal.h" +#include "http.h" #include "internal.h" #include "os_support.h" @@ -204,6 +205,7 @@ typedef struct HLSContext { char *var_stream_map; /* user specified variant stream map string */ char *master_pl_name; unsigned int master_publish_rate; + int http_persistent; } HLSContext; static int get_int_from_double(double val) @@ -244,10 +246,38 @@ static int mkdir_p(const char *path) { return ret; } +static int is_http_proto(char *filename) { + const char *proto = avio_find_protocol_name(filename); + return proto ? (!av_strcasecmp(proto, "http") || !av_strcasecmp(proto, "https")) : 0; +} + +static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, + AVDictionary **options) { + HLSContext *hls = s->priv_data; + int http_base_proto = is_http_proto(filename); + int err; + if (*pb == NULL || !http_base_proto || !hls->http_persistent) { + err = s->io_open(s, pb, filename, AVIO_FLAG_WRITE, options); + } else { + URLContext *http_url_context = ffio_geturlcontext(*pb); + av_assert0(http_url_context); + err = ff_http_do_new_request(http_url_context, filename); + } + return err; +} + +static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) { + HLSContext *hls = s->priv_data; + int http_base_proto = is_http_proto(filename); + + if (!http_base_proto || !hls->http_persistent || hls->key_info_file || hls->encrypt) { + ff_format_io_close(s, pb); + } +} + static void set_http_options(AVFormatContext *s, AVDictionary **options, HLSContext *c) { - const char *proto = avio_find_protocol_name(s->filename); - int http_base_proto = proto ? (!av_strcasecmp(proto, "http") || !av_strcasecmp(proto, "https")) : 0; + int http_base_proto = is_http_proto(s->filename); if (c->method) { av_dict_set(options, "method", c->method, 0); @@ -257,6 +287,8 @@ static void set_http_options(AVFormatContext *s, AVDictionary **options, HLSCont } if (c->user_agent) av_dict_set(options, "user_agent", c->user_agent, 0); + if (c->http_persistent) + av_dict_set_int(options, "multiple_requests", 1, 0); } @@ -1430,17 +1462,17 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) err = AVERROR(ENOMEM); goto fail; } - err = s->io_open(s, &oc->pb, filename, AVIO_FLAG_WRITE, &options); + err = hlsenc_io_open(s, &oc->pb, filename, &options); av_free(filename); av_dict_free(&options); if (err < 0) return err; } else - if ((err = s->io_open(s, &oc->pb, oc->filename, AVIO_FLAG_WRITE, &options)) < 0) + if ((err = hlsenc_io_open(s, &oc->pb, oc->filename, &options)) < 0) goto fail; if (vs->vtt_basename) { set_http_options(s, &options, c); - if ((err = s->io_open(s, &vtt_oc->pb, vtt_oc->filename, AVIO_FLAG_WRITE, &options)) < 0) + if ((err = hlsenc_io_open(s, &vtt_oc->pb, vtt_oc->filename, &options)) < 0) goto fail; } av_dict_free(&options); @@ -2148,11 +2180,12 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) avio_open_dyn_buf(&oc->pb); vs->packets_written = 0; ff_format_io_close(s, &vs->out); + hlsenc_io_close(s, &vs->out, vs->base_output_dirname); } else { - ff_format_io_close(s, &oc->pb); + hlsenc_io_close(s, &oc->pb, oc->filename); } if (vs->vtt_avf) { - ff_format_io_close(s, &vs->vtt_avf->pb); + hlsenc_io_close(s, &vs->vtt_avf->pb, vs->vtt_avf->filename); } } if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { @@ -2337,6 +2370,7 @@ static const AVOption options[] = { {"var_stream_map", "Variant stream map string", OFFSET(var_stream_map), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"master_pl_name", "Create HLS master playlist with this name", OFFSET(master_pl_name), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"master_pl_publish_rate", "Publish master play list every after this many segment intervals", OFFSET(master_publish_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, UINT_MAX, E}, + {"http_persistent", "Use persistent HTTP connections", OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, { NULL }, };