summaryrefslogtreecommitdiff
path: root/libavdevice/v4l2.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-05-26 20:37:08 +0200
committerAnton Khirnov <anton@khirnov.net>2011-05-27 06:52:51 +0200
commit82b5aa0add203e6e90e3bbefbb9eb02118256ff6 (patch)
treec7b3de05d436f7fabd6e61fd58452528d0239a3f /libavdevice/v4l2.c
parentfd48620e3e259cdb8df9e7d677a943d6e7d3575b (diff)
v4l2: factorize returning error codes.
This will be useful in the following commit.
Diffstat (limited to 'libavdevice/v4l2.c')
-rw-r--r--libavdevice/v4l2.c28
1 files changed, 17 insertions, 11 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 566ee92801..30eb972bf5 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -577,13 +577,14 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
{
struct video_data *s = s1->priv_data;
AVStream *st;
- int res;
+ int res = 0;
uint32_t desired_format, capabilities;
enum CodecID codec_id;
st = av_new_stream(s1, 0);
if (!st) {
- return AVERROR(ENOMEM);
+ res = AVERROR(ENOMEM);
+ goto out;
}
av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */
@@ -593,7 +594,8 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
capabilities = 0;
s->fd = device_open(s1, &capabilities);
if (s->fd < 0) {
- return AVERROR(EIO);
+ res = AVERROR(EIO);
+ goto out;
}
av_log(s1, AV_LOG_VERBOSE, "[%d]Capabilities: %x\n", s->fd, capabilities);
@@ -604,7 +606,8 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (ioctl(s->fd, VIDIOC_G_FMT, &fmt) < 0) {
av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_FMT): %s\n", strerror(errno));
- return AVERROR(errno);
+ res = AVERROR(errno);
+ goto out;
}
s->width = fmt.fmt.pix.width;
s->height = fmt.fmt.pix.height;
@@ -617,14 +620,15 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
"codec_id %d, pix_fmt %d.\n", s1->video_codec_id, ap->pix_fmt);
close(s->fd);
- return AVERROR(EIO);
+ res = AVERROR(EIO);
+ goto out;
}
- if (av_image_check_size(s->width, s->height, 0, s1) < 0)
- return AVERROR(EINVAL);
+ if ((res = av_image_check_size(s->width, s->height, 0, s1) < 0))
+ goto out;
s->frame_format = desired_format;
- if (v4l2_set_parameters(s1, ap) < 0)
- return AVERROR(EIO);
+ if ((res = v4l2_set_parameters(s1, ap) < 0))
+ goto out;
st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);
s->frame_size = avpicture_get_size(st->codec->pix_fmt, s->width, s->height);
@@ -641,7 +645,8 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
if (res < 0) {
close(s->fd);
- return AVERROR(EIO);
+ res = AVERROR(EIO);
+ goto out;
}
s->top_field_first = first_field(s->fd);
@@ -653,7 +658,8 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st->codec->time_base.num = ap->time_base.num;
st->codec->bit_rate = s->frame_size * 1/av_q2d(st->codec->time_base) * 8;
- return 0;
+out:
+ return res;
}
static int v4l2_read_packet(AVFormatContext *s1, AVPacket *pkt)