RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert aviobuf: Retry if the read/write function returns AVERROR(EAGAIN) 

This reverts SVN commit 26318, which broke MS-RTSP playback.

Originally committed as revision 26326 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2011-01-13 06:22:43 +00:00
parent 891aeeee72
commit c66f53cf8b
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/aviobuf.c
View File

@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* needed for usleep() */
#define _XOPEN_SOURCE 600
#include <unistd.h>
#include "libavutil/crc.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
@ -91,29 +88,11 @@ ByteIOContext *av_alloc_put_byte(
return s;
}
static inline int retry_transfer_wrapper(void *opaque, unsigned char *buf,
int size,
int (*transfer_func)(void *, unsigned char *, int)) {
int fast_retries = 5;
while (1) {
int ret = transfer_func(opaque, buf, size);
if (ret == AVERROR(EAGAIN)) {
if (fast_retries)
fast_retries--;
else
usleep(1000);
} else
return ret;
}
}
static void flush_buffer(ByteIOContext *s)
{
if (s->buf_ptr > s->buffer) {
if (s->write_packet && !s->error){
int ret= retry_transfer_wrapper(s->opaque, s->buffer,
s->buf_ptr - s->buffer,
s->write_packet);
int ret= s->write_packet(s->opaque, s->buffer, s->buf_ptr - s->buffer);
if(ret < 0){
s->error = ret;
}
@ -382,7 +361,7 @@ static void fill_buffer(ByteIOContext *s)
}
if(s->read_packet)
len = retry_transfer_wrapper(s->opaque, dst, len, s->read_packet);
len = s->read_packet(s->opaque, dst, len);
else
len = 0;
if (len <= 0) {
@ -453,8 +432,7 @@ int get_buffer(ByteIOContext *s, unsigned char *buf, int size)
if (len == 0) {
if(size > s->buffer_size && !s->update_checksum){
if(s->read_packet)
len = retry_transfer_wrapper(s->opaque, buf, size,
s->read_packet);
len = s->read_packet(s->opaque, buf, size);
if (len <= 0) {
/* do not modify buffer if EOF reached so that a seek back can
be done without rereading data */