virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Non-blocking protocol: core wrapper functions

Browse Source 
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Nicolas George 2011-02-04 19:12:37 +01:00 committed by Ronald S. Bultje
parent fe174fc8fc
commit 90441276e4
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavformat/avio.c
View File

@ -206,24 +206,21 @@ int url_open(URLContext **puc, const char *filename, int flags)
return ret; return ret;
} }
int url_read(URLContext *h, unsigned char *buf, int size) static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int size, int size_min,
{
int ret;
if (h->flags & URL_WRONLY)
return AVERROR(EIO);
ret = h->prot->url_read(h, buf, size);
return ret;
}
static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int size,
int (*transfer_func)(URLContext *h, unsigned char *buf, int size)) int (*transfer_func)(URLContext *h, unsigned char *buf, int size))
{ {
int ret, len; int ret, len;
int fast_retries = 5; int fast_retries = 5;
len = 0; len = 0;
while (len < size) { while (len < size_min) {
if (url_interrupt_cb())
return AVERROR(EINTR);
ret = transfer_func(h, buf+len, size-len); ret = transfer_func(h, buf+len, size-len);
if (ret == AVERROR(EINTR))
continue;
if (h->flags & URL_FLAG_NONBLOCK)
return ret;
if (ret == AVERROR(EAGAIN)) { if (ret == AVERROR(EAGAIN)) {
ret = 0; ret = 0;
if (fast_retries) if (fast_retries)
@ -239,9 +236,18 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
return len; return len;
} }
int url_read(URLContext *h, unsigned char *buf, int size)
{
if (h->flags & URL_WRONLY)
return AVERROR(EIO);
return retry_transfer_wrapper(h, buf, size, 1, h->prot->url_read);
}
int url_read_complete(URLContext *h, unsigned char *buf, int size) int url_read_complete(URLContext *h, unsigned char *buf, int size)
{ {
return retry_transfer_wrapper(h, buf, size, url_read); if (h->flags & URL_WRONLY)
return AVERROR(EIO);
return retry_transfer_wrapper(h, buf, size, size, h->prot->url_read);
} }
int url_write(URLContext *h, const unsigned char *buf, int size) int url_write(URLContext *h, const unsigned char *buf, int size)
@ -252,7 +258,7 @@ int url_write(URLContext *h, const unsigned char *buf, int size)
if (h->max_packet_size && size > h->max_packet_size) if (h->max_packet_size && size > h->max_packet_size)
return AVERROR(EIO); return AVERROR(EIO);
return retry_transfer_wrapper(h, buf, size, h->prot->url_write); return retry_transfer_wrapper(h, buf, size, size, h->prot->url_write);
} }
int64_t url_seek(URLContext *h, int64_t pos, int whence) int64_t url_seek(URLContext *h, int64_t pos, int whence)

1
libavformat/avio.h
View File

@ -151,7 +151,6 @@ int url_read(URLContext *h, unsigned char *buf, int size);
/** /**
* Read as many bytes as possible (up to size), calling the * Read as many bytes as possible (up to size), calling the
* read function multiple times if necessary. * read function multiple times if necessary.
* Will also retry if the read function returns AVERROR(EAGAIN).
* This makes special short-read handling in applications * This makes special short-read handling in applications
* unnecessary, if the return value is < size then it is * unnecessary, if the return value is < size then it is
* certain there was either an error or the end of file was reached. * certain there was either an error or the end of file was reached.