Commit 79134973 authored by Philip Gladstone's avatar Philip Gladstone

Fix the 'hard cpu loop' problem when capturing audio from /dev/dsp. This

code now waits for up to 30ms before reporting that no packet is available.

Originally committed as revision 1546 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 85a57296
......@@ -244,6 +244,18 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (av_new_packet(pkt, s->frame_size) < 0)
return -EIO;
for(;;) {
struct timeval tv;
fd_set fds;
tv.tv_sec = 0;
tv.tv_usec = 30 * 1000; /* 30 msecs -- a bit shorter than 1 frame at 30fps */
FD_ZERO(&fds);
FD_SET(s->fd, &fds);
/* This will block until data is available or we get a timeout */
(void) select(s->fd + 1, &fds, 0, 0, &tv);
ret = read(s->fd, pkt->data, pkt->size);
if (ret > 0)
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment