From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 4875B4C112 for ; Mon, 8 Dec 2025 14:02:03 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'2uOZX5tETcMOkTY8fQL942xXEKE0e1dIWIQYuCkbff8=', expected b'gqDQjvyKWgpi5CObqTx7xnygQtqY8UPBoKXMYHdzXyw=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765202508; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=2uOZX5tETcMOkTY8fQL942xXEKE0e1dIWIQYuCkbff8=; b=bXNqTjvEWHhksQgoWh0L4PdPrRB1pxiu0bT50tbo4KQhFRXrqr/hta62yugVRa3bJJXlA zSIv+FGzwXKMlVJn/A+1VwvOLoDVxMjgLJeGlxubE+EBGqNLzd9N7JmwE/Np9bVyVE4+Nwy apvvP80OoDYoCkE+W5bW9XbiJJ3zfuoXNUqwfc6OtFfFquCHMPVAG8jq/SC9m2KdcA3VmGF mRKO0sJ2/7inWzwgwSFKi+YtOa10IuCzipKfrq09qrW2CufxOkGeVyTTeN7ZlBX1UXTF2ge 1KV0KIqogXqgDrjJLKuprlYn679iTluT3uxZ29RdCalCDjEemSkX4QGEk2QQ== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BF422690664; Mon, 8 Dec 2025 16:01:48 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1765202492; b=PT5d8ZMZK4FI3kkoOJCMAAWdRl3lY2b9OKnFfrjPgZbTsiki8wjSm7PaX6nuFTkDy8T+M EwN888lJUoXFldchngbp3tp52jSoxC1Vu0oQJuvYBYcTEYe8tTNuABYVlubKUXoY3Wr43kL 1WHixhPR+hJV/gwPb3ZIF9nb/2zxWzjztuMglaTIrTtH4o59RbOwqow35MjrS770/pQUeso 8UeqqWNOAqnkbz3fl+p6K+Nk22pfDjj+/Ia/QAWuQqfmp/vuH1qE7SjEi6lGUEcapyWkOLK 8msVwR9cqUIYfolfr8r2nl3estLLVkz629XArZ29EEkx3YcKaSM9txEQKdxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1765202492; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=vxvGZtsMZnpMRWG12ccHFzCS6NfLVZUf5qCx5JCyuv8=; b=cN689V18HlEMLVbOqoZN9ql9AEX4RlH7r6WEmV+rGrjruYi3SY/mjNva2XoT8I5xK8OY7 qm3V0bvvRIXc9dY5Aw5PPaSOLzqLWl2Sb+Vfp2hNIX3OU972AcnGa+ln2S8YOOhHbYNv4Vv Gi5kS3CVQLO2tXROyXxl9DQipnf9mFlVPPo7b05qYoHrQPcZtiYWf70ajuFr0RzcvLUbQDF RmKm4JyYcpgc9Ice4XsW6spYSTC/Ini7JwIVT9INcrVF3vdnOtN9MRJ9IMnJUdVYkV/RXIb i9y3Ntj8SjrKjxfnoFWtnCbPoziRoJD7i4X+vzyaKRMCGj4u3K/mrCgI73zA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765202484; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=gqDQjvyKWgpi5CObqTx7xnygQtqY8UPBoKXMYHdzXyw=; b=wXmnZsawK+ksyOMMcq2L4JYWDEmCgUlWfopjAnY28Ec/mhx/yDXGgQkf1pdCOnp41oKtM C0c/60BlQPe0CuDSfoZUTIMqZ8DfKbqmjUfBwPc9hGhomkvpgUm4Bp+shTMNh9brm74nq67 vyS1QROAi6I5domPA8Pgt7cVN+/sz5+5i196uuCq6wrNMNdEgEP6uf0Vj6r1JCh/KDpHVOZ 9a4eMmrbNlFpk++pobYqlpXQN4lFYtrbcKXPGNzT/lxI2xr6RvoA6CeDDA+0E1cuMXIBKxX JcG4n1CArZ93N5zGmSVjMFm1tNDYGTe8rfIQ/Z+xl4y/qm9I8FOD5l21cXCQ== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id D3DA26905F4 for ; Mon, 8 Dec 2025 16:01:24 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 08 Dec 2025 14:01:24 -0000 Message-ID: <176520248497.39.7392198854113819605@2cb04c0e5124> Message-ID-Hash: AVUDDPLNHHAQOKCZJA6QHDTA2OAKFNWY X-Message-ID-Hash: AVUDDPLNHHAQOKCZJA6QHDTA2OAKFNWY X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/whip: change buffer_size to ts_buffer_size to avoid confusion (PR #21131) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jack Lau via ffmpeg-devel Cc: Jack Lau Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: 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 >>From e0c1b0e1b4f700093cc282c1be32468dba2082cc Mon Sep 17 00:00:00 2001 From: Jack Lau 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 --- 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 -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org