From patchwork Tue Nov 7 10:33:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jeyapal, Karthick" X-Patchwork-Id: 5900 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3953275jah; Tue, 7 Nov 2017 02:34:34 -0800 (PST) X-Google-Smtp-Source: ABhQp+RVFb6yjg9Dc2eRuMtIXuNwZ9wf+7eAhetRlpCDNIjLBLCL0hp0abjkXzphY4SzRD/q6ZH4 X-Received: by 10.223.131.166 with SMTP id 35mr14950569wre.84.1510050874195; Tue, 07 Nov 2017 02:34:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510050874; cv=none; d=google.com; s=arc-20160816; b=VpIJUTcYW5pBbkqTaaZBNvuJ+XJFKWiweIqEFCO907zk/QPhK4Owhkmg/lvnDE9QbV VYURlrYi0s9sHw7QtYP0mBVaY0EqosM4Zf4Pj9QLdoG0KsNgliRnA5ue8rIFW+Sd5bJi dScUeNHo1TvWF9z1524KmKJQUR7Zt4cJLoTQHFdLHhHtyuH6ce2vIjMPMF5vSiil5J8O ZEd5zM8R7s9zIEi/DxY4tFVFNXtxW53L5LJpvT8stl4iOKTI+FlmdIwZ6oA8TGf4TEbw eY7tmmMKrHzZaZokczzzb83Rvyn1L4by6cRFRqKe6BWlebKOW8LnXWpeEsSd13ibYeYu rr4g== 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=xn7Ds1vJlWdhQCGOhSUkYlIkCth3g4gDlXAO09895gU=; b=ENWEV9Wz3BlKotxQ2ry1bRZYVJgz9AQRX3WUt1KQF79WuW4gG/vqbD59XxI8d4MSdW AOk8UdjAIKMO4KVD3nFaJRk9k/tbbwlOismWBbsWhwQj6IYDFclxGCtzjaaSyuBOACPV H+pZbsCgaLB7NnpQLmL00WgS4DhiCsYVWF5VNbdM25odJpKf83zCu03yGn7HIuwqa3lr 6jWwXt9rgw1wBhykY35V0nLweZY3kjNcNZG3ArTW5iFQvfAlU4xAmEWOfQvoGeuFnRZ/ EpcbIIH9ADFexHi0fUK09/I0dqZRdQJpdcWlnw+cmd/6p3BqFOFD+35nQImH91qxX2Bh MfxA== 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=mQijl3TF; 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 r192si851761wme.70.2017.11.07.02.34.33; Tue, 07 Nov 2017 02:34:34 -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=mQijl3TF; 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 B7C8F689EB0; Tue, 7 Nov 2017 12:34:12 +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 49551689E38 for ; Tue, 7 Nov 2017 12:34:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1510051764; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=VigW0nKs29dyGxlwBJAoxg4CRF7rE/Aj4AVftTt/s9s=; b=mQijl3TF tYpm1oTAMGKPJpoFsqxI8zzvUT66HE0H9EGVPIKsevgY13whNYbauqFknzHoDhv0Q03q2hX64CKXZ GaPFe1sZZTIMwgv7NWwpfq/+TNjTY3lFXrfZlxlSHPwsW1+p3ZVmS6SDHsTmPvvzN+piPLobUvy+/ XrmZkP8tTTAmF2n+0KDXeYSkdKwiWBOrpANXaAYah2n9IUbt3xBrSaGSLiHQK895h9vrPwWKUGozo NvcghKVNaXXRIriTuJNVgR6B0CtYBaZJg9nb2Sxv6omJ5ijO9p61ixoSPokCWeGlOiUxw3Nwq8nsV 4AYhDDMZI3SXw9IkBXkvNic65A==; From: Karthick J To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Nov 2017 16:03:56 +0530 Message-Id: <1510050836-28539-3-git-send-email-kjeyapal@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1510050836-28539-1-git-send-email-kjeyapal@akamai.com> References: <1510050836-28539-1-git-send-email-kjeyapal@akamai.com> X-Smtpcorp-Track: 1-C1CwNmF99sLg.jcwnUqaC_ Feedback-ID: 337386m:337386asVRLGB:337386sZy_ggf3nd:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 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 | 50 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 91bbe67..1e1468c 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -794,6 +794,9 @@ files. @item http_user_agent Override User-Agent field in HTTP header. Applicable only for HTTP output. +@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 5ea9d21..4a581b4 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -44,6 +44,7 @@ #include "avformat.h" #include "avio_internal.h" +#include "http.h" #include "internal.h" #include "os_support.h" @@ -175,6 +176,7 @@ typedef struct HLSContext { double initial_prog_date_time; char current_segment_final_filename_fmt[1024]; // when renaming segments char *user_agent; + int http_persistent; } HLSContext; static int get_int_from_double(double val) @@ -215,10 +217,40 @@ 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); + 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); + } else if (*pb) { + URLContext *http_url_context = ffio_geturlcontext(*pb); + http_url_context->prot->url_write(http_url_context, NULL, 0); + } +} + 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); @@ -228,6 +260,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); } @@ -1263,17 +1297,17 @@ static int hls_start(AVFormatContext *s) 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 (c->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); @@ -1661,9 +1695,10 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) hls->size = new_start_pos - hls->start_pos; if (!byterange_mode) { - ff_format_io_close(s, &oc->pb); + hlsenc_io_close(s, &oc->pb, + hls->fmp4_init_mode ? hls->base_output_dirname : oc->filename); if (hls->vtt_avf) { - ff_format_io_close(s, &hls->vtt_avf->pb); + hlsenc_io_close(s, &hls->vtt_avf->pb, hls->vtt_avf->filename); } } if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { @@ -1829,6 +1864,7 @@ static const AVOption options[] = { {"epoch", "seconds since epoch", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH }, INT_MIN, INT_MAX, E, "start_sequence_source_type" }, {"datetime", "current datetime as YYYYMMDDhhmmss", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUENCE_AS_FORMATTED_DATETIME }, INT_MIN, INT_MAX, E, "start_sequence_source_type" }, {"http_user_agent", "override User-Agent field in HTTP header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, + {"http_persistent", "Use persistent HTTP connections", OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, { NULL }, };