From patchwork Fri Sep 14 07:08:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Yang X-Patchwork-Id: 10322 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp349210jap; Fri, 14 Sep 2018 00:08:56 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaFkcHi1Xx6OgQkAfAzFvHCY4aKC2n8j9YKpgYPkV967/jeT7/yCeXAOUkgIrw5QScSmrpI X-Received: by 2002:adf:9a21:: with SMTP id z30-v6mr7910291wrb.47.1536908936234; Fri, 14 Sep 2018 00:08:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536908936; cv=none; d=google.com; s=arc-20160816; b=0B3P60ihNH4YwACgNZGKNDfM7/idapDpFJZPNb5pTzOVwRhR56fzKbkg9gXAEGFXSi WVePcpG5HSc3wPU6w5VyWEb/+JHgcQChyxHNBLZ57j/FtSbEl2WNfFwUN/CbE0dghuaj NzoS9svZZogp16WI4aWiKnCP7MFt+TejlM5n9R45b9fpTTbslKHEzYU9tMysFwiL1r6S ylteO8Hs9emCNyDK3ToshGQt2kgJzZJ22nhOGEPdQ9zbBj3IV/yp6aasIV4irx/fIX+V R0Y7TeocQHe2/1B/uB+qERbkVVLBd9RsETLeDlYphUGiUeZBDM8yBkCtT4ZFlu/bsa2Q y/Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=JfU9NpabA1mhZMQjvM7J9Z2/8SQ7vYslwjAcjYpnlY0=; b=WIakqK2IofBu6m3M8esVSQw5hEho3Kkc2aqgiXFdbclyPuv1FbvKIfNZ0I038bcCw0 7zOgO/FCcwpuLrxUCPK2/n/2WoqdizSHNMAUHHmKxjBloUZDjo41hRzWm3kRaNNbaGo4 R2Td3eQQzliVzMHj5VBfa7fT630g26oHgOeuefaxM//FAD3y2QMLcUTJll9Jap4ee0d0 aSrCDwapfbvA0zG6SpQCnulI+UtSxJ7z+U9KKgUyMXfWIlm6/L5uhaKocvJlycs2d/3G yR8ZAd/shKBWGGmXJ469JCNA1W9Da04+QHS65di0C1COrYXKVmPy1lOBLd/ZJ2AmtyyJ +n6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MWKWPTFM; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o16-v6si5326330wru.254.2018.09.14.00.08.55; Fri, 14 Sep 2018 00:08:56 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=MWKWPTFM; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 64BE368A604; Fri, 14 Sep 2018 10:08:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E698C68013E for ; Fri, 14 Sep 2018 10:08:35 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id i190-v6so3947466pgc.6 for ; Fri, 14 Sep 2018 00:08:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y05bTolRplfbEOWse6HHR+7MwP9cA2eH6DrsIKeczAg=; b=MWKWPTFMkXGnDceSC3VwzFpRpbJCTjDLatwLQC+dnplOW6iYALFYReo74ewEFL7c65 L6anbisq32TY46ocvIm4EWLZaQJYZhMu8Qk0B6fsWszz7MtxC8i31EQMPyoxVHN35eSe IkmScY6z5IV6FWm3J/W8hi+Q94Au6e6ZEgaJHiG/mCfsKCvItdvMun6ddH2MmOc/jKi5 5K3fs06lpyEsOBJnKOCcvg3bGZNDG6n83Kt9OrNIq4SAu4IlGYaHc7EY4iK9UGDBiMt6 qnmUWNym5Z5kkM1ouTt4buqIsGnxu410OGa+D74BaSkCzEuwOW8gCl9/OUHjAbJZgg36 BdLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y05bTolRplfbEOWse6HHR+7MwP9cA2eH6DrsIKeczAg=; b=U39KroeRByvwFOdPKj/NXeJqis3BEWmTkVwFp/UxifiWqpz8dTX8K3+f/GdkJys+g+ aFpdt9tN62xz6I4nlTMaSPM/seBuzeHIWndSfFeRK6uS6R7LY3cSHEEAXQHwsJhpQVSN QMiE+nf1jsdRA/NbDx4oKwyxHWFCJGWK1C0JP77XG8/dEwscMKbLRsrYoktcGroVnLg0 x77X5j7VuXcoMmFM0t4HOqWZcz1mzNZONqGDWnalxqHZd2Pp8sDmLgySsYb2W8DeuZsp UYliIaz0UP7U0vK2XvIYrnrw8G/oWdwOavCcUsji/xChSXaUrZzIE8xSqjUH1ID8opHJ q4cw== X-Gm-Message-State: APzg51DTVRzP4ZwdAil09CsEBuh7ki+HXy1PLWdo/BQXH2qlW7aSPOpN eyzF2fd3lEnezfqOZKzIdcNnO9ca3w== X-Received: by 2002:a63:1a5a:: with SMTP id a26-v6mr10425179pgm.9.1536908924908; Fri, 14 Sep 2018 00:08:44 -0700 (PDT) Received: from localhost.localdomain ([47.88.51.235]) by smtp.googlemail.com with ESMTPSA id r64-v6sm8552369pfk.157.2018.09.14.00.08.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Sep 2018 00:08:43 -0700 (PDT) From: Jian Yang To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Sep 2018 15:08:17 +0800 Message-Id: <20180914070817.86135-1-yangjian0911@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/dashenc: only write video streams into HLS 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Tool mediastreamvalidator reports error "Variant media_[N].m3u8 is missing audio group" for audio streams in HLS master playlist. As audio streams are already listed in audio group, skip them as variant media streams in master playlist. --- libavformat/dashenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 87e31e25fc..45763301db 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -911,8 +911,10 @@ static int write_manifest(AVFormatContext *s, int final) OutputStream *os = &c->streams[i]; char *agroup = NULL; int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead; + if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) + continue; av_strlcpy(codec_str, os->codec_str, sizeof(codec_str)); - if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && max_audio_bitrate) { + if (max_audio_bitrate) { agroup = (char *)audio_group; stream_bitrate += max_audio_bitrate; av_strlcat(codec_str, ",", sizeof(codec_str));