From patchwork Sat Mar 6 23:26:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 26231 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D865444ACF5 for ; Sun, 7 Mar 2021 01:27:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C61E668A329; Sun, 7 Mar 2021 01:27:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDBDB689DC3 for ; Sun, 7 Mar 2021 01:26:55 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id C123BE511E; Sun, 7 Mar 2021 00:26:55 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zd_4tABYSn5h; Sun, 7 Mar 2021 00:26:26 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id BCB11E5127; Sun, 7 Mar 2021 00:26:25 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Mar 2021 00:26:14 +0100 Message-Id: <20210306232619.5963-2-cus@passwd.hu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210306232619.5963-1-cus@passwd.hu> References: <20210306232619.5963-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/7] avformat/librist: rework librist_read X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Queue tracking makes no difference so remove it, return EAGAIN of no data is available and rist data block needs to be freed even for zero sized packets. Signed-off-by: Marton Balint --- libavformat/librist.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavformat/librist.c b/libavformat/librist.c index 789cefda36..c4ba1192e9 100644 --- a/libavformat/librist.c +++ b/libavformat/librist.c @@ -37,7 +37,6 @@ typedef struct RISTContext { const AVClass *class; - int queue_count; int profile; int buffer_size; int log_level; @@ -184,16 +183,19 @@ static int librist_read(URLContext *h, uint8_t *buf, int size) const struct rist_data_block *data_block; int ret; - ret = rist_receiver_data_read(s->ctx, &data_block, s->queue_count <= 0 ? POLLING_TIME : 0); + ret = rist_receiver_data_read(s->ctx, &data_block, POLLING_TIME); if (ret < 0) return risterr2ret(ret); - if (ret == 0 || data_block->payload_len <= 0) - return 0; + if (ret == 0) + return AVERROR(EAGAIN); - s->queue_count = ret - 1; - size = data_block->payload_len; + if (data_block->payload_len > 9968) { + rist_receiver_data_block_free((struct rist_data_block**)&data_block); + return AVERROR_EXTERNAL; + } + size = data_block->payload_len; memcpy(buf, data_block->payload, size); rist_receiver_data_block_free((struct rist_data_block**)&data_block);