From patchwork Thu Oct 21 08:15:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 31195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp332628ioa; Thu, 21 Oct 2021 01:16:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyd25nDYC5DjYPCaY50Hvw0tM3ogDcsYUPA7z6uu/0Pb7zdyUbu5uF8+d2xLHbuWS/dYd/S X-Received: by 2002:a17:906:4a09:: with SMTP id w9mr5505366eju.419.1634804192592; Thu, 21 Oct 2021 01:16:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634804192; cv=none; d=google.com; s=arc-20160816; b=pP8Fi7T6MZiWHlmzx2+QK/kdNdT5v6AyEkPRHiVG/KF6qWk4EIrioyaHsQs/u00zL4 S04ozNx/hvC6kmwJ16G/YngGcEW1pxmaJfVsD6+rvb+0DeXVmhSZWgxt4KKWB7XFd3dE Yx9d00gFckl8yVJsvwpQe9j37oMRDbYvkPl0SbenOnsyfFSpddX/2N0eij880d4ZlQBK yC2bGVG5Ru+RQvyiQFU20cUmxYhGPQKlBjDtMldcYNJSk5WG+R973lNVxIPjZtBPESYX ECP4oWhX73UHd5baMrpOLyPMjQTBmdk3wyqx6+r9BMBdJKKA4Z2VWTsp55xgWbeyK1UO GSzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=VnDcqK6VeNdRNWpORD3FynEfO0/TcvZaaiB0GLdY8bg=; b=oZMtQ+ZT3eiChXhqgqnxOeBbZ3e6xsLCqPB7ga4akCQs2JBgzTeeEcI3TIWxhOT6B+ 8coXxgki+w4E0o7IjQ2mVIj0pvsqrRmlsHtNwcS8Gedpciv+l9pqER03AtTmCtMzxUBa av9etYsNuYr2JjExgtxt3xavOCsm29mJiG5JiPeCnVflwxETkj2sxULTYmwhCn82JkV5 VAKqBWUPCzLdpIZgkZsuGAVSH+N67umuG1gd/FinzMlJcFII+wpqVgZcCHzpXUZDNX+c PV1WpsJxmi10xQXfCFMAKVXFK3iqyzPoUDTfA9MV9UjdwssR77cz9wOW4cwFcsUkibPF iqfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=nvlxzBUC; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id yw20si5867788ejb.53.2021.10.21.01.16.14; Thu, 21 Oct 2021 01:16:32 -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=@foxmail.com header.s=s201512 header.b=nvlxzBUC; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9112868A7CB; Thu, 21 Oct 2021 11:15:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-192.mail.qq.com (unknown [203.205.221.192]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05AEB68A618 for ; Thu, 21 Oct 2021 11:15:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1634804145; bh=5k8K6dlhd+8Wc8aLzlY/RgDJgT1W8SiJrsDouF09LMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nvlxzBUCHza9rO+ky9+oVb9ZuXKUFuDdWmJ2bDlhx9lOsRE258cfo5K6zMin1Fhd1 6venfWB5hp/cLbPoXgLMEw0Bv8a/eyQpXo6nFQjXH4+0uOS38rw97fasTUlStiv7Eb jDJEWm0SBGo1HhxaBMl1LvIQYK9EiHFu9Elvepu8= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.61]) by newxmesmtplogicsvrsza28.qq.com (NewEsmtp) with SMTP id 3EA0628F; Thu, 21 Oct 2021 16:15:42 +0800 X-QQ-mid: xmsmtpt1634804143t4kzqe2qz Message-ID: X-QQ-XMAILINFO: MIXpHopat2IawWSLgqSD1uS2sN5dZwBwxI+DsFr+KWZPbTOpCHDLN78CZpAbTH U/OiZ4+1xoUDIg/8tsMXX2bZnw272xCso9j+WS8rYxsrWLr96Vx3unA1lv8ipcOBD3S1pTfljoY7 xLURINGt33zJaZe1fcOorB8YWX1Rf2SmNuMcpLiOsV1dqYSsKu06bzAKagS3Se66nK4onff3cZR+ 6f4+d5CXNYxn6pp7oxd+h5xay2ydiSGo4IYhMDhyyTaeC1OccrYMfEeyM5KZgTB9cyPPewSRkv24 6END//rNtlRL5ZD/sAk3OfD+yJOqtQaSR5XGtVqTar+UfHF4D83X5eS8cwsEd5MXXLiXYRt4p0RQ L9m/f0pcmW6ua//yCiCMkp/0oRuKy5C+9kIWDJ3Zx4g827GHj6lbOhl66AVwfMKSmQ8WcIr2lDB6 JUH+rJj5jvZT/jJ+HhnHqIPa7+XOgXKUTCuyrUq3Yc4ZmMvy+twl7jnufqzOUan9lQ8yPOIkw23+ NJ3ta9mx++Wz5t01Odps8dPmD9oPS69ethYBXhNFixpOS1ZLx61VRGCt891S5UPNnQ5QLa+5qY5e Ra/pnYXbSeiboY/1JWKQdXWlwTH/xeBYfhW2FRXaf3IHcVwQtI/XEHlaANr29XH6mnFY0jUogSI6 GQXx4gLeKaWnDqaW/fUbv1vO1m/NDyZqOsGsx5i1HFEi7GBvl652mUVpxgoD+rsFeHVE26E1LZuM 2ioZdQP0jl2DfLAJ55oghn4qpsbAntyXd2QBT6t33Nlr+/MN24Ycf++gc4HnuDoBg8KP7tQTZX2t uGWfgz1ZRLkIDQvGrTC6iWMUdHl0mwIgI+/9XoFbh/+DbQIHzahiDINNhGm6vzz/L4qIR+sh3RGA == From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Oct 2021 16:15:31 +0800 X-OQ-MSGID: <20211021081532.81477-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211021081532.81477-1-quinkblack@foxmail.com> References: <20211021081532.81477-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/dashenc: enabling streaming and hls_playlist for lhls X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: icvKP0SNgCyh Try to make the feature easier to use, especially since the user have enabled -strict experimental manually. The user shouldn't be surprised that hls_playlist is enabled for lhls automatically, so change the log level from warning to info for that. --- doc/muxers.texi | 2 +- libavformat/dashenc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 7338e8d5d3..67c281d171 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -365,7 +365,7 @@ Enable Low-latency HLS(LHLS). Adds #EXT-X-PREFETCH tag with current segment's UR Apple doesn't have an official spec for LHLS. Meanwhile hls.js player folks are trying to standardize a open LHLS spec. The draft spec is available in https://github.com/video-dev/hlsjs-rfcs/blob/lhls-spec/proposals/0001-lhls.md This option will also try to comply with the above open spec, till Apple's spec officially supports it. -Applicable only when @var{streaming} and @var{hls_playlist} options are enabled. +Enabling @var{streaming} and @var{hls_playlist} options automatically. This is an experimental feature. @item ldash @var{ldash} diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 0370a482fb..0c5aaa7b5b 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1396,13 +1396,13 @@ static int dash_init(AVFormatContext *s) } if (c->lhls && !c->streaming) { - av_log(s, AV_LOG_WARNING, "LHLS option will be ignored as streaming is not enabled\n"); - c->lhls = 0; + av_log(s, AV_LOG_WARNING, "Enabling streaming as LHLS is enabled\n"); + c->streaming = 1; } if (c->lhls && !c->hls_playlist) { - av_log(s, AV_LOG_WARNING, "LHLS option will be ignored as hls_playlist is not enabled\n"); - c->lhls = 0; + av_log(s, AV_LOG_INFO, "Enabling hls_playlist as LHLS is enabled\n"); + c->hls_playlist = 1; } if (c->ldash && !c->streaming) {