From patchwork Sat Dec 16 19:02:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jeyapal, Karthick" X-Patchwork-Id: 6828 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp898232jah; Sat, 16 Dec 2017 11:03:07 -0800 (PST) X-Google-Smtp-Source: ACJfBovDL8URKiHH7kuiMjK4EFC2/nq7zlIBeoZ7jUvCtOrVAAv3bg3hXyan7gKWYgVfOtmEHeAX X-Received: by 10.28.111.218 with SMTP id c87mr8362606wmi.91.1513450986886; Sat, 16 Dec 2017 11:03:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513450986; cv=none; d=google.com; s=arc-20160816; b=OLf3Y/kzGW3UemZe4ej2HmQJAs/ckhVF13vIX9e8HECwFYGaZHONEAAAkvqRP+5nV0 7UMON2ccfwB7IkPYbujtxreOsGDselPbs6BAFha5Mh/oqVlxOHGZXYxLwweiUW5G72YR V7PozMU+5a0C6FZUlX/tre5NmhN2zZDL5vX0ueod2RKcuCjJvPtqDicNVlMtLWSK/rEQ meF3CpE/DB71XPjUJyhuVv2yixEL0lOb0TMwaNTC2MztyTuMVr9pB8gbIlnctiF++OdP 059l4udWhpUpNDLySql7TrJ2dV4fuSYKKUNiyRor13dgaUH5rLUIz5tB+PuTNu+KTdsu wuOg== 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=ESACpxmBkfJK6OwmEFdcC7u1bZPP2Na1u+/LKKW4faQ=; b=DdJJKl0NZsU3P3LcxG8zFPjY5HyuZjDnMHFZ33eeVUVdNkdqcyqVriWDIMa8M+qXfd 9blgmy9CI1pFafYCbgiNxMFiS2kiMIBuwhJSIsKOY2pMf4iFsc30wHkI8GkQleAf80me yF4suNUzZ7mRuvCthWwmK36RF7owvY5M/5NiRAcxwcg6zj1DU/RhDQC/BMXEoS6TwIai Uz9Gom07kOIsOO7JetG+f6oZf0IDCu+2KiHoyhxAD5TijlqTz3ckBERkSpyVoq4/q6+3 ztmUZ6OrINkJ1Y6Erk5pwN65K1cR76spDiVMHPCoFN7DmW2P4Lb46zIQACn3cMclWXBr lccQ== 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=clpHfQvo; 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 t61si649673wrc.53.2017.12.16.11.03.06; Sat, 16 Dec 2017 11:03:06 -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=clpHfQvo; 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 11E0468992F; Sat, 16 Dec 2017 21:02:51 +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 95C296805A1 for ; Sat, 16 Dec 2017 21:02:44 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1513451879; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=rEbPWSRFes6Rpabm+IIulvq6Sl0Ls6Px8VaVSqAFiWo=; b=clpHfQvo I+lRQ5gPv4zlL21MHf5pY5YMDqAtEsAtpMaDEJaTj0Ku30F7QDepZVimZfAFnEJSo/DJnFFiVXqDH xU/8RrdjfC5FuHokqjL/KnTh2YhhDtaGXQFhVu0b+H5GmN+yPzFLaYiALIjr9UCPlcbcfv/Yf4JMX fN+WhvGP7j4SVlSG6gblrGvqVOcuVkBxYlHkw+xPQfWj62PtN7oguJsIQMXyCVKNYksYKy9mz+buX skYr8n3O5+SqSxRPL8MkLF1cy72t4bil9ceW8uYHMt0O3Fip05L35q/8Eq3f20VQk2mAaAYsLRzCn 7GxB1FcK/KPcXeigfz2NYe73Qg==; From: Karthick J To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Dec 2017 00:32:30 +0530 Message-Id: <1513450950-17244-2-git-send-email-kjeyapal@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1513450950-17244-1-git-send-email-kjeyapal@akamai.com> References: <2ad21bf5-22b7-7070-665d-fe8477ac42c3@akamai.com> <1513450950-17244-1-git-send-email-kjeyapal@akamai.com> X-Smtpcorp-Track: 1-QHMb4baUaM77.NS3aiQRxz Feedback-ID: 337386m:337386asVRLGB:337386scE7c4imcL:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/dashenc: 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 Jeyapal MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Karthick Jeyapal --- doc/muxers.texi | 2 ++ libavformat/dashenc.c | 67 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 3d0c7bf..d6415db 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -249,6 +249,8 @@ DASH-templated name to used for the media segments. Default is "chunk-stream$Rep URL of the page that will return the UTC timestamp in ISO format. Example: "https://time.akamai.com/?iso" @item -http_user_agent @var{user_agent} Override User-Agent field in HTTP header. Applicable only for HTTP output. +@item -http_persistent @var{http_persistent} +Use persistent HTTP connections. Applicable only for HTTP output. @item -hls_playlist @var{hls_playlist} Generate HLS playlist files as well. The master playlist is generated with the filename master.m3u8. One media playlist file is generated for each stream with filenames media_0.m3u8, media_1.m3u8, etc. diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 5687530..e7d1a0d 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -37,6 +37,9 @@ #include "avformat.h" #include "avio_internal.h" #include "hlsplaylist.h" +#if CONFIG_HTTP_PROTOCOL +#include "http.h" +#endif #include "internal.h" #include "isom.h" #include "os_support.h" @@ -103,7 +106,10 @@ typedef struct DASHContext { const char *utc_timing_url; const char *user_agent; int hls_playlist; + int http_persistent; int master_playlist_created; + AVIOContext *mpd_out; + AVIOContext *m3u8_out; } DASHContext; static struct codec_string { @@ -117,6 +123,36 @@ static struct codec_string { { 0, NULL } }; +static int dashenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, + AVDictionary **options) { + DASHContext *c = s->priv_data; + int http_base_proto = filename ? ff_is_http_proto(filename) : 0; + int err = AVERROR_MUXER_NOT_FOUND; + if (!*pb || !http_base_proto || !c->http_persistent) { + err = s->io_open(s, pb, filename, AVIO_FLAG_WRITE, options); +#if CONFIG_HTTP_PROTOCOL + } else { + URLContext *http_url_context = ffio_geturlcontext(*pb); + av_assert0(http_url_context); + err = ff_http_do_new_request(http_url_context, filename); +#endif + } + return err; +} + +static void dashenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) { + DASHContext *c = s->priv_data; + int http_base_proto = filename ? ff_is_http_proto(filename) : 0; + + if (!http_base_proto || !c->http_persistent) { + ff_format_io_close(s, pb); +#if CONFIG_HTTP_PROTOCOL + } else { + avio_flush(*pb); +#endif + } +} + static void set_codec_str(AVFormatContext *s, AVCodecParameters *par, char *str, int size) { @@ -218,6 +254,8 @@ static void set_http_options(AVDictionary **options, DASHContext *c) { 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); } static void get_hls_playlist_name(char *playlist_name, int string_size, @@ -273,9 +311,10 @@ static void dash_free(AVFormatContext *s) av_freep(&c->streams); } -static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext *c, +static void output_segment_list(OutputStream *os, AVIOContext *out, AVFormatContext *s, int representation_id, int final) { + DASHContext *c = s->priv_data; int i, start_index = 0, start_number = 1; if (c->window_size) { start_index = FFMAX(os->nb_segments - c->window_size, 0); @@ -339,7 +378,6 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext int timescale = os->ctx->streams[0]->time_base.den; char temp_filename_hls[1024]; char filename_hls[1024]; - AVIOContext *out_hls = NULL; AVDictionary *http_opts = NULL; int target_duration = 0; int ret = 0; @@ -352,7 +390,7 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext snprintf(temp_filename_hls, sizeof(temp_filename_hls), use_rename ? "%s.tmp" : "%s", filename_hls); set_http_options(&http_opts, c); - avio_open2(&out_hls, temp_filename_hls, AVIO_FLAG_WRITE, NULL, &http_opts); + dashenc_io_open(s, &c->m3u8_out, temp_filename_hls, &http_opts); av_dict_free(&http_opts); for (i = start_index; i < os->nb_segments; i++) { Segment *seg = os->segments[i]; @@ -361,15 +399,15 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext target_duration = hls_get_int_from_double(duration); } - ff_hls_write_playlist_header(out_hls, 6, -1, target_duration, + ff_hls_write_playlist_header(c->m3u8_out, 6, -1, target_duration, start_number, PLAYLIST_TYPE_NONE); - ff_hls_write_init_file(out_hls, os->initfile, c->single_file, + ff_hls_write_init_file(c->m3u8_out, os->initfile, c->single_file, os->init_range_length, os->init_start_pos); for (i = start_index; i < os->nb_segments; i++) { Segment *seg = os->segments[i]; - ret = ff_hls_write_file_entry(out_hls, 0, c->single_file, + ret = ff_hls_write_file_entry(c->m3u8_out, 0, c->single_file, (double) seg->duration / timescale, 0, seg->range_length, seg->start_pos, NULL, c->single_file ? os->initfile : seg->file, @@ -380,9 +418,10 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext } if (final) - ff_hls_write_end_list(out_hls); + ff_hls_write_end_list(c->m3u8_out); + + dashenc_io_close(s, &c->m3u8_out, temp_filename_hls); - avio_close(out_hls); if (use_rename) if (avpriv_io_move(temp_filename_hls, filename_hls) < 0) { av_log(os->ctx, AV_LOG_WARNING, "renaming file %s to %s failed\n\n", temp_filename_hls, filename_hls); @@ -498,7 +537,7 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind avio_printf(out, "\t\t\t\t\n", s->streams[i]->codecpar->channels); } - output_segment_list(os, out, c, i, final); + output_segment_list(os, out, s, i, final); avio_printf(out, "\t\t\t\n"); } avio_printf(out, "\t\t\n"); @@ -657,11 +696,12 @@ static int write_manifest(AVFormatContext *s, int final) snprintf(temp_filename, sizeof(temp_filename), use_rename ? "%s.tmp" : "%s", s->filename); set_http_options(&opts, c); - ret = s->io_open(s, &out, temp_filename, AVIO_FLAG_WRITE, &opts); + ret = dashenc_io_open(s, &c->mpd_out, temp_filename, &opts); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename); return ret; } + out = c->mpd_out; av_dict_free(&opts); avio_printf(out, "\n"); avio_printf(out, "\n"); avio_flush(out); - ff_format_io_close(s, &out); + dashenc_io_close(s, &c->mpd_out, temp_filename); if (use_rename) { if ((ret = avpriv_io_move(temp_filename, s->filename)) < 0) @@ -1094,7 +1134,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) snprintf(full_path, sizeof(full_path), "%s%s", c->dirname, filename); snprintf(temp_path, sizeof(temp_path), use_rename ? "%s.tmp" : "%s", full_path); set_http_options(&opts, c); - ret = s->io_open(s, &os->out, temp_path, AVIO_FLAG_WRITE, &opts); + ret = dashenc_io_open(s, &os->out, temp_path, &opts); if (ret < 0) break; av_dict_free(&opts); @@ -1112,7 +1152,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) if (c->single_file) { find_index_range(s, full_path, os->pos, &index_length); } else { - ff_format_io_close(s, &os->out); + dashenc_io_close(s, &os->out, temp_path); if (use_rename) { ret = avpriv_io_move(temp_path, full_path); @@ -1309,6 +1349,7 @@ static const AVOption options[] = { { "media_seg_name", "DASH-templated name to used for the media segments", OFFSET(media_seg_name), AV_OPT_TYPE_STRING, {.str = "chunk-stream$RepresentationID$-$Number%05d$.m4s"}, 0, 0, E }, { "utc_timing_url", "URL of the page that will return the UTC timestamp in ISO format", OFFSET(utc_timing_url), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, { "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 }, { "hls_playlist", "Generate HLS playlist files(master.m3u8, media_%d.m3u8)", OFFSET(hls_playlist), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, { NULL }, };