From patchwork Mon Apr 19 14:09:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559671iob; Mon, 19 Apr 2021 07:16:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjr34lsZhYJudQFmjsw+dxNWMMRMiTn/fLrHPI5/xAqQxvkJT0yLPSrjuI/R8xBTZ1IZ+z X-Received: by 2002:a17:906:29cf:: with SMTP id y15mr21886329eje.500.1618841768721; Mon, 19 Apr 2021 07:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841766; cv=none; d=google.com; s=arc-20160816; b=LTFXUPzjxN+66uGXSuj88K6mA1/JlV3ZRhZxy/9UMHWLVhAVzWdh4cjqeagnVgOlYp kE48Q6MocfECqZeLy1QDfL7mpvXHLFY1KkLqrWgfA2hz96mvWGGzUk/nifR4tDr5+9NH 2lqbQH35y3n8vle17OC57x+rpy7VxPOI8UMWuj86aNp+XnKFvisPccdfKrf9jd6p3owD OrLcOuPxcn7YGJ5YmAQaetn52gVdS0e208MX7muy5OyjO4ZqogJuesxn6mdkWpibITo2 ICkf9EIYjRivt5aids92wq6+A61Xn1tKOLUKRIy1aPD630vRm+1irh1XDyzJAdUZb8PF eolw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=VPIkbRzzzLzmjLl3awBOzi98EdKegAI4aUczUh2tZyo=; b=RybnLea8o1CaKUMS9ZeAXSKvVgSVGp/SaOXAdjDFha1l29e9y06QX/wn0Dqau+7GN+ oW+TDQyd2p+W3mJ3eCz4Z1rjISYkQFcLoew/iWIUHlEVItmlASEhCkueTjYoumlQ0EpX fY0t0cseMUdLC+8ANVrDusDN6+LLMByFjeS+NYPy9UC+HzS23Fyr770mp1yd7e6tc6db I5+7EjQy2RCg7Osl5qnqDfoJqyhf26vdiEgvKes/VFzfj5AkoVudMHJN4A/8mG+jUafO jQ4RlGMlLPs0SClsVGss+1HHcEng1cda4+0t3XtxO5KhAJR9aClbBvS5Lq//2fdvuj9L Y4aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Aj9zGEeX; 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 t20si3004774edq.484.2021.04.19.07.16.06; Mon, 19 Apr 2021 07:16:06 -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=Aj9zGEeX; 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 9277D68924E; Mon, 19 Apr 2021 17:11:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B77F66881B5 for ; Mon, 19 Apr 2021 17:11:51 +0300 (EEST) Received: by mail-qt1-f172.google.com with SMTP id h7so26144284qtx.3 for ; Mon, 19 Apr 2021 07:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=DDnIxYoMH63Ybw+87mr26idkXq8H9zx8Lwmdvde8c1A=; b=Aj9zGEeXmpc/sl321PLPOVQPwknZXb4GclZPaSEJmwpXczweTJh0raO+Q15dnDxr7w tSwkrP0cRbupnRs+lF2/IKcr4VPho+9wtel6VXjll/tpZ8aWB9Se4iPJ0DUCdl9Dprmm r/e701VNK0EdODVqPvFrmdVMqEzxVeWbwOuguZlpW86FkDD4X1kzwIZouLNIvY+/7oR7 IlxFjnUErJ7NvSk7GVlDBrMOMWiwEMw7yBMpuQNbjU8DDvLGPPTlLhXGGk646gS6n6jk 0kgTvsYvolcNgMgyXXPFt2stvpF1Gz6ivmiL8BoHYhYv3vBVFYo/rhJnDg37z5fjWI4O CTZQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=DDnIxYoMH63Ybw+87mr26idkXq8H9zx8Lwmdvde8c1A=; b=QNxLtHsksbQbPWPcqqG6wRO55RkXUR5ftljZJcmsghxmoy+uJTqccDIFC3LbzyPXfv noKkG0GiZ6uQbfJRWrHBDH8jC2THqvvphyYTWcHKqmospSfo0WBTIIr50U6MhOVAYybh BMEj8Imyz1u0ELneOk1JbF/kHciBvNcT9IGBg74bFt3fYmP3oIMDdp9Tk279zmk7GbDs jzR/xY4PmWPOXvFpOHuxAu0Okuo73DbUorpu0gM8vL9VHjg0GU1hsYzj66WHd1FIIfwT K1bRc1l09kcUpDu4BuH20LQfCfjDQvQxed0ow4iP1ekUHiC82eBEfzOoBe44mcciX4ra BMTg== X-Gm-Message-State: AOAM531+/K8nGTHi0Ut1WIUzK48y9b274PMCEBNnmg6NUtGtJwClud87 RRVMrGLDxZ+aqwbZtvaEw1VuCi7wV58= X-Received: by 2002:aed:2042:: with SMTP id 60mr12062257qta.340.1618841510256; Mon, 19 Apr 2021 07:11:50 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:37 -0300 Message-Id: <20210419141024.8174-41-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 40/87] avformat/hlsenc: Remove deprecated wrap option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5n1bfqrTQ59Y From: Andreas Rheinhardt Deprecated in d96ebc5ef88024869de06bcf92b2ad99b01d47e3. Signed-off-by: Andreas Rheinhardt --- doc/muxers.texi | 9 --------- libavformat/hlsenc.c | 26 -------------------------- libavformat/version.h | 3 --- 3 files changed, 38 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 93f79274b6..fb5fde05af 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -748,15 +748,6 @@ Set output format options using a :-separated list of key=value parameters. Values containing @code{:} special characters must be escaped. -@item hls_wrap @var{wrap} -This is a deprecated option, you can use @code{hls_list_size} -and @code{hls_flags delete_segments} instead it - -This option is useful to avoid to fill the disk with many segment -files, and limits the maximum number of segment files written to disk -to @var{wrap}. - - @item hls_start_number_source Start the playlist sequence number (@code{#EXT-X-MEDIA-SEQUENCE}) according to the specified source. Unless @code{hls_flags single_file} is set, it also specifies source of starting sequence numbers of diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 9a848b6470..3b9f61d2cb 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -200,9 +200,6 @@ typedef struct HLSContext { int64_t init_time; // Set by a private option. int max_nb_segments; // Set by a private option. int hls_delete_threshold; // Set by a private option. -#if FF_API_HLS_WRAP - int wrap; // Set by a private option. -#endif uint32_t flags; // enum HLSFlags uint32_t pl_type; // enum PlaylistType char *segment_filename; @@ -1063,11 +1060,7 @@ static int sls_flag_use_localtime_filename(AVFormatContext *oc, HLSContext *c, V if (c->flags & HLS_SECOND_LEVEL_SEGMENT_INDEX) { char *filename = NULL; if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - oc->url, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else oc->url, 'd', vs->sequence) < 1) { -#endif av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', " "you can try to remove second_level_segment_index flag\n", oc->url); @@ -1177,11 +1170,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, vs->initial_prog_date_time += en->duration; vs->segments = en->next; if (en && hls->flags & HLS_DELETE_SEGMENTS && -#if FF_API_HLS_WRAP - !(hls->flags & HLS_SINGLE_FILE || hls->wrap)) { -#else !(hls->flags & HLS_SINGLE_FILE)) { -#endif en->next = vs->old_segments; vs->old_segments = en; if ((ret = hls_delete_old_segments(s, hls, vs)) < 0) @@ -1702,11 +1691,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) } else if (c->max_seg_size > 0) { char *filename = NULL; if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - vs->basename, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else vs->basename, 'd', vs->sequence) < 1) { -#endif av_freep(&filename); av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s', you can try to use -strftime 1 with it\n", vs->basename); return AVERROR(EINVAL); @@ -1745,11 +1730,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) } else { char *filename = NULL; if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - vs->basename, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else vs->basename, 'd', vs->sequence) < 1) { -#endif av_freep(&filename); av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try to use -strftime 1 with it\n", vs->basename); return AVERROR(EINVAL); @@ -1759,11 +1740,7 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) if (vs->vtt_basename) { char *filename = NULL; if (replace_int_data_in_filename(&filename, -#if FF_API_HLS_WRAP - vs->vtt_basename, 'd', c->wrap ? vs->sequence % c->wrap : vs->sequence) < 1) { -#else vs->vtt_basename, 'd', vs->sequence) < 1) { -#endif av_freep(&filename); av_log(vtt_oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", vs->vtt_basename); return AVERROR(EINVAL); @@ -3120,9 +3097,6 @@ static const AVOption options[] = { {"hls_delete_threshold", "set number of unreferenced segments to keep before deleting", OFFSET(hls_delete_threshold), AV_OPT_TYPE_INT, {.i64 = 1}, 1, INT_MAX, E}, {"hls_ts_options","set hls mpegts list of options for the container format used for hls", OFFSET(format_options), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, E}, {"hls_vtt_options","set hls vtt list of options for the container format used for hls", OFFSET(vtt_format_options_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, -#if FF_API_HLS_WRAP - {"hls_wrap", "set number after which the index wraps (will be deprecated)", OFFSET(wrap), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E}, -#endif {"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}, diff --git a/libavformat/version.h b/libavformat/version.h index 39aa408fd6..7f04b92d37 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_HLS_WRAP -#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_HLS_USE_LOCALTIME #define FF_API_HLS_USE_LOCALTIME (LIBAVFORMAT_VERSION_MAJOR < 59) #endif