mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

stream_pvr: increase timeout, slightly better error reporting

Browse Source 
An attempt to find out what's wrong with issue #1382.

I don't even know why a timeout would be needed; for robustness with
broken devices maybe?
This commit is contained in:
wm4 2014-12-26 14:18:48 +01:00
parent db4685ac75
commit 98ba7b44d9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stream/stream_pvr.c
View File

@ -537,8 +537,8 @@ get_v4l2_freq (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_G_FREQUENCY, &vf) < 0)
{
MP_ERR(pvr, "%s can't get frequency %d.\n",
LOG_LEVEL_V4L2, errno);
MP_ERR(pvr, "%s can't get frequency (%s).\n",
LOG_LEVEL_V4L2, mp_strerror(errno));
return -1;
}
freq = vf.frequency;
@ -1491,10 +1491,15 @@ pvr_stream_read (stream_t *stream, char *buffer, int size)
rk = size - pos;
if (poll (pfds, 1, 500) <= 0)
int r = poll(pfds, 1, 5000);
if (r <= 0)
{
MP_ERR(pvr, "%s failed with errno %d when reading %d bytes\n",
LOG_LEVEL_PVR, errno, size-pos);
if (r < 0) {
MP_ERR(pvr, "%s failed with '%s' when reading %d bytes\n",
LOG_LEVEL_PVR, mp_strerror(errno), size-pos);
} else {
MP_ERR(pvr, "timeout when trying to read from device\n");
}
break;
}