---
libavformat/udp.c | 49 +++++++++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 21 deletions(-)
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 7d64ff07ed..e02eff0f33 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -96,7 +96,8 @@ typedef struct UDPContext {
/* Circular Buffer variables for use in UDP receive code */
int circular_buffer_size;
- AVFifo *fifo;
+ AVFifo *rx_fifo;
+ AVFifo *tx_fifo;
int circular_buffer_error;
int64_t bitrate; /* number of bits to send per second */
int64_t burst_bits;
@@ -527,7 +528,7 @@ static void *circular_buffer_task_rx( void *_URLContext)
AV_WL32(s->tmp, len);
memcpy(s->tmp + 4, &addr, sizeof(addr));
- if (av_fifo_can_write(s->fifo) < len + header_sz) {
+ if (av_fifo_can_write(s->rx_fifo) < len + header_sz) {
/* No Space left */
if (s->overrun_nonfatal) {
av_log(h, AV_LOG_WARNING, "Circular buffer overrun. "
@@ -541,7 +542,7 @@ static void *circular_buffer_task_rx( void *_URLContext)
goto end;
}
}
- av_fifo_write(s->fifo, s->tmp, len + header_sz);
+ av_fifo_write(s->rx_fifo, s->tmp, len + header_sz);
pthread_cond_signal(&s->cond);
}
@@ -577,22 +578,22 @@ static void *circular_buffer_task_tx( void *_URLContext)
uint8_t tmp[4];
int64_t timestamp;
- len = av_fifo_can_read(s->fifo);
+ len = av_fifo_can_read(s->tx_fifo);
while (len<4) {
if (s->close_req)
goto end;
pthread_cond_wait(&s->cond, &s->mutex);
- len = av_fifo_can_read(s->fifo);
+ len = av_fifo_can_read(s->tx_fifo);
}
- av_fifo_read(s->fifo, tmp, 4);
+ av_fifo_read(s->tx_fifo, tmp, 4);
len = AV_RL32(tmp);
av_assert0(len >= 0);
av_assert0(len <= sizeof(s->tmp));
- av_fifo_read(s->fifo, s->tmp, len);
+ av_fifo_read(s->tx_fifo, s->tmp, len);
pthread_mutex_unlock(&s->mutex);
@@ -944,11 +945,15 @@ static int udp_open(URLContext *h, const char *uri, int
flags)
if ((!is_output && s->circular_buffer_size) || (is_output && s->bitrate &&
s->circular_buffer_size)) {
/* start the task going */
- s->fifo = av_fifo_alloc2(s->circular_buffer_size, 1, 0);
- if (!s->fifo) {
+ AVFifo *fifo = av_fifo_alloc2(s->circular_buffer_size, 1, 0);
+ if (!fifo) {
ret = AVERROR(ENOMEM);
goto fail;
}
+ if (is_output)
+ s->tx_fifo = fifo;
+ else
+ s->rx_fifo = fifo;
ret = pthread_mutex_init(&s->mutex, NULL);
if (ret != 0) {
av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n",
strerror(ret));
@@ -981,7 +986,8 @@ static int udp_open(URLContext *h, const char *uri, int
flags)
fail:
if (udp_fd >= 0)
closesocket(udp_fd);
- av_fifo_freep2(&s->fifo);
+ av_fifo_freep2(&s->rx_fifo);
+ av_fifo_freep2(&s->tx_fifo);
ff_ip_reset_filters(&s->filters);
return ret;
}
@@ -1004,23 +1010,23 @@ static int udp_read(URLContext *h, uint8_t *buf, int
size)
#if HAVE_PTHREAD_CANCEL
int avail, nonblock = h->flags & AVIO_FLAG_NONBLOCK;
- if (s->fifo) {
+ if (s->rx_fifo) {
pthread_mutex_lock(&s->mutex);
do {
- avail = av_fifo_can_read(s->fifo);
+ avail = av_fifo_can_read(s->rx_fifo);
if (avail) { // >=size) {
uint8_t tmp[4];
- av_fifo_read(s->fifo, tmp, 4);
- av_fifo_read(s->fifo, &s->last_recv_addr,
sizeof(s->last_recv_addr));
+ av_fifo_read(s->rx_fifo, tmp, 4);
+ av_fifo_read(s->rx_fifo, &s->last_recv_addr,
sizeof(s->last_recv_addr));
avail = AV_RL32(tmp);
if(avail > size){
av_log(h, AV_LOG_WARNING, "Part of datagram lost due to
insufficient buffer size\n");
avail = size;
}
- av_fifo_read(s->fifo, buf, avail);
- av_fifo_drain2(s->fifo, AV_RL32(tmp) - avail);
+ av_fifo_read(s->rx_fifo, buf, avail);
+ av_fifo_drain2(s->rx_fifo, AV_RL32(tmp) - avail);
pthread_mutex_unlock(&s->mutex);
return avail;
} else if(s->circular_buffer_error){
@@ -1066,7 +1072,7 @@ static int udp_write(URLContext *h, const uint8_t *buf,
int size)
int ret;
#if HAVE_PTHREAD_CANCEL
- if (s->fifo) {
+ if (s->tx_fifo) {
uint8_t tmp[4];
pthread_mutex_lock(&s->mutex);
@@ -1081,14 +1087,14 @@ static int udp_write(URLContext *h, const uint8_t *buf,
int size)
return err;
}
- if (av_fifo_can_write(s->fifo) < size + 4) {
+ if (av_fifo_can_write(s->tx_fifo) < size + 4) {
/* What about a partial packet tx ? */
pthread_mutex_unlock(&s->mutex);
return AVERROR(ENOMEM);
}
AV_WL32(tmp, size);
- av_fifo_write(s->fifo, tmp, 4); /* size of packet */
- av_fifo_write(s->fifo, buf, size); /* the data */
+ av_fifo_write(s->tx_fifo, tmp, 4); /* size of packet */
+ av_fifo_write(s->tx_fifo, buf, size); /* the data */
pthread_cond_signal(&s->cond);
pthread_mutex_unlock(&s->mutex);
return size;
@@ -1150,7 +1156,8 @@ static int udp_close(URLContext *h)
}
#endif
closesocket(s->udp_fd);
- av_fifo_freep2(&s->fifo);
+ av_fifo_freep2(&s->rx_fifo);
+ av_fifo_freep2(&s->tx_fifo);
ff_ip_reset_filters(&s->filters);
return 0;
}
--
2.49.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-requ...@ffmpeg.org with subject "unsubscribe".
