generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/async: pass internal I/O error

Browse Source 
av_fifo_generic_write() does not return any error code.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Zhang Rui 2015-10-10 17:51:08 +08:00 committed by Michael Niedermayer
parent c3d312bb7f
commit 7dc42c9e65
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/async.c
View File

@ -55,6 +55,7 @@ typedef struct Context {
int seek_completed; int seek_completed;
int64_t seek_ret; int64_t seek_ret;
int inner_io_error;
int io_error; int io_error;
int io_eof_reached; int io_eof_reached;
@ -85,6 +86,18 @@ static int async_check_interrupt(void *arg)
return c->abort_request; return c->abort_request;
} }
static int wrapped_url_read(void *src, void *dst, int size)
{
URLContext *h = src;
Context *c = h->priv_data;
int ret;
ret = ffurl_read(c->inner, dst, size);
c->inner_io_error = ret < 0 ? ret : 0;
return ret;
}
static void *async_buffer_task(void *arg) static void *async_buffer_task(void *arg)
{ {
URLContext *h = arg; URLContext *h = arg;
@ -136,14 +149,13 @@ static void *async_buffer_task(void *arg)
pthread_mutex_unlock(&c->mutex); pthread_mutex_unlock(&c->mutex);
to_copy = FFMIN(4096, fifo_space); to_copy = FFMIN(4096, fifo_space);
ret = av_fifo_generic_write(fifo, c->inner, to_copy, (void *)ffurl_read); ret = av_fifo_generic_write(fifo, (void *)h, to_copy, (void *)wrapped_url_read);
pthread_mutex_lock(&c->mutex); pthread_mutex_lock(&c->mutex);
if (ret <= 0) { if (ret <= 0) {
c->io_eof_reached = 1; c->io_eof_reached = 1;
if (ret < 0) { if (c->inner_io_error < 0)
c->io_error = ret; c->io_error = c->inner_io_error;
}
} }
pthread_cond_signal(&c->cond_wakeup_main); pthread_cond_signal(&c->cond_wakeup_main);
@ -270,8 +282,12 @@ static int async_read_internal(URLContext *h, void *dest, int size, int read_com
if (to_read <= 0 || !read_complete) if (to_read <= 0 || !read_complete)
break; break;
} else if (c->io_eof_reached) { } else if (c->io_eof_reached) {
if (ret <= 0) if (ret <= 0) {
ret = AVERROR_EOF; if (c->io_error)
ret = c->io_error;
else
ret = AVERROR_EOF;
}
break; break;
} }
pthread_cond_signal(&c->cond_wakeup_background); pthread_cond_signal(&c->cond_wakeup_background);