]> git.sesse.net Git - ffmpeg/commitdiff
avformat/udp: remove setting cancel state from the TX thread
authorMarton Balint <cus@passwd.hu>
Sun, 26 Jan 2020 20:11:53 +0000 (21:11 +0100)
committerMarton Balint <cus@passwd.hu>
Sun, 2 Feb 2020 18:04:42 +0000 (19:04 +0100)
Write mode does not use cancellation.

Signed-off-by: Marton Balint <cus@passwd.hu>
libavformat/udp.c

index dce4cf76c7c5819b2be3e46218c88986d05ca3ee..85c9e3a900b81f4fe520e9f1ae64dc179234ac88 100644 (file)
@@ -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);
     }