From patchwork Thu Dec 14 10:52:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 6770 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6575445jah; Thu, 14 Dec 2017 02:53:15 -0800 (PST) X-Google-Smtp-Source: ACJfBov4HQ+GZq2/GUdm+tIbBfuXEv13saRYxY4FmUvlDySonbQFmMDKzyQ4CbI7/+3qtYBqoo7j X-Received: by 10.223.184.171 with SMTP id i40mr5516456wrf.124.1513248795469; Thu, 14 Dec 2017 02:53:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513248795; cv=none; d=google.com; s=arc-20160816; b=NCcy0uI0GjeLCPOftFBurtDFT5CowWICuhMh4DmfbDsA4cNvHAkOhWl94KKg8VzXz4 1yY/Mx9NeTlCKeaJPzgHvlJdn2S2ICVO0zCz9ZNlM9jtfLJ5xxk+wZWMlLHPDvolh1BG uc+YxtfZ6mPn2E+Iwt01RXMXvdUT0cnxJpyWhulssTyVJcTcU+sUH32fKcQxMjoB0mcu vl0q5tMAGZTH/bOdERv0EMALTDpXdWiR/AytOaUHQ0TVnufDNKjVJSuQeUDJ/GqjBuEU Gd8jsaj2PHm5jtvPyuBelfd/Pp8YNJJnUdx2oh8TXntFqsPc5bTxQw/+WHM5gRjOHfYb UJhg== 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=7t/kJPD+jjtIVnKCvHP+VS6ASdfrY3N95ojCmjKjY+M=; b=l3pr2e3J+ijxildUJ6X7Hs7vP0Ot6ID7/zwMeuz5mPfX2VitLK201joZpjk0bjMzxb CMkWt69DRQbgNN+cVplV0cEws2CEI7WUWtBJssV6b3ttIbHnd5lLDfbZHR8BlSkdPpae 6L8RuSOSs8ZILKAgfMk3jCpjZzR9pdbe93LmYBU92QUzIIHMTxmsRUcm6zakYyftfK6M muZDqAHhcYOlf5zHn9NKwQzdEb5eB6ZiNUwu/ykt5QMFFtjH+NF1Mwr7iUGbcQeHIp80 RoPjoUhfisUkoiFeNtlCALKkPNcX8DLGYvfBnuuhtp9I5UO6oJ8K/oUaDmhw4clw7erO qUdA== 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=HOLRych7; 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 z42si3335465wrb.71.2017.12.14.02.53.14; Thu, 14 Dec 2017 02:53:15 -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=HOLRych7; 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 AA8A868A4B2; Thu, 14 Dec 2017 12:53:04 +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 57FC068A4A6 for ; Thu, 14 Dec 2017 12:52:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1513249692; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=n6B52UZkXvVWkyO0M6JSPGvxjVo7ImBrPs4a17g794U=; b=HOLRych7 ysKXW9W21Bi8zmJ4T8SMeoRQTvoICscdDG9CP0n2zNN581Ot81Cs8y/6/7Tn4ywuPAt6xgMC6Dm9W XPTLP8bqVl9zc2rXo1LV11hMzyx2bUDMWtxbZ7XrchvqDu3gBoEtlee9UeU6g46R1HJTMPcNptrTG YpUWRuLvnZVZL7dF3onz1djfy5AxRfMOHg9hX55UsoK3rUvICFXBzRCpWD5uzGHaiubJQRsMiaZfR ij7S5OqbddnscQY4oPRoncCkMlB6xVIFQOqyhajagZh683Rre0za1iBsEVGRUzSBu1k5CsRqzoQcv DXY+qkpBBzCPsbQk/XpAevV2Gg==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2017 16:22:54 +0530 Message-Id: <1513248774-28425-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1512041543-23533-1-git-send-email-vdixit@akamai.com> References: <1512041543-23533-1-git-send-email-vdixit@akamai.com> X-Smtpcorp-Track: 1-eR8eRyIeGRTM.uhguQVRkL Feedback-ID: 337386m:337386asVRLGB:337386sS89DsRfBB:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v6 1/3] avformat/hlsenc:addition of #EXT-X-MEDIA tag and AUDIO attribute 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: Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit --- doc/muxers.texi | 12 +++++++++ libavformat/dashenc.c | 3 ++- libavformat/hlsenc.c | 62 ++++++++++++++++++++++++++++++++++++++++++++--- libavformat/hlsplaylist.c | 4 ++- libavformat/hlsplaylist.h | 2 +- 5 files changed, 77 insertions(+), 6 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 3d0c7bf..93db549 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -834,6 +834,18 @@ be a video only stream with video bitrate 1000k, the second variant stream will be an audio only stream with bitrate 64k and the third variant stream will be a video only stream with bitrate 256k. Here, three media playlist with file names out_1.m3u8, out_2.m3u8 and out_3.m3u8 will be created. +@example +ffmpeg -re -i in.ts -b:a:0 32k -b:a:1 64k -b:v:0 1000k -b:v:1 3000k \ + -map 0:a -map 0:a -map 0:v -map 0:v -f hls \ + -var_stream_map "a:0,agroup:aud_low a:1,agroup:aud_high v:0,agroup:aud_low v:1,agroup:aud_high" \ + -master_pl_name master.m3u8 \ + http://example.com/live/out.m3u8 +@end example +This example creates two audio only and two video only variant streams. In +addition to the #EXT-X-STREAM-INF tag for each variant stream in the master +playlist, #EXT-X-MEDIA tag is also added for the two audio only variant streams +and they are mapped to the two video only variant streams with audio group names +'aud_low' and 'aud_high'. By default, a single hls variant containing all the encoded streams is created. diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 5687530..f363418 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -759,7 +759,8 @@ static int write_manifest(AVFormatContext *s, int final) char playlist_file[64]; AVStream *st = s->streams[i]; get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); - ff_hls_write_stream_info(st, out, st->codecpar->bit_rate, playlist_file); + ff_hls_write_stream_info(st, out, st->codecpar->bit_rate, + playlist_file, NULL); } avio_close(out); if (use_rename) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index fdf614b..273dd8a 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -144,6 +144,7 @@ typedef struct VariantStream { AVStream **streams; unsigned int nb_streams; int m3u8_created; /* status of media play-list creation */ + char *agroup; /* audio group name */ char *baseurl; } VariantStream; @@ -1081,7 +1082,7 @@ static int create_master_playlist(AVFormatContext *s, VariantStream * const input_vs) { HLSContext *hls = s->priv_data; - VariantStream *vs; + VariantStream *vs, *temp_vs; AVStream *vid_st, *aud_st; AVIOContext *master_pb = 0; AVDictionary *options = NULL; @@ -1115,6 +1116,34 @@ static int create_master_playlist(AVFormatContext *s, ff_hls_write_playlist_version(master_pb, hls->version); + /* For audio only variant streams add #EXT-X-MEDIA tag with attributes*/ + for (i = 0; i < hls->nb_varstreams; i++) { + vs = &(hls->var_streams[i]); + + if (vs->has_video || vs->has_subtitle || !vs->agroup) + continue; + + m3u8_name_size = strlen(vs->m3u8_name) + 1; + m3u8_rel_name = av_malloc(m3u8_name_size); + if (!m3u8_rel_name) { + ret = AVERROR(ENOMEM); + goto fail; + } + av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size); + ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name, + m3u8_rel_name, m3u8_name_size); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "Unable to find relative URL\n"); + goto fail; + } + + avio_printf(master_pb, "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"group_%s\"", + vs->agroup); + avio_printf(master_pb, ",NAME=\"audio_0\",DEFAULT=YES,URI=\"%s\"\n", + m3u8_rel_name); + av_freep(&m3u8_rel_name); + } + /* For variant streams with video add #EXT-X-STREAM-INF tag with attributes*/ for (i = 0; i < hls->nb_varstreams; i++) { vs = &(hls->var_streams[i]); @@ -1147,6 +1176,25 @@ static int create_master_playlist(AVFormatContext *s, continue; } + /** + * Traverse through the list of audio only rendition streams and find + * the rendition which has highest bitrate in the same audio group + */ + if (vs->agroup) { + for (j = 0; j < hls->nb_varstreams; j++) { + temp_vs = &(hls->var_streams[j]); + if (!temp_vs->has_video && !temp_vs->has_subtitle && + temp_vs->agroup && + !strcmp(temp_vs->agroup, vs->agroup)) { + if (!aud_st) + aud_st = temp_vs->streams[0]; + if (temp_vs->streams[0]->codecpar->bit_rate > + aud_st->codecpar->bit_rate) + aud_st = temp_vs->streams[0]; + } + } + } + bandwidth = 0; if (vid_st) bandwidth += vid_st->codecpar->bit_rate; @@ -1154,7 +1202,8 @@ 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, master_pb, bandwidth, m3u8_rel_name, + aud_st ? vs->agroup : NULL); av_freep(&m3u8_rel_name); } @@ -1508,6 +1557,7 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) /** * Expected format for var_stream_map string is as below: * "a:0,v:0 a:1,v:1" + * "a:0,agroup:a0 a:1,agroup:a1 v:0,agroup:a0 v:1,agroup:a1" * This string specifies how to group the audio, video and subtitle streams * into different variant streams. The variant stream groups are separated * by space. @@ -1516,6 +1566,7 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) * respectively. Allowed values are 0 to 9 digits (limited just based on * practical usage) * + * agroup: is key to specify audio group. A string can be given as value. */ p = av_strdup(hls->var_stream_map); q = p; @@ -1554,7 +1605,10 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) while (keyval = av_strtok(varstr, ",", &saveptr2)) { varstr = NULL; - if (av_strstart(keyval, "v:", &val)) { + if (av_strstart(keyval, "agroup:", &val)) { + vs->agroup = av_strdup(val); + continue; + } else if (av_strstart(keyval, "v:", &val)) { codec_type = AVMEDIA_TYPE_VIDEO; } else if (av_strstart(keyval, "a:", &val)) { codec_type = AVMEDIA_TYPE_AUDIO; @@ -1915,6 +1969,7 @@ static int hls_write_trailer(struct AVFormatContext *s) av_free(old_filename); av_freep(&vs->m3u8_name); av_freep(&vs->streams); + av_freep(&vs->agroup); av_freep(&vs->baseurl); } @@ -2255,6 +2310,7 @@ fail: av_freep(&vs->m3u8_name); av_freep(&vs->vtt_m3u8_name); av_freep(&vs->streams); + av_freep(&vs->agroup); av_freep(&vs->baseurl); if (vs->avf) avformat_free_context(vs->avf); diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c index 3349eb7..42f059a 100644 --- a/libavformat/hlsplaylist.c +++ b/libavformat/hlsplaylist.c @@ -36,7 +36,7 @@ void ff_hls_write_playlist_version(AVIOContext *out, int version) { } void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, - int bandwidth, char *filename) { + int bandwidth, char *filename, char *agroup) { if (!out || !filename) return; @@ -50,6 +50,8 @@ void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, if (st && st->codecpar->width > 0 && st->codecpar->height > 0) avio_printf(out, ",RESOLUTION=%dx%d", st->codecpar->width, st->codecpar->height); + if (agroup && strlen(agroup) > 0) + avio_printf(out, ",AUDIO=\"group_%s\"", agroup); avio_printf(out, "\n%s\n\n", filename); } diff --git a/libavformat/hlsplaylist.h b/libavformat/hlsplaylist.h index 48d71b7..a3ce26c 100644 --- a/libavformat/hlsplaylist.h +++ b/libavformat/hlsplaylist.h @@ -43,7 +43,7 @@ static inline int hls_get_int_from_double(double val) void ff_hls_write_playlist_version(AVIOContext *out, int version); void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, - int bandwidth, char *filename); + int bandwidth, char *filename, char *agroup); void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache, int target_duration, int64_t sequence, uint32_t playlist_type);