Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret
@ 2023-02-25 15:25 Jun Zhao
  2023-02-25 15:25 ` [FFmpeg-devel] [PATCH 2/2] doc/protocols: update rtsp options Jun Zhao
  2023-02-25 15:28 ` [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret mypopy
  0 siblings, 2 replies; 4+ messages in thread
From: Jun Zhao @ 2023-02-25 15:25 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Jun Zhao

From: Jun Zhao <barryjzhao@tencent.com>

Remove unnecessary ret and make the code more compact

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 doc/examples/muxing.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c
index 3acb778322..cd997d5431 100644
--- a/doc/examples/muxing.c
+++ b/doc/examples/muxing.c
@@ -219,8 +219,6 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
                                   int sample_rate, int nb_samples)
 {
     AVFrame *frame = av_frame_alloc();
-    int ret;
-
     if (!frame) {
         fprintf(stderr, "Error allocating an audio frame\n");
         exit(1);
@@ -232,8 +230,7 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
     frame->nb_samples = nb_samples;
 
     if (nb_samples) {
-        ret = av_frame_get_buffer(frame, 0);
-        if (ret < 0) {
+        if (av_frame_get_buffer(frame, 0) < 0) {
             fprintf(stderr, "Error allocating an audio buffer\n");
             exit(1);
         }
-- 
2.25.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [FFmpeg-devel] [PATCH 2/2] doc/protocols: update rtsp options
  2023-02-25 15:25 [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret Jun Zhao
@ 2023-02-25 15:25 ` Jun Zhao
  2023-02-25 15:28 ` [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret mypopy
  1 sibling, 0 replies; 4+ messages in thread
From: Jun Zhao @ 2023-02-25 15:25 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Jun Zhao

From: Jun Zhao <barryjzhao@tencent.com>

Split the rtsp options to muxer/demuxer, and update the options.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 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
-- 
2.25.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret
  2023-02-25 15:25 [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret Jun Zhao
  2023-02-25 15:25 ` [FFmpeg-devel] [PATCH 2/2] doc/protocols: update rtsp options Jun Zhao
@ 2023-02-25 15:28 ` mypopy
  1 sibling, 0 replies; 4+ messages in thread
From: mypopy @ 2023-02-25 15:28 UTC (permalink / raw)
  To: FFmpeg development discussions and patches; +Cc: Jun Zhao

ignore the patch 1-2, send with the wrong branch

On Sat, Feb 25, 2023 at 11:25 PM Jun Zhao <mypopydev@gmail.com> wrote:
>
> From: Jun Zhao <barryjzhao@tencent.com>
>
> Remove unnecessary ret and make the code more compact
>
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> ---
>  doc/examples/muxing.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c
> index 3acb778322..cd997d5431 100644
> --- a/doc/examples/muxing.c
> +++ b/doc/examples/muxing.c
> @@ -219,8 +219,6 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
>                                    int sample_rate, int nb_samples)
>  {
>      AVFrame *frame = av_frame_alloc();
> -    int ret;
> -
>      if (!frame) {
>          fprintf(stderr, "Error allocating an audio frame\n");
>          exit(1);
> @@ -232,8 +230,7 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
>      frame->nb_samples = nb_samples;
>
>      if (nb_samples) {
> -        ret = av_frame_get_buffer(frame, 0);
> -        if (ret < 0) {
> +        if (av_frame_get_buffer(frame, 0) < 0) {
>              fprintf(stderr, "Error allocating an audio buffer\n");
>              exit(1);
>          }
> --
> 2.25.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".



-- 
=======================================
Jun zhao/赵军
+++++++++++++++++++++++++++++++++++++++
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret
@ 2022-10-22 10:49 Jun Zhao
  0 siblings, 0 replies; 4+ messages in thread
From: Jun Zhao @ 2022-10-22 10:49 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Jun Zhao

From: Jun Zhao <barryjzhao@tencent.com>

Remove unnecessary ret and make the code more compact

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 doc/examples/muxing.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c
index 3acb778322..cd997d5431 100644
--- a/doc/examples/muxing.c
+++ b/doc/examples/muxing.c
@@ -219,8 +219,6 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
                                   int sample_rate, int nb_samples)
 {
     AVFrame *frame = av_frame_alloc();
-    int ret;
-
     if (!frame) {
         fprintf(stderr, "Error allocating an audio frame\n");
         exit(1);
@@ -232,8 +230,7 @@ static AVFrame *alloc_audio_frame(enum AVSampleFormat sample_fmt,
     frame->nb_samples = nb_samples;
 
     if (nb_samples) {
-        ret = av_frame_get_buffer(frame, 0);
-        if (ret < 0) {
+        if (av_frame_get_buffer(frame, 0) < 0) {
             fprintf(stderr, "Error allocating an audio buffer\n");
             exit(1);
         }
-- 
2.25.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-02-25 15:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-25 15:25 [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret Jun Zhao
2023-02-25 15:25 ` [FFmpeg-devel] [PATCH 2/2] doc/protocols: update rtsp options Jun Zhao
2023-02-25 15:28 ` [FFmpeg-devel] [PATCH 1/2] doc/examples/muxing: Remove unnecessary ret mypopy
  -- strict thread matches above, loose matches on Subject: below --
2022-10-22 10:49 Jun Zhao

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git