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 2C46D4970E for ; Tue, 19 Mar 2024 11:51:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5A0368D37B; Tue, 19 Mar 2024 13:51:40 +0200 (EET) Received: from mail-4018.proton.ch (mail-4018.proton.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2399B68D093 for ; Tue, 19 Mar 2024 13:51:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mccartney.info; s=protonmail; t=1710849093; x=1711108293; bh=uXxsMbf1x+k5G7F4TWiBVTR+HsZittQeLbnb0JBv7e0=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=HfLm5cFNAn9q+xk9eGofVsPVw2nk33Q3MbpCiO217/Y1ZbW2IozkAXz6BoKgeeTj+ TzTTy3Oa3QZOr6WpaLves5okABmkF6FZjj3AcHlkmsKRpHP5GsRdr9kpWFsR/6iONG sQHTSAEYV+iA5FiXvVYU0YG2q8RLt12q3nmQkyRj2de8X+/7KpswqWAHAKV/Fir+xl GWPjeCvUeqjW6oA7gLkbQTn8AAwZLta6KJfMznNUNI+pKvwjCjvI74WpXLPg/gvflM BefGIL+3uui99Nyyk2ez9ZCNkO3PktuXexH9NEf4Z47byR9Z7hM+TsX8PLWN2m2OyR 0EAZ3QW9tu72A== Date: Tue, 19 Mar 2024 11:51:11 +0000 To: ffmpeg-devel@ffmpeg.org From: Ryan McCartney Message-ID: <20240319115108.65823-1-ryan@mccartney.info> Feedback-ID: 50383489:user:proton MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavformat/libsrt.c: Add statistics option to output SRT statistics with av_log() 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 Cc: Ryan McCartney Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/libsrt.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index a7aafea536..80d52b1737 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -56,6 +56,8 @@ typedef struct SRTContext { int eid; int64_t rw_timeout; int64_t listen_timeout; + int64_t lastStatsTime; + int64_t stats; int recv_buffer_size; int send_buffer_size; @@ -100,6 +102,7 @@ typedef struct SRTContext { static const AVOption libsrt_options[] = { { "timeout", "Timeout of socket I/O operations (in microseconds)", OFFSET(rw_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, .flags = D|E }, { "listen_timeout", "Connection awaiting timeout (in microseconds)" , OFFSET(listen_timeout), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, .flags = D|E }, + { "stats", "Show SRT statistics in the log output", OFFSET(stats), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, .flags = D|E }, { "send_buffer_size", "Socket send buffer size (in bytes)", OFFSET(send_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "recv_buffer_size", "Socket receive buffer size (in bytes)", OFFSET(recv_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "pkt_size", "Maximum SRT packet size", OFFSET(payload_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, SRT_LIVE_MAX_PAYLOAD_SIZE, .flags = D|E, .unit = "payload_size" }, @@ -158,6 +161,29 @@ static int libsrt_neterrno(URLContext *h) return os_errno ? AVERROR(os_errno) : AVERROR_UNKNOWN; } +static int libsrt_stats(URLContext *h,int read) +{ + SRTContext *s = h->priv_data; + SRT_TRACEBSTATS trace; + + int ret = srt_bistats(s->fd, &trace, 0,1); + int64_t timeNow = trace.msTimeStamp; + int64_t timeNext = s->lastStatsTime + s->stats; + + if((ret >= 0) && (timeNow > timeNext )){ + s->lastStatsTime = timeNow; + + if(read > 0){ + av_log(h, AV_LOG_INFO, "[srt-stats] rate=%.2fMbps bw=%.2fMbps rtt=%.2fms total=%jdpkts retrans=%jdpkts loss=%jdpkts \n", trace.mbpsRecvRate,trace.mbpsBandwidth,trace.msRTT,trace.pktRecvTotal,trace.pktRcvRetrans,trace.pktRcvLossTotal); + } + else{ + av_log(h, AV_LOG_INFO, "[srt-stats] rate=%.2fMbps bw=%.2fMbps rtt=%.2fms total=%jdpkts retrans=%jdpkts loss=%jdpkts \n", trace.mbpsSendRate,trace.mbpsBandwidth,trace.msRTT,trace.pktSentTotal,trace.pktRetrans,trace.pktSndLossTotal); + } + } + + return 0; +} + static int libsrt_getsockopt(URLContext *h, int fd, SRT_SOCKOPT optname, const char * optnamestr, void * optval, int * optlen) { if (srt_getsockopt(fd, 0, optname, optval, optlen) < 0) { @@ -557,6 +583,9 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) goto err; } } + if (av_find_info_tag(buf, sizeof(buf), "stats", p)) { + s->stats = strtol(buf, NULL, 10); + } #if SRT_VERSION_VALUE >= 0x010302 if (av_find_info_tag(buf, sizeof(buf), "enforced_encryption", p)) { s->enforced_encryption = strtol(buf, NULL, 10); @@ -686,6 +715,10 @@ static int libsrt_read(URLContext *h, uint8_t *buf, int size) SRTContext *s = h->priv_data; int ret; + if(s->stats > 0){ + libsrt_stats(h,1); + } + if (!(h->flags & AVIO_FLAG_NONBLOCK)) { ret = libsrt_network_wait_fd_timeout(h, s->eid, 0, h->rw_timeout, &h->interrupt_callback); if (ret) @@ -705,6 +738,10 @@ static int libsrt_write(URLContext *h, const uint8_t *buf, int size) SRTContext *s = h->priv_data; int ret; + if(s->stats > 0){ + libsrt_stats(h,0); + } + if (!(h->flags & AVIO_FLAG_NONBLOCK)) { ret = libsrt_network_wait_fd_timeout(h, s->eid, 1, h->rw_timeout, &h->interrupt_callback); if (ret) -- 2.43.0 _______________________________________________ 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".