RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/librist: rework librist_read 

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 <cus@passwd.hu>
This commit is contained in:
Marton Balint 2021-03-06 21:48:57 +01:00
parent 4098f809d6
commit 4b1e387e25
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/librist.c
View File

@ -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);
if (data_block->payload_len > 9968) {
rist_receiver_data_block_free((struct rist_data_block**)&data_block);
return AVERROR_EXTERNAL;
}
s->queue_count = ret - 1;
size = data_block->payload_len;
memcpy(buf, data_block->payload, size);
rist_receiver_data_block_free((struct rist_data_block**)&data_block);