From patchwork Sat Feb 25 15:25:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 40522 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2131873pzk; Sat, 25 Feb 2023 07:25:42 -0800 (PST) X-Google-Smtp-Source: AK7set93gjoLtvjMi7t1cuGM5sGvgMYPwjYfWvt3i8UUCQIvFKs7q4T9Z1BeFTjzcHJpljYy54pc X-Received: by 2002:a05:6402:b11:b0:4ac:beba:dc89 with SMTP id bm17-20020a0564020b1100b004acbebadc89mr22907589edb.38.1677338741990; Sat, 25 Feb 2023 07:25:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677338741; cv=none; d=google.com; s=arc-20160816; b=ruXgrimvH+o7GWpXvnh3BEWxOD0tt3J2zA7YDQ322FVss+NzmpNhulbSIhJyUk1LpF P3us8l/pqunQVD2jaImxy5UTARXJJNBAs+7YA6qKEOWCueftRY5V0Vm3O52iCBdUYTgw aNBuq2QZxOy1j60Ty8fo/smB/2OkVBqxY/XnJEMitA6xn3vmdbTgXeocTasN301V7zUP 7CTphvQIuhRpSUnOg9yEfZG+IoqkSvzKQJFXs4QaLhaYgviC2Gpy/sXwUXq+WDF63hPg epIXoA1CQoEHDbYfO9i+VK/klCi9N27Q5NPiJiH9pT1M5cAI2IZdY1rVImePBp82hdBN FYPQ== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=3s/BIySqkWgQRmdg37FFvVxeQlk6Jn4nIIzX2tgmGKQ=; b=DsXqJb9pCliwfh3VB3qEGmJMR2LP6n53fwjEcClfft1atmIhhE+ONNArlHKWk8UdVO Ij+t36t6JbbD+R+bZOnDisZTr5IstXJ0HkPYpRCggVdaWZz2gFvP8XQnE5cqvS/sO7ir XzjdTfyDHvAEtu8AeKoIjgIS0g2Ct2jbVW0gvMp64fFMhL9hB/IqBb+KIpEaVBVbsA7V w6/ubkm135dbN5fATE5DPUrvTH3QOflmpr9ATfqvMqKhXbYqlYVdHqtOOYfhU7MFGgQg mjgTmf39vWsI3b56wWt/6YNMfLlrldXfsuJiVl8Isv0R0/qi61WYRaSq3q1gKZ/XKS+c DtaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gQx3sBeQ; 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 i4-20020a056402054400b004aee59b32ecsi2761151edx.651.2023.02.25.07.25.41; Sat, 25 Feb 2023 07:25:41 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gQx3sBeQ; 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 3867D68BDC9; Sat, 25 Feb 2023 17:25:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95B3868BD1D for ; Sat, 25 Feb 2023 17:25:23 +0200 (EET) Received: by mail-wm1-f42.google.com with SMTP id p23-20020a05600c1d9700b003ead4835046so2629116wms.0 for ; Sat, 25 Feb 2023 07:25:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FW6RcGFz6m2AltPYgVG9l4FD7HeELeJvLNFa9DFyKQI=; b=gQx3sBeQ2Ks2FhNwcab0nS7hxtS3GmuHPZy4tYGhGO//xnhTihVKzuEPesbgql2/ht mlpYlJmomNIeorBaqdn0mUPUSmGA5GTIHwKjM7S4wvSdHzDr6RAUB92ZNRSUIyUOU/Tj 5nSqgl2qD7xSM1xrnwgfDpF6uG8F3y22N1/zrg8jPqIjHhBLjY2kc7/0h3ti5Jwz1v/r PEMBDYF/IJgDsF+28wiv8p1YTQ3YYRSj7zwQ1iGILTvJ86Ma44xe4VatQwmc59OFyI6l hzP56Bnrm3yfawJv2Zm/7D+Fm03f8nPshGiLVliIHAQjnDqjQE5U17L28bdqVwR9RQhM OUkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FW6RcGFz6m2AltPYgVG9l4FD7HeELeJvLNFa9DFyKQI=; b=tiXEU+iJzHl4H3Krm330uHupyhuoex85luBu7/qbJwGZTjxJj5qDvoZJGFcq6PxRIl VUIpFyavQxzoyJxE7N6kiH6itI0iVjeHAKRb0pbSoemKyXWl5AMtd/OB7FixnSzIAg5q YzWnQIXWLAT48T/PEHBwEcLfXQnr/KYjf7aCtNCjhOfDiI6OjGiq+EOHIIaZuwyNecKp 1rde1FyVu1ZvA1jQsxHA/cEPfRrCWlc58NjrqRdY0TMAnlyoa10uKIyyWzu5bTf33P2o qCP1CJEGFCgGl6ECNn1auLE6EeGbIYwl84xaZXKX99FqJvHeTkKqMg8tLfa1GFnDTZOK IPow== X-Gm-Message-State: AO0yUKW+NAIt6M3Llct3d+bCKeGXhmtrt5Vdwccik+hz3S3sEImZ92tD 1XTQQjJUCYqJyVupEhfEsj0+CFTBAS2dMd/F X-Received: by 2002:a05:600c:4b28:b0:3e2:9b4:4303 with SMTP id i40-20020a05600c4b2800b003e209b44303mr15359757wmp.19.1677338722547; Sat, 25 Feb 2023 07:25:22 -0800 (PST) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id d8-20020a05600c34c800b003dc4480df80sm7122918wmq.34.2023.02.25.07.25.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 07:25:22 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 23:25:09 +0800 Message-Id: <20230225152509.3086288-2-mypopydev@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230225152509.3086288-1-mypopydev@gmail.com> References: <20230225152509.3086288-1-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] doc/protocols: update rtsp options 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: Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /ob95tD2XPaz From: Jun Zhao Split the rtsp options to muxer/demuxer, and update the options. Signed-off-by: Jun Zhao --- doc/protocols.texi | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/doc/protocols.texi b/doc/protocols.texi index 0df38d790c..5e9198e67c 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1178,6 +1178,59 @@ Options can be set on the @command{ffmpeg}/@command{ffplay} command line, or set in code via @code{AVOption}s or in @code{avformat_open_input}. +@subsection Muxer +The following options are supported. + +@table @option +@item rtsp_transport +Set RTSP transport protocols. + +It accepts the following values: +@table @samp +@item udp +Use UDP as lower transport protocol. + +@item tcp +Use TCP (interleaving within the RTSP control channel) as lower +transport protocol. +@end table + +Default value is @samp{0}. + +@item rtsp_flags +Set RTSP flags. + +The following values are accepted: +@table @samp +@item latm +Use MP4A-LATM packetization instead of MPEG4-GENERIC for AAC. +@item rfc2190 +Use RFC 2190 packetization instead of RFC 4629 for H.263. +@item skip_rtcp +Don't send RTCP sender reports. +@item h264_mode0 +Use mode 0 for H.264 in RTP. +@item send_bye +Send RTCP BYE packets when finishing. +@end table + +Default value is @samp{0}. + + +@item min_port +Set minimum local UDP port. Default value is 5000. + +@item max_port +Set maximum local UDP port. Default value is 65000. + +@item buffer_size +Set the maximum socket buffer size in bytes. + +@item pkt_size +Set max send packet size (in bytes). Default value is 1472. +@end table + +@subsection Demuxer The following options are supported. @table @option @@ -1203,6 +1256,10 @@ Use UDP multicast as lower transport protocol. @item http Use HTTP tunneling as lower transport protocol, which is useful for passing proxies. + +@item https +Use HTTPs tunneling as lower transport protocol, which is useful for +passing proxies and widely used for security consideration. @end table Multiple lower transport protocols may be specified, in that case they are @@ -1220,6 +1277,9 @@ Accept packets only from negotiated peer address and port. Act as a server, listening for an incoming connection. @item prefer_tcp Try TCP for RTP transport first, if TCP is available as RTSP RTP transport. +@item satip_raw +Export raw MPEG-TS stream instead of demuxing. The flag will simply write out +the raw stream, with the original PAT/PMT/PIDs intact. @end table Default value is @samp{none}. @@ -1232,6 +1292,7 @@ The following flags are accepted: @item video @item audio @item data +@item subtitle @end table By default it accepts all media types. @@ -1256,6 +1317,9 @@ Set socket TCP I/O timeout in microseconds. @item user_agent Override User-Agent header. If not specified, it defaults to the libavformat identifier string. + +@item buffer_size +Set the maximum socket buffer size in bytes. @end table When receiving data over UDP, the demuxer tries to reorder received packets