From patchwork Thu Nov 30 11:32:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 6469 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp505182jah; Thu, 30 Nov 2017 03:33:05 -0800 (PST) X-Google-Smtp-Source: AGs4zMYNcGs9V6eNxEknA2DFaPMMcBEe++CXGYHFwDaUBwMLSwreDGSJ6PjqNiJHR09ejFZ/4FQt X-Received: by 10.223.174.147 with SMTP id y19mr1806637wrc.97.1512041584925; Thu, 30 Nov 2017 03:33:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512041584; cv=none; d=google.com; s=arc-20160816; b=XsuCi1D4+NrP8jt7TA9QimECoarpDINv59naiaDMM6tHtj1IDIheFPgHkO2GBTj+la 2C6AYcZcJC515XS0zS7aAWs169Po0BD0p3vIA9hPoxgSURINEJx9cd1j40XT8DVtSINk bWuDvIZWjlN4cGlsFOaoN1oukFvUu5IzTMNUXPjutWsx/3r7sxurt2mOjcMs+MwuFhP4 IXub3E+NXpr7rGNCcahi13HPQPfg8NcubsaaTx8ZUf8Epe+hZkGpXbQLpGlxlrABDVND Zqk6s8zXKcVbbdQCrH6S6x9Lr+/IrY3/l0WxMgk9icTPmqzTKarufN4JKVdtyAYsUZav g/0A== 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=XxMSbEh2Sz7+iX/RW6xRu8vxo4wf9zaY8DpBrTD/IjA=; b=aPks0vspOzy3n59ZbQCRjj/huk6ptexcdaBGFmeg7hI7LVl2rwhiqwRSJKIkt6rGg3 5FuDBr1I9Z4svpglCSQ9xXP9TqeYHit+qCAk8etM55NqLRB0RAfEcmqGq7gT43swC3g2 GvruKliZQPr+75Fz2Twrq6iW3wXGKfA2u1+5Mmx97zM/AALCmAu8YBpPVoPfYJvCgXu8 +eTv5Cd1CROPCxrUhkv5gBvIuOdAfPoCvQpicwhSp/4KCCjoEcRbe9AiqYbgJw6cd/By 6FhWmShKodjJe/gfQwaNgS7RxEw+kC5+EM50j7LdPSXh/BlSf267et1zOeaaDQqBqDvR VWmw== 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=zTfgk33F; 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 o24si3016780wmi.38.2017.11.30.03.33.04; Thu, 30 Nov 2017 03:33:04 -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=zTfgk33F; 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 29C7268A395; Thu, 30 Nov 2017 13:32:59 +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 9358468A29E for ; Thu, 30 Nov 2017 13:32:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1512042481; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=bK54qET0zctqHd8Bd6DE//9ZonCBDqrgG1qwKH928Is=; b=zTfgk33F 0J+C0PssuVV/r6eMCtZqMoJ0D2nlliFsi7it2Vbi8/q1c1wHJQXFGFFhGNKSL8Z2ia0AgPg+Rsv4q Dcet+yXzr3kfFoG7m7BTy070vzDwP/wNXlSU4g6uXJCYfIx5l4BOv8Z1JdGPBlqKWHaUflKF7QrCv 3Qz0Q36OATJtYRbv9AkzhE/BwJG/RdAgnbWaECk0JckTDJVL4RP3mNLqjr5V5CrRsJKy3M7ZBfyNn TyxVTYZKPCQgbBGVUi/2tCpCMCskZ7f0dWStmlZ0+vxp7JMkitBs+x2B2N/ueQR1LKCAV9PEC4QUp qgUJ6drNr03hhOoRuiMdcsxjGA==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Nov 2017 17:02:52 +0530 Message-Id: <1512041572-23671-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511537439-13604-1-git-send-email-kjeyapal@akamai.com> References: <1511537439-13604-1-git-send-email-kjeyapal@akamai.com> X-Smtpcorp-Track: 1-KN5uRyIucXLt.H6xp5n3DX Feedback-ID: 337386m:337386asVRLGB:337386s5uPfr94Qz:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH v5 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 4bffdf2..2bdb777 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 90cd2d0..e0b1679 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -754,7 +754,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 8d4b333..0702124 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" @@ -1074,6 +1075,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) { @@ -1084,7 +1142,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) { @@ -1198,9 +1256,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, master_pb, 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 5e12682..eaf598f 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 3231733..476cfc4 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