From patchwork Mon Dec 18 12:53:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 6858 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp232849jad; Mon, 18 Dec 2017 04:53:36 -0800 (PST) X-Google-Smtp-Source: ACJfBovx5cHAwRkejjDPyRJj2WhygA371DUkhbJG5BMqCb0Br+zq/4nX/Vn6XHE4j2/udRUBkom9 X-Received: by 10.28.144.10 with SMTP id s10mr11071483wmd.103.1513601616025; Mon, 18 Dec 2017 04:53:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513601615; cv=none; d=google.com; s=arc-20160816; b=xDe1ZAVnTlylpykLaLgazyMiPd1GDzi+2Utoq0QsefDpjoobPCJgVFomA8Zjso2d1L 3JhfNWnw3ZxqO8YGmgiPfG6RAQ/ABI34x/Mk4OGW0AGOZ2LrK13MxZWK2UVijOqb1K2F zLe8EQaGMmRm/E/hJ06kxxoZ2NjeGt/S0eTcVP7DRfiFTcVhxaL280fDQG9K1TInKo/d 0tYM6S0ZVIJ0rumdulastR52jzSZKDOtD1pwFx8gueeI9iDR3oMf5rQ3thU1n02FCboG k8UVw7o/4Vms/kjOeeolx4JkRj5GjEZ3NUKopoJAV72V/eDUBL19HBafbbh+OIRHH+1J 4gYA== 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=NbWmhLEAHw66cArAmkaLrXK6Mlx0kH2Oi6XNdri8nrk=; b=xgieJxDaK1gXjeBfDWYJLwCTR6rylysNFIEhIP16cSJtL/OV29/jtkoaUB69gMwSeD oV2SQWzSooT2M8BR7DxrXE1fQKn2gpl71wAcXY3Q8cwAS940E9cik8XlWstynIbx1din U5gj8dASxeUl3/MTUBxUIZopCmIghZ89B5kuMoW5lQQo89ixRA44e6UWskdh5cq16/l6 bXV0VUzyZg8qojliJVNws7aH/l5L9YpCY1rKOYWuseXo5RImzn7bqaaxlnDgKTJ9cOPI ZgjvD7weeBafMLyrQrV+zAupEwqpAqVwBcsfv+8VefGwXC4lyOhF8LUtyWGpV0b1DKst rE8A== 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=R4PHrzEE; 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 p30si8474906wmi.139.2017.12.18.04.53.35; Mon, 18 Dec 2017 04:53:35 -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=R4PHrzEE; 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 53245689DC4; Mon, 18 Dec 2017 14:53:24 +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 82F1E680B8F for ; Mon, 18 Dec 2017 14:53:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1513602513; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=7UTv/1IetttQ95aylat5MrJLOZMgK5PPjm+IdpCRD84=; b=R4PHrzEE YAjOdT0MVh8/bgtB+RdH6zVcQKXGwvytb48GvsTmfsz2re6XtV1wUKYgfHGKDboGADrx9NWrmLBWJ S+vLZgwuzN9kR+zKNRHGoWYPpnd6g97MYcqXFqzp4McIXnWRhNHahCrdfOoHk2GJcAvluWLZRai/D VlKNLnLnZCvSubmqNVsZdbiOnhZnsyPjoyp7Z251GZamCRJalLwouVExWiKxLQdi0BO4+565ISXle GB2z0eU+qlLesre864agK+a+OFwaZzDc4lxqt1aQ0qKQHwKu9r32nrvPmVrM4iVlCSKxH8fBSBUme QkzCIlge/WcKj1bKhPHOOQ/72Q==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Dec 2017 18:23:14 +0530 Message-Id: <1513601594-27964-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: X-Smtpcorp-Track: 1-QIv5RyIR1h52.NBpCCTmz_ Feedback-ID: 337386m:337386asVRLGB:337386sxc4VbkCAJ:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v7 3/3] avformat/hlsenc:addition of CODECS attribute in the master playlist 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 --- libavformat/Makefile | 2 +- libavformat/dashenc.c | 2 +- libavformat/hlsenc.c | 65 +++++++++++++++++++++++++++++++++++++++++++++-- libavformat/hlsplaylist.c | 5 +++- libavformat/hlsplaylist.h | 3 ++- libavformat/reverse.c | 1 + tests/ref/fate/source | 1 + 7 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 libavformat/reverse.c diff --git a/libavformat/Makefile b/libavformat/Makefile index cb70eac..1072ff9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -61,7 +61,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_vp9.o \ rtpdec_xiph.o OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o -OBJS-$(CONFIG_SHARED) += log2_tab.o golomb_tab.o +OBJS-$(CONFIG_SHARED) += log2_tab.o golomb_tab.o reverse.o OBJS-$(CONFIG_SRTP) += srtp.o # muxers/demuxers diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index f363418..016ada3 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -760,7 +760,7 @@ static int write_manifest(AVFormatContext *s, int final) 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, NULL); + playlist_file, NULL, NULL); } avio_close(out); if (use_rename) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 2903e4e..b6df3db 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -39,6 +39,7 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/random_seed.h" +#include "libavutil/reverse.h" #include "libavutil/opt.h" #include "libavutil/log.h" #include "libavutil/time_internal.h" @@ -1082,6 +1083,63 @@ static int get_relative_url(const char *master_url, const char *media_url, return 0; } +static char *get_codec_str(AVStream *vid_st, AVStream *aud_st) { + size_t codec_str_size = 64; + char *codec_str = av_malloc(codec_str_size); + int video_str_len = 0; + + if (!codec_str) + return NULL; + + if (!vid_st && !aud_st) { + goto fail; + } + + if (vid_st) { + if (vid_st->codecpar->profile != FF_PROFILE_UNKNOWN && + vid_st->codecpar->level != FF_LEVEL_UNKNOWN && + vid_st->codecpar->codec_id == AV_CODEC_ID_H264) { + snprintf(codec_str, codec_str_size, "avc1.%02x%02x%02x", + vid_st->codecpar->profile & 0xFF, + ff_reverse[(vid_st->codecpar->profile >> 8) & 0xFF], + vid_st->codecpar->level); + } else { + goto fail; + } + video_str_len = strlen(codec_str); + } + + if (aud_st) { + char *audio_str = codec_str; + if (video_str_len) { + codec_str[video_str_len] = ','; + video_str_len += 1; + audio_str += video_str_len; + codec_str_size -= video_str_len; + } + if (aud_st->codecpar->codec_id == AV_CODEC_ID_MP2) { + snprintf(audio_str, codec_str_size, "mp4a.40.33"); + } else if (aud_st->codecpar->codec_id == AV_CODEC_ID_MP3) { + snprintf(audio_str, codec_str_size, "mp4a.40.34"); + } else if (aud_st->codecpar->codec_id == AV_CODEC_ID_AAC) { + /* TODO : For HE-AAC, HE-AACv2, the last digit needs to be set to 5 and 29 respectively */ + snprintf(audio_str, codec_str_size, "mp4a.40.2"); + } else if (aud_st->codecpar->codec_id == AV_CODEC_ID_AC3) { + snprintf(audio_str, codec_str_size, "mp4a.A5"); + } else if (aud_st->codecpar->codec_id == AV_CODEC_ID_EAC3) { + snprintf(audio_str, codec_str_size, "mp4a.A6"); + } else { + goto fail; + } + } + + return codec_str; + +fail: + av_free(codec_str); + return NULL; +} + static int create_master_playlist(AVFormatContext *s, VariantStream * const input_vs) { @@ -1091,7 +1149,7 @@ static int create_master_playlist(AVFormatContext *s, AVDictionary *options = NULL; unsigned int i, j; int m3u8_name_size, ret, bandwidth; - char *m3u8_rel_name; + char *m3u8_rel_name, *codec_str; input_vs->m3u8_created = 1; if (!hls->master_m3u8_created) { @@ -1204,9 +1262,12 @@ static int create_master_playlist(AVFormatContext *s, bandwidth += aud_st->codecpar->bit_rate; bandwidth += bandwidth / 10; + codec_str = get_codec_str(vid_st, aud_st); + ff_hls_write_stream_info(vid_st, hls->m3u8_out, bandwidth, m3u8_rel_name, - aud_st ? vs->agroup : NULL); + codec_str, aud_st ? vs->agroup : NULL); + av_freep(&codec_str); av_freep(&m3u8_rel_name); } fail: diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c index 42f059a..b1b1ec6 100644 --- a/libavformat/hlsplaylist.c +++ b/libavformat/hlsplaylist.c @@ -36,7 +36,8 @@ void ff_hls_write_playlist_version(AVIOContext *out, int version) { } void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, - int bandwidth, char *filename, char *agroup) { + int bandwidth, char *filename, char *codec_str, + char *agroup) { if (!out || !filename) return; @@ -50,6 +51,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 (codec_str && strlen(codec_str) > 0) + avio_printf(out, ",CODECS=\"%s\"", codec_str); 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 a3ce26c..e807c6e 100644 --- a/libavformat/hlsplaylist.h +++ b/libavformat/hlsplaylist.h @@ -43,7 +43,8 @@ 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, char *agroup); + int bandwidth, char *filename, char *codec_str, + char *agroup); void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache, int target_duration, int64_t sequence, uint32_t playlist_type); diff --git a/libavformat/reverse.c b/libavformat/reverse.c new file mode 100644 index 0000000..440bada --- /dev/null +++ b/libavformat/reverse.c @@ -0,0 +1 @@ +#include "libavutil/reverse.c" diff --git a/tests/ref/fate/source b/tests/ref/fate/source index 2def034..b68873b 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -11,6 +11,7 @@ libavfilter/log2_tab.c libavformat/file_open.c libavformat/golomb_tab.c libavformat/log2_tab.c +libavformat/reverse.c libswresample/log2_tab.c libswscale/log2_tab.c tools/uncoded_frame.c