summaryrefslogtreecommitdiffstats
path: root/stream/stream_pvr.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-26 21:21:56 +0100
committerwm4 <wm4@nowhere>2014-11-26 21:21:56 +0100
commitcc5437746312127aed4e4c8e62091707ec61153c (patch)
treedd0f5b575d3081d0057a0957ff3cb8556f817086 /stream/stream_pvr.c
parent3fe57e3cb691d75dc8813c29cada5e3ddfd2a295 (diff)
downloadmpv-cc5437746312127aed4e4c8e62091707ec61153c.tar.bz2
mpv-cc5437746312127aed4e4c8e62091707ec61153c.tar.xz
Do not call strerror()
...because everything is terrible. strerror() is not documented as having to be thread-safe by POSIX and C11. (Which is pretty much bullshit, because both mandate threads and some form of thread-local storage - so there's no excuse why implementation couldn't implement this in a thread-safe way. Especially with C11 this is ridiculous, because there is no way to use threads and convert error numbers to strings at the same time!) Since we heavily use threads now, we should avoid unsafe functions like strerror(). strerror_r() is in POSIX, but GNU/glibc deliberately fucks it up and gives the function different semantics than the POSIX one. It's a bit of work to convince this piece of shit to expose the POSIX standard function, and not the messed up GNU one. strerror_l() is also in POSIX, but only since the 2008 standard, and thus is not widespread. The solution is using avlibc (libavutil, by its official name), which handles the unportable details for us, mostly. We avoid some pain.
Diffstat (limited to 'stream/stream_pvr.c')
-rw-r--r--stream/stream_pvr.c39
1 files changed, 20 insertions, 19 deletions
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 50a8ee5cba..c75a9597cd 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -45,6 +45,7 @@
#include "osdep/io.h"
#include "common/msg.h"
+#include "common/common.h"
#include "options/options.h"
#include "stream.h"
@@ -530,7 +531,7 @@ get_v4l2_freq (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_G_TUNER, &vt) < 0)
{
MP_ERR(pvr, "%s can't set tuner (%s).\n",
- LOG_LEVEL_V4L2, strerror (errno));
+ LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
@@ -581,7 +582,7 @@ set_v4l2_freq (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_G_TUNER, &vt) < 0)
{
MP_ERR(pvr, "%s can't get tuner (%s).\n",
- LOG_LEVEL_V4L2, strerror (errno));
+ LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
@@ -594,7 +595,7 @@ set_v4l2_freq (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_S_FREQUENCY, &vf) < 0)
{
MP_ERR(pvr, "%s can't set frequency (%s).\n",
- LOG_LEVEL_V4L2, strerror (errno));
+ LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
@@ -602,7 +603,7 @@ set_v4l2_freq (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_G_TUNER, &vt) < 0)
{
MP_ERR(pvr, "%s can't set tuner (%s).\n",
- LOG_LEVEL_V4L2, strerror (errno));
+ LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
@@ -1070,7 +1071,7 @@ set_encoder_settings (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_S_EXT_CTRLS, &ctrls) < 0)
{
MP_ERR(pvr, "%s Error setting MPEG controls (%s).\n",
- LOG_LEVEL_ENCODER, strerror (errno));
+ LOG_LEVEL_ENCODER, mp_strerror (errno));
free (ext_ctrl);
return -1;
}
@@ -1166,7 +1167,7 @@ set_v4l2_settings (struct pvr_t *pvr)
ctrl.value = 1;
if (ioctl (pvr->dev_fd, VIDIOC_S_CTRL, &ctrl) < 0)
{
- MP_ERR(pvr, "%s can't mute (%s).\n", LOG_LEVEL_V4L2, strerror (errno));
+ MP_ERR(pvr, "%s can't mute (%s).\n", LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
}
@@ -1176,7 +1177,7 @@ set_v4l2_settings (struct pvr_t *pvr)
{
if (ioctl (pvr->dev_fd, VIDIOC_S_INPUT, &pvr->input) < 0)
{
- MP_ERR(pvr, "%s can't set input (%s)\n", LOG_LEVEL_V4L2, strerror (errno));
+ MP_ERR(pvr, "%s can't set input (%s)\n", LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
}
@@ -1189,7 +1190,7 @@ set_v4l2_settings (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_ENUMSTD, &std) < 0)
{
- MP_ERR(pvr, "%s can't set norm (%s)\n", LOG_LEVEL_V4L2, strerror (errno));
+ MP_ERR(pvr, "%s can't set norm (%s)\n", LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
@@ -1197,7 +1198,7 @@ set_v4l2_settings (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_S_STD, &std.id) < 0)
{
- MP_ERR(pvr, "%s can't set norm (%s)\n", LOG_LEVEL_V4L2, strerror (errno));
+ MP_ERR(pvr, "%s can't set norm (%s)\n", LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
}
@@ -1217,7 +1218,7 @@ set_v4l2_settings (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_S_CTRL, &ctrl) < 0)
{
MP_ERR(pvr, "%s can't set brightness to %d (%s).\n",
- LOG_LEVEL_V4L2, ctrl.value, strerror (errno));
+ LOG_LEVEL_V4L2, ctrl.value, mp_strerror (errno));
return -1;
}
}
@@ -1237,7 +1238,7 @@ set_v4l2_settings (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_S_CTRL, &ctrl) < 0)
{
MP_ERR(pvr, "%s can't set contrast to %d (%s).\n",
- LOG_LEVEL_V4L2, ctrl.value, strerror (errno));
+ LOG_LEVEL_V4L2, ctrl.value, mp_strerror (errno));
return -1;
}
}
@@ -1257,7 +1258,7 @@ set_v4l2_settings (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_S_CTRL, &ctrl) < 0)
{
MP_ERR(pvr, "%s can't set hue to %d (%s).\n",
- LOG_LEVEL_V4L2, ctrl.value, strerror (errno));
+ LOG_LEVEL_V4L2, ctrl.value, mp_strerror (errno));
return -1;
}
}
@@ -1277,7 +1278,7 @@ set_v4l2_settings (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_S_CTRL, &ctrl) < 0)
{
MP_ERR(pvr, "%s can't set saturation to %d (%s).\n",
- LOG_LEVEL_V4L2, ctrl.value, strerror (errno));
+ LOG_LEVEL_V4L2, ctrl.value, mp_strerror (errno));
return -1;
}
}
@@ -1293,7 +1294,7 @@ set_v4l2_settings (struct pvr_t *pvr)
if (ioctl (pvr->dev_fd, VIDIOC_S_FMT, &vfmt) < 0)
{
MP_ERR(pvr, "%s can't set resolution to %dx%d (%s).\n",
- LOG_LEVEL_V4L2, pvr->width, pvr->height, strerror (errno));
+ LOG_LEVEL_V4L2, pvr->width, pvr->height, mp_strerror (errno));
return -1;
}
}
@@ -1405,7 +1406,7 @@ v4l2_display_settings (struct pvr_t *pvr)
vin.index = input;
if (ioctl (pvr->dev_fd, VIDIOC_ENUMINPUT, &vin) < 0)
{
- MP_ERR(pvr, "%s can't get input (%s).\n", LOG_LEVEL_V4L2, strerror (errno));
+ MP_ERR(pvr, "%s can't get input (%s).\n", LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
else
@@ -1413,7 +1414,7 @@ v4l2_display_settings (struct pvr_t *pvr)
}
else
{
- MP_ERR(pvr, "%s can't get input (%s).\n", LOG_LEVEL_V4L2, strerror (errno));
+ MP_ERR(pvr, "%s can't get input (%s).\n", LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
@@ -1424,7 +1425,7 @@ v4l2_display_settings (struct pvr_t *pvr)
}
else
{
- MP_ERR(pvr, "%s can't get input (%s).\n", LOG_LEVEL_V4L2, strerror (errno));
+ MP_ERR(pvr, "%s can't get input (%s).\n", LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
@@ -1445,7 +1446,7 @@ v4l2_display_settings (struct pvr_t *pvr)
}
else
{
- MP_ERR(pvr, "%s can't get norm (%s)\n", LOG_LEVEL_V4L2, strerror (errno));
+ MP_ERR(pvr, "%s can't get norm (%s)\n", LOG_LEVEL_V4L2, mp_strerror (errno));
return -1;
}
@@ -1549,7 +1550,7 @@ pvr_stream_open (stream_t *stream)
if (ioctl (pvr->dev_fd, VIDIOC_QUERYCAP, &vcap) < 0)
{
MP_ERR(pvr, "%s device is not V4L2 compliant (%s).\n",
- LOG_LEVEL_PVR, strerror (errno));
+ LOG_LEVEL_PVR, mp_strerror (errno));
pvr_uninit (pvr);
return STREAM_ERROR;
}