From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6633A42A68 for ; Tue, 11 Jan 2022 10:35:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C78968AF3A; Tue, 11 Jan 2022 12:35:15 +0200 (EET) Received: from smtp.heteigenwijsje.nl (unknown [185.216.161.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16A8468AF3A for ; Tue, 11 Jan 2022 12:35:09 +0200 (EET) Received: from mail.heteigenwijsje.nl (localhost [127.0.0.1]) by smtp.heteigenwijsje.nl (Postfix) with ESMTP id AA91E8D248 for ; Tue, 11 Jan 2022 11:29:59 +0100 (CET) Authentication-Results: mail.heteigenwijsje.nl (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=heteigenwijsje.nl DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= heteigenwijsje.nl; h=content-transfer-encoding:content-type :content-type:in-reply-to:from:from:references:to :content-language:subject:subject:user-agent:mime-version:date :date:message-id; s=dkim; t=1641896997; x=1644488998; bh=qzIV0kc WmYsNGmhUhuTY1sUcjqnh+JUmfotcuMy+dU8=; b=0rbGwCPpiYV//Hs8Kw94Nj7 lZNlz9SuUnMXE/tY96OANAtzMzCGqwpUdei6rh6fFNBTvHRVCNmICkr4yyNeId1R hlspZMYRt8ck0EVEwUlK/i0KVUqaeT7MrLyJwjEQ2wYsSphODJnXPYrZ65mqx7NN aBAhYSCvFD9E+FJdlLyQ= X-Virus-Scanned: amavisd-new at mail.heteigenwijsje.nl Received: from smtp.heteigenwijsje.nl ([127.0.0.1]) by mail.heteigenwijsje.nl (mail.heteigenwijsje.nl [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 54TN4xesvaYn for ; Tue, 11 Jan 2022 11:29:57 +0100 (CET) Received: from smtp.heteigenwijsje.nl (localhost [127.0.0.1]) by smtp.heteigenwijsje.nl (Postfix) with ESMTP id 89E558D243 for ; Tue, 11 Jan 2022 11:29:57 +0100 (CET) Received: from [IPV6:2001:985:7aa4:1:40c0:375f:e41:372b] ([2001:985:7aa4:1:40c0:375f:e41:372b]) by smtp.heteigenwijsje.nl with ESMTPSA id OB5lISVc3WFmfAAAc3PRCQ (envelope-from ) for ; Tue, 11 Jan 2022 11:29:57 +0100 Message-ID: Date: Tue, 11 Jan 2022 11:35:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220111092338.194468-1-gijs@peskens.net> <20220111103408.201161-1-gijs@peskens.net> From: Gijs Peskens In-Reply-To: <20220111103408.201161-1-gijs@peskens.net> Subject: Re: [FFmpeg-devel] [PATCH] libRIST: allow setting fifo size and fail on overflow. 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: V2, I don't know why send-patch didn't pick up the subject override :/ On 11-01-2022 11:34, Gijs Peskens wrote: > Introduce fifo_size and overrun_nonfatal params to configure fifo buffer > behavior. > > Use newly introduced RIST_DATA_FLAGS_OVERFLOW flag to check for overrun > and error out in that case. > --- > doc/protocols.texi | 9 +++++++++ > libavformat/librist.c | 37 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 46 insertions(+) > > diff --git a/doc/protocols.texi b/doc/protocols.texi > index d207df0b52..f1acf0cc77 100644 > --- a/doc/protocols.texi > +++ b/doc/protocols.texi > @@ -745,6 +745,15 @@ Set internal RIST buffer size in milliseconds for retransmission of data. > Default value is 0 which means the librist default (1 sec). Maximum value is 30 > seconds. > > +@item fifo_size > +Size of the librist receiver output fifo in number of packets. This must be a > +power of 2. > +Defaults to 8192 (vs the libRIST default of 1024). > + > +@item overrun_nonfatal=@var{1|0} > +Survive in case of libRIST fifo buffer overrun. Default > +value is 0. > + > @item pkt_size > Set maximum packet size for sending data. 1316 by default. > > diff --git a/libavformat/librist.c b/libavformat/librist.c > index 378b635ea7..53f83d3668 100644 > --- a/libavformat/librist.c > +++ b/libavformat/librist.c > @@ -43,6 +43,9 @@ > ((patch) + ((minor)* 0x100) + ((major) *0x10000)) > #define FF_LIBRIST_VERSION FF_LIBRIST_MAKE_VERSION(LIBRIST_API_VERSION_MAJOR, LIBRIST_API_VERSION_MINOR, LIBRIST_API_VERSION_PATCH) > #define FF_LIBRIST_VERSION_41 FF_LIBRIST_MAKE_VERSION(4, 1, 0) > +#define FF_LIBRIST_VERSION_42 FF_LIBRIST_MAKE_VERSION(4, 2, 0) > + > +#define FF_LIBRIST_FIFO_SIZE_DEFAULT 8192 > > typedef struct RISTContext { > const AVClass *class; > @@ -52,6 +55,8 @@ typedef struct RISTContext { > int packet_size; > int log_level; > int encryption; > + int fifo_size; > + int overrun_nonfatal; > char *secret; > > struct rist_logging_settings logging_settings; > @@ -70,6 +75,8 @@ static const AVOption librist_options[] = { > { "main", NULL, 0, AV_OPT_TYPE_CONST, {.i64=RIST_PROFILE_MAIN}, 0, 0, .flags = D|E, "profile" }, > { "advanced", NULL, 0, AV_OPT_TYPE_CONST, {.i64=RIST_PROFILE_ADVANCED}, 0, 0, .flags = D|E, "profile" }, > { "buffer_size", "set buffer_size in ms", OFFSET(buffer_size), AV_OPT_TYPE_INT, {.i64=0}, 0, 30000, .flags = D|E }, > + { "fifo_size", "Set libRIST fifo buffer. Size must be power of 2", OFFSET(fifo_size), AV_OPT_TYPE_INT, {.i64=FF_LIBRIST_FIFO_SIZE_DEFAULT}, 2 << 9, 2 << 15, .flags = D|E }, > + { "overrun_nonfatal", "survive in case of libRIST receiving circular buffer overrun", OFFSET(overrun_nonfatal), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D }, > { "pkt_size", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64=1316}, 1, MAX_PAYLOAD_SIZE, .flags = D|E }, > { "log_level", "set loglevel", OFFSET(log_level), AV_OPT_TYPE_INT, {.i64=RIST_LOG_INFO}, -1, INT_MAX, .flags = D|E }, > { "secret", "set encryption secret",OFFSET(secret), AV_OPT_TYPE_STRING,{.str=NULL}, 0, 0, .flags = D|E }, > @@ -161,6 +168,20 @@ static int librist_open(URLContext *h, const char *uri, int flags) > if (ret < 0) > goto err; > > + //Prior to 4.2.0 there was a bug in libRIST which made this call always fail. > +#if FF_LIBRIST_VERSION >= FF_LIBRIST_VERSION_42 > + if (flags & AVIO_FLAG_READ) { > + ret = rist_receiver_set_output_fifo_size(s->ctx, s->fifo_size); > + if (ret != 0) { > + goto err; > + } > + } > +#else > + if (s->fifo_size != FF_LIBRIST_FIFO_SIZE_DEFAULT) { > + av_log(h, AV_LOG_ERROR, "libRIST prior to 0.2.7 has a bug which fails setting the fifo buffer size\n"); > + } > +#endif > + > if (((s->encryption == 128 || s->encryption == 256) && !s->secret) || > ((peer_config->key_size == 128 || peer_config->key_size == 256) && !peer_config->secret[0])) { > av_log(h, AV_LOG_ERROR, "secret is mandatory if encryption is enabled\n"); > @@ -223,8 +244,24 @@ static int librist_read(URLContext *h, uint8_t *buf, int size) > return AVERROR_EXTERNAL; > } > > +#if FF_LIBRIST_VERSION >= FF_LIBRIST_VERSION_42 > + if (data_block->flags & RIST_DATA_FLAGS_OVERFLOW == RIST_DATA_FLAGS_OVERFLOW) { > + if (!s->overrun_nonfatal) { > + av_log(h, AV_LOG_ERROR, "Fifo buffer overrun. " > + "To avoid, increase fifo_size URL option. " > + "To survive in such case, use overrun_nonfatal option\n"); > + size = AVERROR(EIO); > + goto out_free; > + } else { > + av_log(h, AV_LOG_WARNING, "Fifo buffer overrun. " > + "Surviving due to overrun_nonfatal option\n"); > + } > + } > +#endif > + > size = data_block->payload_len; > memcpy(buf, data_block->payload, size); > +out_free: > #if FF_LIBRIST_VERSION < FF_LIBRIST_VERSION_41 > rist_receiver_data_block_free((struct rist_data_block**)&data_block); > #else _______________________________________________ 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".