pthread_t circular_buffer_thread;
pthread_mutex_t mutex;
pthread_cond_t cond;
+ int thread_started;
+ volatile int exit_thread;
#endif
uint8_t tmp[UDP_MAX_PKT_SIZE+4];
int remaining_in_dg;
fd_set rfds;
struct timeval tv;
- for(;;) {
+ while(!s->exit_thread) {
int left;
int ret;
int len;
if (ff_check_interrupt(&h->interrupt_callback)) {
- s->circular_buffer_error = EINTR;
+ s->circular_buffer_error = AVERROR(EINTR);
goto end;
}
if (ret < 0) {
if (ff_neterrno() == AVERROR(EINTR))
continue;
- s->circular_buffer_error = EIO;
+ s->circular_buffer_error = AVERROR(EIO);
goto end;
}
/* No Space left, error, what do we do now */
if(left < UDP_MAX_PKT_SIZE + 4) {
av_log(h, AV_LOG_ERROR, "circular_buffer: OVERRUN\n");
- s->circular_buffer_error = EIO;
+ s->circular_buffer_error = AVERROR(EIO);
goto end;
}
left = FFMIN(left, s->fifo->end - s->fifo->wptr);
len = recv(s->udp_fd, s->tmp+4, sizeof(s->tmp)-4, 0);
if (len < 0) {
if (ff_neterrno() != AVERROR(EAGAIN) && ff_neterrno() != AVERROR(EINTR)) {
- s->circular_buffer_error = EIO;
+ s->circular_buffer_error = AVERROR(EIO);
goto end;
}
continue;
#if HAVE_PTHREADS
if (!is_output && s->circular_buffer_size) {
+ int ret;
+
/* start the task going */
s->fifo = av_fifo_alloc(s->circular_buffer_size);
- pthread_mutex_init(&s->mutex, NULL);
- pthread_cond_init(&s->cond, NULL);
- if (pthread_create(&s->circular_buffer_thread, NULL, circular_buffer_task, h)) {
- av_log(h, AV_LOG_ERROR, "pthread_create failed\n");
+ ret = pthread_mutex_init(&s->mutex, NULL);
+ if (ret != 0) {
+ av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", strerror(ret));
goto fail;
}
+ ret = pthread_cond_init(&s->cond, NULL);
+ if (ret != 0) {
+ av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", strerror(ret));
+ goto cond_fail;
+ }
+ ret = pthread_create(&s->circular_buffer_thread, NULL, circular_buffer_task, h);
+ if (ret != 0) {
+ av_log(h, AV_LOG_ERROR, "pthread_create failed : %s\n", strerror(ret));
+ goto thread_fail;
+ }
+ s->thread_started = 1;
}
#endif
return 0;
+#if HAVE_PTHREADS
+ thread_fail:
+ pthread_cond_destroy(&s->cond);
+ cond_fail:
+ pthread_mutex_destroy(&s->mutex);
+#endif
fail:
if (udp_fd >= 0)
closesocket(udp_fd);
static int udp_close(URLContext *h)
{
UDPContext *s = h->priv_data;
+ int ret;
if (s->is_multicast && (h->flags & AVIO_FLAG_READ))
udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr);
closesocket(s->udp_fd);
av_fifo_free(s->fifo);
#if HAVE_PTHREADS
+ if (s->thread_started) {
+ s->exit_thread = 1;
+ ret = pthread_join(s->circular_buffer_thread, NULL);
+ if (ret != 0)
+ av_log(h, AV_LOG_ERROR, "pthread_join(): %s\n", strerror(ret));
+ }
+
pthread_mutex_destroy(&s->mutex);
pthread_cond_destroy(&s->cond);
#endif
.url_close = udp_close,
.url_get_file_handle = udp_get_file_handle,
.priv_data_size = sizeof(UDPContext),
+ .flags = URL_PROTOCOL_FLAG_NETWORK,
};