From patchwork Thu Nov 30 09:06:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jeyapal, Karthick" X-Patchwork-Id: 6464 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp379442jah; Thu, 30 Nov 2017 01:06:47 -0800 (PST) X-Google-Smtp-Source: AGs4zMbCm2igN4sGR2L5rDJPmNxOEJkqus037k45h1dLuHhBB/wptIX3kzdTTYFpqOsFAsfM2TK0 X-Received: by 10.28.183.132 with SMTP id h126mr1309818wmf.17.1512032807384; Thu, 30 Nov 2017 01:06:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512032807; cv=none; d=google.com; s=arc-20160816; b=soyz3wUGF774X9euTDsfiwUZjU6FOGTraMHCqz8d0Rc5R5rj0V3qTMs5ZKOGPzWSRk DQDSVKuuzz/l3cT7Xibb/dVbERzDp1mtP0TzB9H6ogNj05QvfbD52Qj0/AqbTc3KdB9r mAhPVOknEg368qC/nEcl8CthGC3pBCi7UdG0xMNRcv3H4c3iQFn+bw0xna97Us64IQNx Z0Telvd3x3oEMDVk8JZ59GELKmPhoyHr9Oij5wm2UShNyDtTft5s4QS8ZbRQ5efDTdmI bpNMoS58PLyp2hFFuvjGhrVb+xHgODJUqh127s9AVBBO4EQDoLYvZY3CK0QMe9rMiQhg rUZw== 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=ECYrswUH0H1gGSBiKWDgsWMjuuKec+TCjfUi+XDxLFY=; b=swKO84MFAzITHKQUSab2segQ9QpOf/U3nrrm1yCr2alhEjEStLG2M9X/By8XyxA2Py ph2Ck0Ttpe8Pxbq/dLCmAQcxJcIC1gUYKJ67KuxSV4k8YYNus6TrMhV1sk20Mig0Ud1Q 6cC1ULfXIEjbEhQ/1OwIHq3HH35p3npXyOqdSafRS8KuJCXlviAOfzLMOkY9pktOKA7d SR9gS+E9NRrrMGnseWTFo0NwXhOSIfdh9YWqpiqnVCAEp05uKEUK4fwlOk/ytgfnDPQs v8hcHauml9jwkrHa20PcXwada/YMVw90FxHmR2HfbhgSpgTe7hqJjBLr6MGQiMgYDTGx LE7w== 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=gYm1X1Mq; 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 y2si2708204wmy.196.2017.11.30.01.06.47; Thu, 30 Nov 2017 01:06:47 -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=gYm1X1Mq; 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 A48D168A25D; Thu, 30 Nov 2017 11:06:39 +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 D008768A127 for ; Thu, 30 Nov 2017 11:06:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1512033702; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=gXwSx1dH33DLYNG+Ya1BXGX6fwU1c69d6d6omCAo2PQ=; b=gYm1X1Mq uNpsGf3nTlGTkNdCPUYka0zcKm53jj4AyinOXU0bw9vEweugSy3bNNd7VfmAeJRuj5svP3alY9XWz v9ZB5i0L75S+FWB7gaOdb86w1mHwMJxRyJFRg/jItIzF8rJ5vjPibTjoEIsUokZJ8qm+uuXKDNyN2 8OBZj9OqJPhwUZOrb8dVmi8crXFdIHjGCuhoc/qPTmjgTFlC2eY5OBO8L8zC4wVNyA89vIz1FWKr1 igBcashbfJ/eXjS7XE1tEZmJYE8c6NGqEQdIYK4YxYRmlWRXJNu0VrlbDWgT5th++Urc8vixaCzbW O+YmhTblg9/saJrdXzIBLXeO7g==; From: Karthick J To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Nov 2017 14:36:00 +0530 Message-Id: <1512032760-19872-3-git-send-email-kjeyapal@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1512032760-19872-1-git-send-email-kjeyapal@akamai.com> References: <1512032760-19872-1-git-send-email-kjeyapal@akamai.com> X-Smtpcorp-Track: 1-KKniDII-CQm6.H4oPiqWaD Feedback-ID: 337386m:337386asVRLGB:337386sgotz57o6c:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 3/3] avformat/hlsenc: Extend persistent http connections to playlists 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 Jeyapal MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Karthick Jeyapal Before this patch persistent http connections would work only for media segments. The playlists were still opening a new connection everytime. This patch extends persistent http connections to playlists as well. --- libavformat/hlsenc.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ff982c5..350836d 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -201,6 +201,8 @@ typedef struct HLSContext { char *master_pl_name; unsigned int master_publish_rate; int http_persistent; + AVIOContext *m3u8_out; + AVIOContext *sub_m3u8_out; } HLSContext; static int mkdir_p(const char *path) { @@ -1081,7 +1083,6 @@ static int create_master_playlist(AVFormatContext *s, HLSContext *hls = s->priv_data; VariantStream *vs; AVStream *vid_st, *aud_st; - AVIOContext *master_pb = 0; AVDictionary *options = NULL; unsigned int i, j; int m3u8_name_size, ret, bandwidth; @@ -1102,8 +1103,7 @@ static int create_master_playlist(AVFormatContext *s, set_http_options(s, &options, hls); - ret = s->io_open(s, &master_pb, hls->master_m3u8_url, AVIO_FLAG_WRITE,\ - &options); + ret = hlsenc_io_open(s, &hls->m3u8_out, hls->master_m3u8_url, &options); av_dict_free(&options); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Failed to open master play list file '%s'\n", @@ -1111,7 +1111,7 @@ static int create_master_playlist(AVFormatContext *s, goto fail; } - ff_hls_write_playlist_version(master_pb, hls->version); + ff_hls_write_playlist_version(hls->m3u8_out, hls->version); /* For variant streams with video add #EXT-X-STREAM-INF tag with attributes*/ for (i = 0; i < hls->nb_varstreams; i++) { @@ -1152,7 +1152,7 @@ static int create_master_playlist(AVFormatContext *s, bandwidth += aud_st->codecpar->bit_rate; bandwidth += bandwidth / 10; - ff_hls_write_stream_info(vid_st, master_pb, bandwidth, m3u8_rel_name); + ff_hls_write_stream_info(vid_st, hls->m3u8_out, bandwidth, m3u8_rel_name); av_freep(&m3u8_rel_name); } @@ -1160,7 +1160,7 @@ fail: if(ret >=0) hls->master_m3u8_created = 1; av_freep(&m3u8_rel_name); - ff_format_io_close(s, &master_pb); + hlsenc_io_close(s, &hls->m3u8_out, hls->master_m3u8_url); return ret; } @@ -1170,8 +1170,6 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) HLSSegment *en; int target_duration = 0; int ret = 0; - AVIOContext *out = NULL; - AVIOContext *sub_out = NULL; char temp_filename[1024]; int64_t sequence = FFMAX(hls->start_sequence, vs->sequence - vs->nb_entries); const char *proto = avio_find_protocol_name(s->filename); @@ -1203,7 +1201,7 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) set_http_options(s, &options, hls); snprintf(temp_filename, sizeof(temp_filename), use_rename ? "%s.tmp" : "%s", vs->m3u8_name); - if ((ret = s->io_open(s, &out, temp_filename, AVIO_FLAG_WRITE, &options)) < 0) + if ((ret = hlsenc_io_open(s, &hls->m3u8_out, temp_filename, &options)) < 0) goto fail; for (en = vs->segments; en; en = en->next) { @@ -1212,33 +1210,33 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) } vs->discontinuity_set = 0; - ff_hls_write_playlist_header(out, hls->version, hls->allowcache, + ff_hls_write_playlist_header(hls->m3u8_out, hls->version, hls->allowcache, target_duration, sequence, hls->pl_type); if((hls->flags & HLS_DISCONT_START) && sequence==hls->start_sequence && vs->discontinuity_set==0 ){ - avio_printf(out, "#EXT-X-DISCONTINUITY\n"); + avio_printf(hls->m3u8_out, "#EXT-X-DISCONTINUITY\n"); vs->discontinuity_set = 1; } if (vs->has_video && (hls->flags & HLS_INDEPENDENT_SEGMENTS)) { - avio_printf(out, "#EXT-X-INDEPENDENT-SEGMENTS\n"); + avio_printf(hls->m3u8_out, "#EXT-X-INDEPENDENT-SEGMENTS\n"); } for (en = vs->segments; en; en = en->next) { if ((hls->encrypt || hls->key_info_file) && (!key_uri || strcmp(en->key_uri, key_uri) || av_strcasecmp(en->iv_string, iv_string))) { - avio_printf(out, "#EXT-X-KEY:METHOD=AES-128,URI=\"%s\"", en->key_uri); + avio_printf(hls->m3u8_out, "#EXT-X-KEY:METHOD=AES-128,URI=\"%s\"", en->key_uri); if (*en->iv_string) - avio_printf(out, ",IV=0x%s", en->iv_string); - avio_printf(out, "\n"); + avio_printf(hls->m3u8_out, ",IV=0x%s", en->iv_string); + avio_printf(hls->m3u8_out, "\n"); key_uri = en->key_uri; iv_string = en->iv_string; } if ((hls->segment_type == SEGMENT_TYPE_FMP4) && (en == vs->segments)) { - ff_hls_write_init_file(out, vs->fmp4_init_filename, + ff_hls_write_init_file(hls->m3u8_out, vs->fmp4_init_filename, hls->flags & HLS_SINGLE_FILE, en->size, en->pos); } - ff_hls_write_file_entry(out, en->discont, byterange_mode, + ff_hls_write_file_entry(hls->m3u8_out, en->discont, byterange_mode, en->duration, hls->flags & HLS_ROUND_DURATIONS, en->size, en->pos, vs->baseurl, en->filename, prog_date_time_p); @@ -1246,29 +1244,29 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) } if (last && (hls->flags & HLS_OMIT_ENDLIST)==0) - ff_hls_write_end_list(out); + ff_hls_write_end_list(hls->m3u8_out); if( vs->vtt_m3u8_name ) { - if ((ret = s->io_open(s, &sub_out, vs->vtt_m3u8_name, AVIO_FLAG_WRITE, &options)) < 0) + if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out, vs->vtt_m3u8_name, &options)) < 0) goto fail; - ff_hls_write_playlist_header(sub_out, hls->version, hls->allowcache, + ff_hls_write_playlist_header(hls->sub_m3u8_out, hls->version, hls->allowcache, target_duration, sequence, PLAYLIST_TYPE_NONE); for (en = vs->segments; en; en = en->next) { - ff_hls_write_file_entry(sub_out, 0, byterange_mode, + ff_hls_write_file_entry(hls->sub_m3u8_out, 0, byterange_mode, en->duration, 0, en->size, en->pos, vs->baseurl, en->sub_filename, NULL); } if (last) - ff_hls_write_end_list(sub_out); + ff_hls_write_end_list(hls->sub_m3u8_out); } fail: av_dict_free(&options); - ff_format_io_close(s, &out); - ff_format_io_close(s, &sub_out); + hlsenc_io_close(s, &hls->m3u8_out, temp_filename); + hlsenc_io_close(s, &hls->sub_m3u8_out, vs->vtt_m3u8_name); if (ret >= 0 && use_rename) ff_rename(temp_filename, vs->m3u8_name, s);