From patchwork Mon Apr 19 14:09:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp560319iob; Mon, 19 Apr 2021 07:17:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxV15E98+XbPFkLPFzNpMsJypXVE1GQI6zVYxCcLKU8DeQXhZ8PEbCsfPkNPn4WMA5l8rwN X-Received: by 2002:a17:906:a45a:: with SMTP id cb26mr21708424ejb.537.1618841823015; Mon, 19 Apr 2021 07:17:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841823; cv=none; d=google.com; s=arc-20160816; b=HMD8LJjVbBxNdTZEUyQ2Pj0XSkho/BudSXVSpZj93Bq7a7zPivOrC0y+L6DNsNvlel 5I9nUYyD10TJxtMujZFuxEV8CK/SI6+Gu5wFj1BoHrCMvBmPH9KGzP1BE5oXitUIM+pJ b1mFVSNzNJ8iAq+sWokrt5PXF4cm0tgAvfX1/tdNsumLOsmwWM3Yfzut2rzbhdoUwTw9 ii/tdlHzqBR9iK1H1R7tddt4exzTV0HrFEHjSpuJgWx+1hqFdd15fFAQM9bY4YoV0RPC 1sYIR2ybWdN1YwlS3rZvW3UfzG4ahcJJbSKPrX3TpBHE57WC7kLZJ3f2HSC1vCw1N25h sfAA== 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=OmY+2JihYzX7ObC0zeWbacnbaJZ4GCIFfKw0Ln6icFM=; b=jrhOVC5p2AMAlF3MavDz5DOthG7OarNYBt/ZH7CmOFm0supHasFgdB22t5Y/Tama1u nZbz0XjegGmOmjEl3nZNjVVinmdxCeHujuR8ae42cNxkmFMoL31TfCyvPE4/r35DGbjb Wew38APLL07kZ2h6ZtC1mIFQkG3xQ9COAXFGFbHRYUuCRpxPlFWQXFECQsvPODKvxDbL uDDH2F40B1xBqek1mhMwOhn5Y81lBUjbIgBI8ScFwkTzaRyf/XZsdlBD06xBTLPZrNrP TsLVhkGSBOXVHmY8tMGcWxdMGQL8ciD16cdvFQ+8acTnwFyzNf38Zp0pkIZbVgTuevii 8epA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fdtr7Cq+; 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 q11si12257877eju.518.2021.04.19.07.17.02; Mon, 19 Apr 2021 07:17:03 -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=fdtr7Cq+; 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 306396898E0; Mon, 19 Apr 2021 17:12:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C939689248 for ; Mon, 19 Apr 2021 17:11:57 +0300 (EEST) Received: by mail-qk1-f182.google.com with SMTP id x11so35789003qkp.11 for ; Mon, 19 Apr 2021 07:11:57 -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=OUtD1EexxjEdyIOpmRqFQoTGZ+mbapWwxT11XUC33Vs=; b=fdtr7Cq+Cft3tokqW7Y8UcGE/eoo6fBjuEMpDx6bHvCGj0q3WXN+6XiOn7DAmpeT8h y4rvpiHznHekkdI2l8IZQTnOQ7gqos+025R5GGF3SjDj/WkY3Y465icxiLS0Apx0nP/T Bh8+AykC7fdiLm+Dw6aAg91I7M4eOxXsOzIcqR+zA5uu0hGnsgkRkMC+4Vjt6uX//EIv KH9vUk/+6UYJ70SCbwHw8KLwTyA9SENGF0NvQTq8l9tZx9is9RIhZucXYAwMISnEBU0O TQOQzOcdJn2tb+VxMKDK5YI+qeJxSVtc1DIm3r1spDOCMDbCNJnmfr5SEKPGcok2zDIr 025A== 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=OUtD1EexxjEdyIOpmRqFQoTGZ+mbapWwxT11XUC33Vs=; b=IoQxNjNhfzZl+ZPzKdIqpAfuS5bIj0D0Jb6D38zavOnJZ7IsUdsBGzkqW+vd4s5SKe TOJh+h5YSkXR3xl01PWSf3o1iYkVc7n4sGH3da+vQcmOLOTn+smsfh8wsUTZN3LvR/LO aqVnVm2A35x2FOwmyPloxS3no8vB2wCVaS5pTv1uX07TGg7dsWtn0vLmtUEI0A/iX8Qk FMLohm1Bo0uaKsurKR4kDoMneZSZD4CzXY4iT1RM6fwNVOlKSWcefbc5DJS3kht0+RkZ adhbORrde/h+YWu1jvUPSM8VGzRG/q2DCgZGBKxgD1ZW0CuSr64bvL8xLpz+lSv9dfVE gpsg== X-Gm-Message-State: AOAM532mBJL6lGsSxwxhZG8EscDSe8AR0O8yoj126APOWBvYO4UPetBF w8rjbKxGn6YfjYpcTJ2DMw2dTFPExYU= X-Received: by 2002:a05:620a:2058:: with SMTP id d24mr3499174qka.469.1618841515876; Mon, 19 Apr 2021 07:11:55 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:42 -0300 Message-Id: <20210419141024.8174-46-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 45/87] avformat/rtsp: Remove deprecated old options, rename stimeout->timeout 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: 6XVw+P1ePfVH From: Andreas Rheinhardt Deprecated in ff46124b0df17a1d35249e09ae8eae9a61f16e04. Signed-off-by: Andreas Rheinhardt --- doc/protocols.texi | 12 +----------- libavformat/rtsp.c | 8 -------- libavformat/version.h | 3 --- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index 2cc2b561de..8371f83059 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1161,12 +1161,6 @@ Set minimum local UDP port. Default value is 5000. @item max_port Set maximum local UDP port. Default value is 65000. -@item timeout -This option is deprecated. Use @option{listen_timeout} instead. Set maximum timeout (in seconds) to wait for incoming connections. - -A value of -1 means infinite (default). This option implies the -@option{rtsp_flags} set to @samp{listen}. - @item listen_timeout Set maximum timeout (in seconds) to establish an initial connection. Setting @option{listen_timeout} > 0 sets @option{rtsp_flags} to @samp{listen}. Default is -1 @@ -1175,13 +1169,9 @@ which means an infinite timeout when @samp{listen} mode is set. @item reorder_queue_size Set number of packets to buffer for handling of reordered packets. -@item stimeout +@item timeout Set socket TCP I/O timeout in microseconds. -@item user-agent -This option is deprecated. Use @option{user_agent} instead. Override User-Agent header. If not specified, it defaults to the -libavformat identifier string. - @item user_agent Override User-Agent header. If not specified, it defaults to the libavformat identifier string. diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 25bdf475b3..a8c5a641cb 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -94,17 +94,9 @@ const AVOption ff_rtsp_options[] = { { "min_port", "set minimum local UDP port", OFFSET(rtp_port_min), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MIN}, 0, 65535, DEC|ENC }, { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC }, { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC }, -#if FF_API_OLD_RTSP_OPTIONS - { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED }, - { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, -#else { "timeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, -#endif COMMON_OPTS(), { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC }, -#if FF_API_OLD_RTSP_OPTIONS - { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC|AV_OPT_FLAG_DEPRECATED }, -#endif { NULL }, }; diff --git a/libavformat/version.h b/libavformat/version.h index 3e82007383..230ebd8a3e 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_OLD_RTSP_OPTIONS -#define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_DASH_MIN_SEG_DURATION #define FF_API_DASH_MIN_SEG_DURATION (LIBAVFORMAT_VERSION_MAJOR < 59) #endif