From patchwork Wed Nov 28 11:36:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Semashev X-Patchwork-Id: 11204 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7AAEF44DFC1 for ; Wed, 28 Nov 2018 13:36:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22BEB6802ED; Wed, 28 Nov 2018 13:36:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EA7B68002C for ; Wed, 28 Nov 2018 13:36:09 +0200 (EET) Received: by mail-lj1-f182.google.com with SMTP id v15-v6so23093041ljh.13 for ; Wed, 28 Nov 2018 03:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=U+xtSBkB5AMoYY2fScEpFC54f3muK571pfuUrZtumT4=; b=SlfTFck39myrAJWN0NIzuW1zyj2z77IQE0IH/7m/rEaadtYS671cvvDXNFjcpGP7pa iBUCDfM2tHoLANTvLLkQuvtzNd+MG2JIuhVsrbOi6XuXE+pt22kDTDhmm8Jga2MZU6rv FeXTR+j0kZkmxXYfekCixhFwAX34TkI0YyqK/9TLANICz9LtG5oaJHU/BDwE5TJ2zV1Q wFcF5HlLgt+mbGkTBp9jr+zQOAakHx7+Qe+WhQip3vW68W15f5zkmQcycFwdwuLYFsve +T2BReK1RVLIbfalbZDJRK84SP9uWAzZOMYMc0ocwOBu9GiUb+VB//3rK469T2IEpU58 rhzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=U+xtSBkB5AMoYY2fScEpFC54f3muK571pfuUrZtumT4=; b=PWjPNgN0+snps9ed/FHNDVxk3t+CdnQsgQXY7eaxtPCVwsWKb1VGWoxOQ+1V5J8EqZ xG0qZi/rX3bYB20odNNzYoftep7/Upu8cNhT2fw+NVFgG0II56wz552mRo/JobpoSyK1 pqzXRfqsvdYtUdd/y8lFm2OPM4lSTBXigUhZ4ADXilQEp2aq0TGvyUGaP79mmqTgzSDk vPg3agMY6eqC+3DCiwJ9RUeae7F8COiHFwsKeP3uhKPQQqVOWgavT1NemggBkswEID6m inbRoPjyrg5VtnBpjscPz5sIeIilV2qaojZzyYn1ANGIJbIcj/ByOHqOkMzyR5ZtKVks q9pQ== X-Gm-Message-State: AGRZ1gJ/av8YhB+aS74BSsdxRZNjonyJYy22SDpLxPQxsJnvh9a19aE6 aXmCfopxtAWfRjS+E8piMYr0JPV9 X-Google-Smtp-Source: AFSGD/VvboDlWeCCmyKs3mCDTJ6ptwUR7Yxe/dH9NyzeTmEjWQSkOsDYj2HeCGX1OeUaTAA/nyC2iA== X-Received: by 2002:a2e:8605:: with SMTP id a5-v6mr22425935lji.145.1543404973853; Wed, 28 Nov 2018 03:36:13 -0800 (PST) Received: from localhost.localdomain (broadband-37-110-31-10.ip.moscow.rt.ru. [37.110.31.10]) by smtp.gmail.com with ESMTPSA id i78sm1404134lfa.9.2018.11.28.03.36.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 03:36:13 -0800 (PST) From: Andrey Semashev To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Nov 2018 14:36:08 +0300 Message-Id: <20181128113609.16637-1-andrey.semashev@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavf/dashenc: Don't put non-mp4 streams in HLS manifests. 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: Andrey Semashev Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The only native HLS implementation in the wild (Safari browser) doesn't support WebM. And at least some MSE-based players (e.g. shaka-player) cannot handle WebM media segments when playing HLS. So just skip non-mp4 streams from HLS manifests. Note that such streams will still be described by the DASH manifest and therefore consumed by players supporting DASH. --- libavformat/dashenc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 6ce70e0076..a7d8c4e237 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -225,6 +225,7 @@ static inline SegmentType select_segment_type(SegmentType segment_type, enum AVC static int init_segment_types(AVFormatContext *s) { DASHContext *c = s->priv_data; + int has_mp4_streams = 0; for (int i = 0; i < s->nb_streams; ++i) { OutputStream *os = &c->streams[i]; SegmentType segment_type = select_segment_type( @@ -235,6 +236,12 @@ static int init_segment_types(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Could not select DASH segment type for stream %d\n", i); return AVERROR_MUXER_NOT_FOUND; } + has_mp4_streams |= segment_type == SEGMENT_TYPE_MP4; + } + + if (c->hls_playlist && !has_mp4_streams) { + av_log(s, AV_LOG_WARNING, "No mp4 streams, disabling HLS manifest generation\n"); + c->hls_playlist = 0; } return 0; @@ -510,7 +517,7 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, AVFormatCont } avio_printf(out, "\t\t\t\t\n"); } - if (c->hls_playlist && start_index < os->nb_segments) + if (c->hls_playlist && start_index < os->nb_segments && os->segment_type == SEGMENT_TYPE_MP4) { int timescale = os->ctx->streams[0]->time_base.den; char temp_filename_hls[1024]; @@ -944,6 +951,8 @@ static int write_manifest(AVFormatContext *s, int final) OutputStream *os = &c->streams[i]; if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) continue; + if (os->segment_type != SEGMENT_TYPE_MP4) + continue; get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); ff_hls_write_audio_rendition(c->m3u8_out, (char *)audio_group, playlist_file, i, is_default); @@ -967,6 +976,8 @@ static int write_manifest(AVFormatContext *s, int final) int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead; if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) continue; + if (os->segment_type != SEGMENT_TYPE_MP4) + continue; av_strlcpy(codec_str, os->codec_str, sizeof(codec_str)); if (max_audio_bitrate) { agroup = (char *)audio_group;