From patchwork Mon Apr 19 14:09:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560459iob; Mon, 19 Apr 2021 07:17:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzriveJjFMoRVsF3GO2l9mFVkUfsocOTg/BfG2wnkK+BAeFuYRoCE4dUZg2VkVmvvpJP8J7 X-Received: by 2002:a5d:6b81:: with SMTP id n1mr14651603wrx.265.1618841834063; Mon, 19 Apr 2021 07:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841834; cv=none; d=google.com; s=arc-20160816; b=jArW4mtXJuVoubUE96zzgdebP1LWB56eLaJES+b2jdxiRS208UcwrHhRcJXOUxEIq+ dzLkbL68XrtiLGtv9FBHB0441ei3lL/XuGlmjEGim3X6RjJVRwvvJt5GB6R3H3x7CCwY iJw6GdK8+rvGdFoKxDflV70tB46QlB4biWBNiRRVCzq+qcg1ZMabvjGO8s4zvUNOEOcu W06Lh/N3P+4UWk7Zo9LTOcPkaMAmgYPnNdMuSs0bQvRKIeO39EMIxKXhtao11OGPbZB9 SrDn5pW8DaURuO0qvDjc3G2L6QpEWy1AT0rK7jD11ESfEiLVemHk9ItNGK4oV9vKbVhZ aaRw== 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=A8/wzpOG1Cv4dF/u5f8LS1FSvL4QmCri/OgNYS+k44g=; b=kYBbIK8jtY0//DNqNN4hBVQfCwiaXGeCsIb+t6SF4m0d4A6sZG+3r7q57HjrcHX/ZL 4pXt1pH+4ars5z2NvY17TFNMJOxVSf4pQYZn0EuuLTVNN2GMUbJqXI0BjI16hwsh4V60 s6vWIldBsqa3B9jI7YJgGu497QeMRrzOYtOJb6S6vMhnY62N8J9DbanWhmcPTr8s1z/e vJ5GhTPN99t+jg2Wuv5zTwwhfhQe70+KMFXX7UQ8sjzmoOxJ/rRBtbFk8WUOodVaBvnZ bmLFWdkn/7c4CrYkhdZZ9Goxyik2EKG5vE4GAekPB1N9q5AoG3l2CTEM2CJMTNaqD3mE saYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lK0rSTxT; 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 i11si14102436edb.109.2021.04.19.07.17.13; Mon, 19 Apr 2021 07:17:14 -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=lK0rSTxT; 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 25BD4689900; Mon, 19 Apr 2021 17:12:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EEF9689753 for ; Mon, 19 Apr 2021 17:11:58 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id y12so26141036qtx.11 for ; Mon, 19 Apr 2021 07:11:58 -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=/qyCsve9IvWXCWocB1WZbXTjLstSyMnhlCmY1jUbzos=; b=lK0rSTxTAoCkLeIOGbiAIPtB/kSRADwa5PPKHY5cOLxWzfrMe0trRrQa5Ud4vu+DG/ nGtMFPMZZ2/WizsiNhP+YnpA9yVxCOR3RLMxK6sRAsS6ETqqm20k8ZR0zZ0b74YkuTgb +7XsMzYhm8hkLHD5cAMUNj4ev/RuRGfqoIu06e8VCqn2AN4T8WsYDw5YBLwGkEEznOp8 CxHrO8wwE4u00PX9Nm0TdV1nwxDvct617S6+KlzmD3P2gHXPsmnZymmgtnDTNAcQyqm8 MRW38AfS9MfW6L5nCtwDQMHIqgDdRozhuVh1vMrvOHUkN7IU10SVT0w3IuVS0mabKu3l BjUQ== 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=/qyCsve9IvWXCWocB1WZbXTjLstSyMnhlCmY1jUbzos=; b=djaz8S42GmueoJujT0QBtN7XrNq3zMjRU72Yo1EqBRzHytoZWCyH36pJUms0y2E2Zs Lc7NVbB992zw8p3UFWIkuYBSUZppnjDfsYZB4ez/cUULBbaEEYySjY2yJ88Ho+5cHkkm VE6ru+fkIfSXY1Yul/gqudLaKJAkU+RepAamksKDcOQVZTX14opymZyx05ACj/W/3W9L JwF4Lh/shaSLR5of79TCEU9gkZmZC3i/kPddu0FRKevton0PpVDxLUO94PGDS63LK5jH JQCxkggR4uM1UQKIoRXfkUS8pvQANGYaatNZyQVYZwIQ0HfjdZpqMACOWE+68kZewVHN ++vQ== X-Gm-Message-State: AOAM532dNWYegK+2MPhDDGSEHupJ4yf+TQGVH0ZYAVBloIgj7tvjiN/0 84+/w0H3O2NloE1FHLR6A21EQOMlW2g= X-Received: by 2002:ac8:5cc4:: with SMTP id s4mr11696857qta.214.1618841516988; Mon, 19 Apr 2021 07:11:56 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:43 -0300 Message-Id: <20210419141024.8174-47-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 46/87] avformat/dashenc: Remove deprecated min_seg_duration 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: StthdIzR6FwM From: Andreas Rheinhardt Deprecated in 01ba52852d2ada3c79fe02a7de5bc1fdc27d56e8. Signed-off-by: Andreas Rheinhardt --- doc/muxers.texi | 2 -- libavformat/dashenc.c | 12 ------------ libavformat/version.h | 3 --- 3 files changed, 17 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 29f1d3aee4..9aa4f86801 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -211,8 +211,6 @@ ffmpeg -re -i -map 0 -map 0 -c:a libfdk_aac -c:v libx264 \ @end example @table @option -@item min_seg_duration @var{microseconds} -This is a deprecated option to set the segment length in microseconds, use @var{seg_duration} instead. @item seg_duration @var{duration} Set the segment length in seconds (fractional value can be set). The value is treated as average segment duration when @var{use_template} is enabled and diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 81a5c2b452..a73fa60d2a 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -147,9 +147,6 @@ typedef struct DASHContext { int nb_as; int window_size; int extra_window_size; -#if FF_API_DASH_MIN_SEG_DURATION - int min_seg_duration; -#endif int64_t seg_duration; int64_t frag_duration; int remove_at_exit; @@ -1374,12 +1371,6 @@ static int dash_init(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "At least one profile must be enabled.\n"); return AVERROR(EINVAL); } -#if FF_API_DASH_MIN_SEG_DURATION - if (c->min_seg_duration != 5000000) { - av_log(s, AV_LOG_WARNING, "The min_seg_duration option is deprecated and will be removed. Please use the -seg_duration\n"); - c->seg_duration = c->min_seg_duration; - } -#endif if (c->lhls && s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(s, AV_LOG_ERROR, "LHLS is experimental, Please set -strict experimental in order to enable it.\n"); @@ -2340,9 +2331,6 @@ static const AVOption options[] = { { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, { "window_size", "number of segments kept in the manifest", OFFSET(window_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, E }, { "extra_window_size", "number of segments kept outside of the manifest before removing from disk", OFFSET(extra_window_size), AV_OPT_TYPE_INT, { .i64 = 5 }, 0, INT_MAX, E }, -#if FF_API_DASH_MIN_SEG_DURATION - { "min_seg_duration", "minimum segment duration (in microseconds) (will be deprecated)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT, { .i64 = 5000000 }, 0, INT_MAX, E }, -#endif { "seg_duration", "segment duration (in seconds, fractional value can be set)", OFFSET(seg_duration), AV_OPT_TYPE_DURATION, { .i64 = 5000000 }, 0, INT_MAX, E }, { "frag_duration", "fragment duration (in seconds, fractional value can be set)", OFFSET(frag_duration), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT_MAX, E }, { "frag_type", "set type of interval for fragments", OFFSET(frag_type), AV_OPT_TYPE_INT, {.i64 = FRAG_TYPE_NONE }, 0, FRAG_TYPE_NB - 1, E, "frag_type"}, diff --git a/libavformat/version.h b/libavformat/version.h index 230ebd8a3e..baef650f8e 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_DASH_MIN_SEG_DURATION -#define FF_API_DASH_MIN_SEG_DURATION (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_MP4A_LATM #define FF_API_LAVF_MP4A_LATM (LIBAVFORMAT_VERSION_MAJOR < 59) #endif