From patchwork Wed Nov 17 11:34:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 31459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp620575iob; Wed, 17 Nov 2021 03:36:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwt1qnfqs17M0UAVbAx/2UM0qScSEOF6BIZ/L/qxSrz2AehUc8SxU4nFrP8djSf7AgO3jwB X-Received: by 2002:a17:907:1b16:: with SMTP id mp22mr20928083ejc.487.1637148981009; Wed, 17 Nov 2021 03:36:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637148981; cv=none; d=google.com; s=arc-20160816; b=SWftyHFrqVsxPlLhq2kHNo5mKqlYWq8AYjmlJ/fJQCpg35F6jZGu34siJJpevq2k3W OJ2mEKD38AYTmDeglC1z+lLmQ7plKU/dSn0G6JbVaXH2JBtfOOkfdH4n7jP/k1KXm9Lf g3iAH2USsWKnmI6bILxNPI8eRHX7LpsUamwmXpoQbIlYELsZGbKEvKgSgeVZmS8/ilpT PP+KEkgeKykCDVBEU8H0sdX2kn8j5UuGojwD5BeBXhgwG9aJMYWHXqaPjFnNUmCFPdDA oVzYedA3GEXRd08awKq73iJzv7rS6xrTme8sqIhjozByHUPW64+IXBWaRBdD64RRSn5Z d4PQ== 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:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=KJwvIvlZ73z6r+cTmlKS0eqoPVXn+83hMyVqcAhNL6k=; b=luGXPlza2Q5hQfxpOhIAsjmd8MvgOu4sKZCEMszsgfTLhi5rmBYgJuu+nlmxYCT10T QkIlB0Cb5SIQx940Lbmn8qrvXEPqnS3vNd8fc+BmDVSQ7WBnx/8GfkAsSrIqZ8Zpuss4 ff/2hg47+yUBwbhkj5gj51LLFommAwYI+iLcyz8eRW8RL3ngikQxp42p0UQoztTvIs63 CB7ZXjjlKScE8eckSvwQ8zy7efKvr0UGxhZwRkvA0zKf/uywAyKpdPdz49tZaFpCibcJ 8bEvuqrx2U2QhiZPyQn2YjdbW/BG2V7eiZp2yq9mUZ/IPoh8GYSKdfCOtaWkdjwV+XxR HEug== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z4si43505577edp.480.2021.11.17.03.36.20; Wed, 17 Nov 2021 03:36:21 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F8EB68AE6D; Wed, 17 Nov 2021 13:36:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg604.qq.com (smtpbg604.qq.com [59.36.128.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43EC3680979 for ; Wed, 17 Nov 2021 13:36:11 +0200 (EET) X-QQ-mid: bizesmtp37t1637148888t7ff9vsu Received: from localhost (unknown [103.107.216.231]) by esmtp6.qq.com (ESMTP) with id ; Wed, 17 Nov 2021 19:34:47 +0800 (CST) X-QQ-SSF: 01100000002000Z0Z000B00A0000000 X-QQ-FEAT: x0QZ2BuxkV3/uTOXcVEOh3jAugACd6XR9bknY0+mbSjXqpHuOCT2nb/SvXFsi fpsfPMZnE5TeK146rGu/MnlZJpXvDWX+T+OyURDLLIczJRpFyDlz7qmJMzgamGgoG6T0Qdc icFvVznM5UejP+7bEhYAyeHxWQgXbjwkAVRKUNuSy++pnS82UX4uXNqmbVi2Gb2VfiAFB+t h9La/wtkSd354bhTsxGZzn/yrTDo61OfKHLDvk9gysczZHmMXTgq/7QrFf46Q2Ul91fVgi2 9hg5t/X9mUhr9pzRAA/i6UeehU0giS+g4BtZ5KO4ZwRiXLqrgxgWOKxV8ge1z5dsqU6g== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Nov 2021 19:34:44 +0800 Message-Id: <20211117113445.85351-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgspam:qybgspam4 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: add hls_segment_options correct the segment options name 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: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1PWhGLU5iMuE From: Steven Liu Because the hls_ts_options will be misunderstand by user that only can be used in mpegts segments option. So add this option for segments. Signed-off-by: Steven Liu --- doc/muxers.texi | 4 ++++ libavformat/hlsenc.c | 1 + 2 files changed, 5 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 7eee8c1be6..287ea569fd 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -919,6 +919,10 @@ This example will create a directory hierarchy 2016/02/15 (if any of them do not produce the playlist, @file{out.m3u8}, and segment files: @file{2016/02/15/file-20160215-1455569023.ts}, @file{2016/02/15/file-20160215-1455569024.ts}, etc. +@item hls_segment_options @var{options_list} +Set output format options using a :-separated list of key=value +parameters. Values containing @code{:} special characters must be +escaped. @item hls_key_info_file @var{key_info_file} Use the information in @var{key_info_file} for segment encryption. The first diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 98608a834a..db0a4675fd 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -3107,6 +3107,7 @@ static const AVOption options[] = { {"hls_allow_cache", "explicitly set whether the client MAY (1) or MUST NOT (0) cache media segments", OFFSET(allowcache), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, E}, {"hls_base_url", "url to prepend to each playlist entry", OFFSET(baseurl), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"hls_segment_filename", "filename template for segment files", OFFSET(segment_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, + {"hls_segment_options","set segments files format options of hls", OFFSET(format_options), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, E}, {"hls_segment_size", "maximum size per segment file, (in bytes)", OFFSET(max_seg_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E}, {"hls_key_info_file", "file with key URI and key file path", OFFSET(key_info_file), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"hls_enc", "enable AES128 encryption support", OFFSET(encrypt), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E},