[FFmpeg-devel] [PATCH] avformat/libsrt: add several options supported in srt 1.3.0 v3

2018-10-22 Thread Matsuzawa Tomohiro
Several SRT options are missing. Since pkg_config requires libsrt v1.3.0 and 
above, it should be able to support options added in libsrt v1.3.0 and below.
This commit adds 8 SRT options.
sndbuf, rcvbuf, lossmaxttl, minversion, streamid, smoother, messageapi and 
transtype
The keys of option are equivalent to stransmit.
https://github.com/Haivision/srt/blob/v1.3.0/apps/socketoptions.hpp#L196-L223
---
 doc/protocols.texi   | 85 ++--
 libavformat/libsrt.c | 58 ++
 2 files changed, 141 insertions(+), 2 deletions(-)

diff --git a/doc/protocols.texi b/doc/protocols.texi
index b34f29eebf..fb7725e058 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -1306,10 +1306,10 @@ set by the peer side. Before version 1.3.0 this option
 is only available as @option{latency}.
 
 @item recv_buffer_size=@var{bytes}
-Set receive buffer size, expressed in bytes.
+Set UDP receive buffer size, expressed in bytes.
 
 @item send_buffer_size=@var{bytes}
-Set send buffer size, expressed in bytes.
+Set UDP send buffer size, expressed in bytes.
 
 @item rw_timeout
 Set raise error timeout for read/write optations.
@@ -1329,6 +1329,87 @@ have no chance of being delivered in time. It was
 automatically enabled in the sender if the receiver
 supports it.
 
+@item sndbuf=@var{bytes}
+Set send buffer size, expressed in bytes.
+
+@item rcvbuf=@var{bytes}
+Set receive buffer size, expressed in bytes.
+
+Receive buffer must not be greater than @option{ffs}.
+
+@item lossmaxttl=@var{packets}
+The value up to which the Reorder Tolerance may grow. When
+Reorder Tolerance is > 0, then packet loss report is delayed
+until that number of packets come in. Reorder Tolerance
+increases every time a "belated" packet has come, but it
+wasn't due to retransmission (that is, when UDP packets tend
+to come out of order), with the difference between the latest
+sequence and this packet's sequence, and not more than the
+value of this option. By default it's 0, which means that this
+mechanism is turned off, and the loss report is always sent
+immediately upon experiencing a "gap" in sequences.
+
+@item minversion
+The minimum SRT version that is required from the peer. A connection
+to a peer that does not satisfy the minimum version requirement
+will be rejected.
+
+The version format in hex is 0xXXYYZZ for x.y.z in human readable
+form.
+
+@item streamid=@var{string}
+A string limited to 512 characters that can be set on the socket prior
+to connecting. This stream ID will be able to be retrieved by the
+listener side from the socket that is returned from srt_accept and
+was connected by a socket with that set stream ID. SRT does not enforce
+any special interpretation of the contents of this string.
+This option doesn’t make sense in Rendezvous connection; the result
+might be that simply one side will override the value from the other
+side and it’s the matter of luck which one would win
+
+@item smoother=@var{live|file}
+The type of Smoother used for the transmission for that socket, which
+is responsible for the transmission and congestion control. The Smoother
+type must be exactly the same on both connecting parties, otherwise
+the connection is rejected.
+
+@item messageapi=@var{1|0}
+When set, this socket uses the Message API, otherwise it uses Buffer
+API. Note that in live mode (see @option{transtype}) there’s only
+message API available. In File mode you can chose to use one of two modes:
+
+Stream API (default, when this option is false). In this mode you may
+send as many data as you wish with one sending instruction, or even use
+dedicated functions that read directly from a file. The internal facility
+will take care of any speed and congestion control. When receiving, you
+can also receive as many data as desired, the data not extracted will be
+waiting for the next call. There is no boundary between data portions in
+the Stream mode.
+
+Message API. In this mode your single sending instruction passes exactly
+one piece of data that has boundaries (a message). Contrary to Live mode,
+this message may span across multiple UDP packets and the only size
+limitation is that it shall fit as a whole in the sending buffer. The
+receiver shall use as large buffer as necessary to receive the message,
+otherwise the message will not be given up. When the message is not
+complete (not all packets received or there was a packet loss) it will
+not be given up.
+
+@item transtype=@var{live|file}
+Sets the transmission type for the socket, in particular, setting this
+option sets multiple other parameters to their default values as required
+for a particular transmission type.
+
+live: Set options as for live transmission. In this mode, you should
+send by one sending instruction only so many data that fit in one UDP packet,
+and limited to the value defined first in @option{payload_size} (1316 is
+default in this mode). There is no speed control in this mode, only the
+bandwidth 

Re: [FFmpeg-devel] [PATCH] avformat/libsrt: add several options supported in srt 1.3.0 v3

2018-10-23 Thread Marton Balint



On Tue, 23 Oct 2018, Matsuzawa Tomohiro wrote:


Several SRT options are missing. Since pkg_config requires libsrt v1.3.0 and 
above, it should be able to support options added in libsrt v1.3.0 and below.
This commit adds 8 SRT options.
sndbuf, rcvbuf, lossmaxttl, minversion, streamid, smoother, messageapi and 
transtype
The keys of option are equivalent to stransmit.
https://github.com/Haivision/srt/blob/v1.3.0/apps/socketoptions.hpp#L196-L223
---
doc/protocols.texi   | 85 ++--
libavformat/libsrt.c | 58 ++
2 files changed, 141 insertions(+), 2 deletions(-)


Thanks, applied.

Regards,
Marton
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] avformat/libsrt: add several options supported in srt 1.3.0 v3

2018-10-23 Thread Matsuzawa Tomohiro
Thank you for your review!

Regards,
Tomo


差出人: ffmpeg-devel  が Marton Balint 
 の代理で送信
送信日時: 2018年10月23日 11:00
宛先: FFmpeg development discussions and patches
件名: Re: [FFmpeg-devel] [PATCH] avformat/libsrt: add several options supported 
in srt 1.3.0 v3



On Tue, 23 Oct 2018, Matsuzawa Tomohiro wrote:

> Several SRT options are missing. Since pkg_config requires libsrt v1.3.0 and 
> above, it should be able to support options added in libsrt v1.3.0 and below.
> This commit adds 8 SRT options.
> sndbuf, rcvbuf, lossmaxttl, minversion, streamid, smoother, messageapi and 
> transtype
> The keys of option are equivalent to stransmit.
> https://nam03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FHaivision%2Fsrt%2Fblob%2Fv1.3.0%2Fapps%2Fsocketoptions.hpp%23L196-L223&data=02%7C01%7C%7C27b337e107784ecc5caf08d639117c51%7C84df9e7fe9f640afb435%7C1%7C0%7C636759144589248357&sdata=xGVo40eDr7%2BsH09vv7fD2ux%2BYTfx7Dv9FoU%2FBPOQ9s8%3D&reserved=0
> ---
> doc/protocols.texi   | 85 ++--
> libavformat/libsrt.c | 58 ++
> 2 files changed, 141 insertions(+), 2 deletions(-)

Thanks, applied.

Regards,
Marton
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://nam03.safelinks.protection.outlook.com/?url=http%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmpeg-devel&data=02%7C01%7C%7C27b337e107784ecc5caf08d639117c51%7C84df9e7fe9f640afb435%7C1%7C0%7C636759144589404607&sdata=MQYAgd7us%2Fo7qKt4bQBb%2BiTNr16J6b1SwgsRYsmIiB0%3D&reserved=0
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel