PR #21131 opened by Jack Lau (JackLau) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21131 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21131.patch
See https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20965#issuecomment-15854 Signed-off-by: Jack Lau <[email protected]> >From e0c1b0e1b4f700093cc282c1be32468dba2082cc Mon Sep 17 00:00:00 2001 From: Jack Lau <[email protected]> Date: Mon, 8 Dec 2025 21:56:46 +0800 Subject: [PATCH] avformat/whip: change buffer_size to ts_buffer_size to avoid confusion See https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20965#issuecomment-15854 Signed-off-by: Jack Lau <[email protected]> --- doc/muxers.texi | 2 +- libavformat/whip.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index a2e356187a..e1f737b1d9 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -3955,7 +3955,7 @@ Default value is 5000. Set the maximum size, in bytes, of RTP packets that send out. Default value is 1200. -@item buffer_size @var{integer} +@item ts_buffer_size @var{integer} Set the buffer size, in bytes, of underlying protocol. Default value is -1(auto). The UDP auto selects a reasonable value. diff --git a/libavformat/whip.c b/libavformat/whip.c index 6a9b208f69..30c181ecd9 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -325,7 +325,7 @@ typedef struct WHIPContext { * Note that pion requires a smaller value, for example, 1200. */ int pkt_size; - int buffer_size;/* Underlying protocol send/receive buffer size */ + int ts_buffer_size;/* Underlying protocol send/receive buffer size */ /** * The optional Bearer token for WHIP Authorization. * See https://www.ietf.org/archive/id/draft-ietf-wish-whip-08.html#name-authentication-and-authoriz @@ -1229,7 +1229,7 @@ static int udp_connect(AVFormatContext *s) av_dict_set_int(&opts, "fifo_size", 0, 0); /* Pass through the pkt_size and buffer_size to underling protocol */ av_dict_set_int(&opts, "pkt_size", whip->pkt_size, 0); - av_dict_set_int(&opts, "buffer_size", whip->buffer_size, 0); + av_dict_set_int(&opts, "buffer_size", whip->ts_buffer_size, 0); ret = ffurl_open_whitelist(&whip->udp, url, AVIO_FLAG_WRITE, &s->interrupt_callback, &opts, s->protocol_whitelist, s->protocol_blacklist, NULL); @@ -1951,7 +1951,7 @@ write_packet: av_log(whip, AV_LOG_WARNING, "Ignore failed to write packet=%dB, ret=%d\n", pkt->size, ret); ret = 0; } else if (ret == AVERROR(EAGAIN)) { - av_log(whip, AV_LOG_ERROR, "UDP send blocked, please increase the buffer via -buffer_size\n"); + av_log(whip, AV_LOG_ERROR, "UDP send blocked, please increase the buffer via -ts_buffer_size\n"); } else av_log(whip, AV_LOG_ERROR, "Failed to write packet, size=%d, ret=%d\n", pkt->size, ret); goto end; @@ -2032,7 +2032,7 @@ static int whip_check_bitstream(AVFormatContext *s, AVStream *st, const AVPacket static const AVOption options[] = { { "handshake_timeout", "Timeout in milliseconds for ICE and DTLS handshake.", OFFSET(handshake_timeout), AV_OPT_TYPE_INT, { .i64 = 5000 }, -1, INT_MAX, ENC }, { "pkt_size", "The maximum size, in bytes, of RTP packets that send out", OFFSET(pkt_size), AV_OPT_TYPE_INT, { .i64 = 1200 }, -1, INT_MAX, ENC }, - { "buffer_size", "The buffer size, in bytes, of underlying protocol", OFFSET(buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, ENC }, + { "ts_buffer_size", "The buffer size, in bytes, of underlying protocol", OFFSET(ts_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, ENC }, { "whip_flags", "Set flags affecting WHIP connection behavior", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = 0}, 0, UINT_MAX, ENC, .unit = "flags" }, { "dtls_active", "Set dtls role as active", 0, AV_OPT_TYPE_CONST, { .i64 = WHIP_DTLS_ACTIVE}, 0, UINT_MAX, ENC, .unit = "flags" }, { "authorization", "The optional Bearer token for WHIP Authorization", OFFSET(authorization), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, ENC }, -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
