diff options
| author | Marton Balint <cus@passwd.hu> | 2020-01-26 21:11:53 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-02-02 19:04:42 +0100 |
| commit | c2b6493bf7ccbd34c2b28c53093fa6902673a8cd (patch) | |
| tree | 9a939b0b2fb70d479193d01b3a8827d23ff0b76d | |
| parent | fcc9f13717c8c3fe08ca5caf957c39e76ea35e4f (diff) | |
| download | ffmpeg-c2b6493bf7ccbd34c2b28c53093fa6902673a8cd.tar.gz | |
avformat/udp: remove setting cancel state from the TX thread
Write mode does not use cancellation.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavformat/udp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/udp.c b/libavformat/udp.c index dce4cf76c7..85c9e3a900 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -520,14 +520,12 @@ static void *circular_buffer_task_tx( void *_URLContext) { URLContext *h = _URLContext; UDPContext *s = h->priv_data; - int old_cancelstate; int64_t target_timestamp = av_gettime_relative(); int64_t start_timestamp = av_gettime_relative(); int64_t sent_bits = 0; int64_t burst_interval = s->bitrate ? (s->burst_bits * 1000000 / s->bitrate) : 0; int64_t max_delay = s->bitrate ? ((int64_t)h->max_packet_size * 8 * 1000000 / s->bitrate + 1) : 0; - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); pthread_mutex_lock(&s->mutex); if (ff_socket_nonblock(s->udp_fd, 0) < 0) { @@ -562,7 +560,6 @@ static void *circular_buffer_task_tx( void *_URLContext) av_fifo_generic_read(s->fifo, s->tmp, len, NULL); pthread_mutex_unlock(&s->mutex); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelstate); if (s->bitrate) { timestamp = av_gettime_relative(); @@ -608,7 +605,6 @@ static void *circular_buffer_task_tx( void *_URLContext) } } - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); pthread_mutex_lock(&s->mutex); } |