diff options
Diffstat (limited to 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 280 |
1 files changed, 191 insertions, 89 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 142e026546..193b8e9c98 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -1,54 +1,72 @@ /* - * Video4Linux2 grab interface * Copyright (c) 2000,2001 Fabrice Bellard * Copyright (c) 2006 Luca Abeni * - * Part of this file is based on the V4L2 video capture example - * (http://v4l2spec.bytesex.org/v4l2spec/capture.c) - * - * Thanks to Michael Niedermayer for providing the mapping between - * V4L2_PIX_FMT_* and PIX_FMT_* + * This file is part of FFmpeg. * - * - * This file is part of Libav. - * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * Video4Linux2 grab interface + * + * Part of this file is based on the V4L2 video capture example + * (http://v4l2spec.bytesex.org/v4l2spec/capture.c) + * + * Thanks to Michael Niedermayer for providing the mapping between + * V4L2_PIX_FMT_* and PIX_FMT_* + */ + #undef __STRICT_ANSI__ //workaround due to broken kernel headers #include "config.h" -#include "libavformat/avformat.h" #include "libavformat/internal.h" #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/time.h> -#include <poll.h> #if HAVE_SYS_VIDEOIO_H #include <sys/videoio.h> #else +#if HAVE_ASM_TYPES_H +#include <asm/types.h> +#endif #include <linux/videodev2.h> #endif +#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/log.h" #include "libavutil/opt.h" +#include "avdevice.h" +#include "timefilter.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" #include "libavutil/avstring.h" -#include "libavutil/mathematics.h" + +#if CONFIG_LIBV4L2 +#include <libv4l2.h> +#else +#define v4l2_open open +#define v4l2_close close +#define v4l2_dup dup +#define v4l2_ioctl ioctl +#define v4l2_read read +#define v4l2_mmap mmap +#define v4l2_munmap munmap +#endif static const int desired_video_buffers = 256; @@ -56,23 +74,45 @@ static const int desired_video_buffers = 256; #define V4L_RAWFORMATS 1 #define V4L_COMPFORMATS 2 +/** + * Return timestamps to the user exactly as returned by the kernel + */ +#define V4L_TS_DEFAULT 0 +/** + * Autodetect the kind of timestamps returned by the kernel and convert to + * absolute (wall clock) timestamps. + */ +#define V4L_TS_ABS 1 +/** + * Assume kernel timestamps are from the monotonic clock and convert to + * absolute timestamps. + */ +#define V4L_TS_MONO2ABS 2 + +/** + * Once the kind of timestamps returned by the kernel have been detected, + * the value of the timefilter (NULL or not) determines whether a conversion + * takes place. + */ +#define V4L_TS_CONVERT_READY V4L_TS_DEFAULT + struct video_data { AVClass *class; int fd; int frame_format; /* V4L2_PIX_FMT_* */ int width, height; int frame_size; - int timeout; int interlaced; int top_field_first; + int ts_mode; + TimeFilter *timefilter; + int64_t last_time_m; int buffers; void **buf_start; unsigned int *buf_len; char *standard; int channel; - char *video_size; /**< String describing video size, - set by a private option. */ char *pixel_format; /**< Set by a private option. */ int list_format; /**< Set by a private option. */ char *framerate; /**< Set by a private option. */ @@ -92,20 +132,27 @@ struct fmt_map { static struct fmt_map fmt_conversion_table[] = { //ff_fmt codec_id v4l2_fmt { PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420 }, + { PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YVU420 }, { PIX_FMT_YUV422P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV422P }, { PIX_FMT_YUYV422, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUYV }, { PIX_FMT_UYVY422, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_UYVY }, { PIX_FMT_YUV411P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV411P }, { PIX_FMT_YUV410P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV410 }, - { PIX_FMT_RGB555, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555 }, - { PIX_FMT_RGB565, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565 }, + { PIX_FMT_RGB555LE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555 }, + { PIX_FMT_RGB555BE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555X }, + { PIX_FMT_RGB565LE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565 }, + { PIX_FMT_RGB565BE,AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565X }, { PIX_FMT_BGR24, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR24 }, { PIX_FMT_RGB24, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB24 }, - { PIX_FMT_BGRA, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR32 }, + { PIX_FMT_BGR0, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR32 }, + { PIX_FMT_0RGB, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB32 }, { PIX_FMT_GRAY8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_GREY }, { PIX_FMT_NV12, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 }, { PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG }, { PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG }, +#ifdef V4L2_PIX_FMT_CPIA1 + { PIX_FMT_NONE, AV_CODEC_ID_CPIA, V4L2_PIX_FMT_CPIA1 }, +#endif }; static int device_open(AVFormatContext *ctx) @@ -119,7 +166,7 @@ static int device_open(AVFormatContext *ctx) flags |= O_NONBLOCK; } - fd = open(ctx->filename, flags, 0); + fd = v4l2_open(ctx->filename, flags, 0); if (fd < 0) { err = errno; @@ -129,7 +176,7 @@ static int device_open(AVFormatContext *ctx) return AVERROR(err); } - res = ioctl(fd, VIDIOC_QUERYCAP, &cap); + res = v4l2_ioctl(fd, VIDIOC_QUERYCAP, &cap); if (res < 0) { err = errno; av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYCAP): %s\n", @@ -159,7 +206,7 @@ static int device_open(AVFormatContext *ctx) return fd; fail: - close(fd); + v4l2_close(fd); return AVERROR(err); } @@ -178,7 +225,7 @@ static int device_init(AVFormatContext *ctx, int *width, int *height, pix->pixelformat = pix_fmt; pix->field = V4L2_FIELD_ANY; - res = ioctl(fd, VIDIOC_S_FMT, &fmt); + res = v4l2_ioctl(fd, VIDIOC_S_FMT, &fmt); if ((*width != fmt.fmt.pix.width) || (*height != fmt.fmt.pix.height)) { av_log(ctx, AV_LOG_INFO, @@ -209,7 +256,7 @@ static int first_field(int fd) int res; v4l2_std_id std; - res = ioctl(fd, VIDIOC_G_STD, &std); + res = v4l2_ioctl(fd, VIDIOC_G_STD, &std); if (res < 0) { return 0; } @@ -338,34 +385,30 @@ static int mmap_init(AVFormatContext *ctx) .memory = V4L2_MEMORY_MMAP }; - res = ioctl(s->fd, VIDIOC_REQBUFS, &req); + res = v4l2_ioctl(s->fd, VIDIOC_REQBUFS, &req); if (res < 0) { if (errno == EINVAL) { av_log(ctx, AV_LOG_ERROR, "Device does not support mmap\n"); } else { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_REQBUFS)\n"); } - return AVERROR(errno); } if (req.count < 2) { av_log(ctx, AV_LOG_ERROR, "Insufficient buffer memory\n"); - return AVERROR(ENOMEM); } s->buffers = req.count; s->buf_start = av_malloc(sizeof(void *) * s->buffers); if (s->buf_start == NULL) { av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer pointers\n"); - return AVERROR(ENOMEM); } s->buf_len = av_malloc(sizeof(unsigned int) * s->buffers); if (s->buf_len == NULL) { av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer sizes\n"); av_free(s->buf_start); - return AVERROR(ENOMEM); } @@ -375,11 +418,9 @@ static int mmap_init(AVFormatContext *ctx) .index = i, .memory = V4L2_MEMORY_MMAP }; - - res = ioctl(s->fd, VIDIOC_QUERYBUF, &buf); + res = v4l2_ioctl(s->fd, VIDIOC_QUERYBUF, &buf); if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYBUF)\n"); - return AVERROR(errno); } @@ -391,13 +432,12 @@ static int mmap_init(AVFormatContext *ctx) return -1; } - s->buf_start[i] = mmap(NULL, buf.length, + s->buf_start[i] = v4l2_mmap(NULL, buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, s->fd, buf.m.offset); if (s->buf_start[i] == MAP_FAILED) { av_log(ctx, AV_LOG_ERROR, "mmap: %s\n", strerror(errno)); - return AVERROR(errno); } } @@ -420,7 +460,7 @@ static void mmap_release_buffer(AVPacket *pkt) fd = buf_descriptor->fd; av_free(buf_descriptor); - res = ioctl(fd, VIDIOC_QBUF, &buf); + res = v4l2_ioctl(fd, VIDIOC_QBUF, &buf); if (res < 0) av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n", strerror(errno)); @@ -429,6 +469,66 @@ static void mmap_release_buffer(AVPacket *pkt) pkt->size = 0; } +#if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC) +static int64_t av_gettime_monotonic(void) +{ + struct timespec tv; + + clock_gettime(CLOCK_MONOTONIC, &tv); + return (int64_t)tv.tv_sec * 1000000 + tv.tv_nsec / 1000; +} +#endif + +static int init_convert_timestamp(AVFormatContext *ctx, int64_t ts) +{ + struct video_data *s = ctx->priv_data; + int64_t now; + + now = av_gettime(); + if (s->ts_mode == V4L_TS_ABS && + ts <= now + 1 * AV_TIME_BASE && ts >= now - 10 * AV_TIME_BASE) { + av_log(ctx, AV_LOG_INFO, "Detected absolute timestamps\n"); + s->ts_mode = V4L_TS_CONVERT_READY; + return 0; + } +#if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC) + now = av_gettime_monotonic(); + if (s->ts_mode == V4L_TS_MONO2ABS || + (ts <= now + 1 * AV_TIME_BASE && ts >= now - 10 * AV_TIME_BASE)) { + int64_t period = av_rescale_q(1, ctx->streams[0]->codec->time_base, + AV_TIME_BASE_Q); + av_log(ctx, AV_LOG_INFO, "Detected monotonic timestamps, converting\n"); + /* microseconds instead of seconds, MHz instead of Hz */ + s->timefilter = ff_timefilter_new(1, period, 1.0E-6); + s->ts_mode = V4L_TS_CONVERT_READY; + return 0; + } +#endif + av_log(ctx, AV_LOG_ERROR, "Unknown timestamps\n"); + return AVERROR(EIO); +} + +static int convert_timestamp(AVFormatContext *ctx, int64_t *ts) +{ + struct video_data *s = ctx->priv_data; + + if (s->ts_mode) { + int r = init_convert_timestamp(ctx, *ts); + if (r < 0) + return r; + } +#if HAVE_CLOCK_GETTIME && defined(CLOCK_MONOTONIC) + if (s->timefilter) { + int64_t nowa = av_gettime(); + int64_t nowm = av_gettime_monotonic(); + ff_timefilter_update(s->timefilter, nowa, nowm - s->last_time_m); + s->last_time_m = nowm; + *ts = ff_timefilter_eval(s->timefilter, *ts - nowm); + } +#endif + return 0; +} + static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) { struct video_data *s = ctx->priv_data; @@ -437,22 +537,13 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) .memory = V4L2_MEMORY_MMAP }; struct buff_data *buf_descriptor; - struct pollfd p = { .fd = s->fd, .events = POLLIN }; int res; - res = poll(&p, 1, s->timeout); - if (res < 0) - return AVERROR(errno); - - if (!(p.revents & (POLLIN | POLLERR | POLLHUP))) - return AVERROR(EAGAIN); - /* FIXME: Some special treatment might be needed in case of loss of signal... */ - while ((res = ioctl(s->fd, VIDIOC_DQBUF, &buf)) < 0 && (errno == EINTR)); + while ((res = v4l2_ioctl(s->fd, VIDIOC_DQBUF, &buf)) < 0 && (errno == EINTR)); if (res < 0) { if (errno == EAGAIN) { pkt->size = 0; - return AVERROR(EAGAIN); } av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_DQBUF): %s\n", @@ -460,7 +551,14 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) return AVERROR(errno); } - assert (buf.index < s->buffers); + av_assert0(buf.index < s->buffers); + + /* CPIA is a compressed format and we don't know the exact number of bytes + * used by a frame, so set it here as the driver announces it. + */ + if (ctx->video_codec_id == AV_CODEC_ID_CPIA) + s->frame_size = buf.bytesused; + if (s->frame_size > 0 && buf.bytesused != s->frame_size) { av_log(ctx, AV_LOG_ERROR, "The v4l2 frame is %d bytes, but %d bytes are expected\n", @@ -473,6 +571,9 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) pkt->data= s->buf_start[buf.index]; pkt->size = buf.bytesused; pkt->pts = buf.timestamp.tv_sec * INT64_C(1000000) + buf.timestamp.tv_usec; + res = convert_timestamp(ctx, &pkt->pts); + if (res < 0) + return res; pkt->destruct = mmap_release_buffer; buf_descriptor = av_malloc(sizeof(struct buff_data)); if (buf_descriptor == NULL) { @@ -480,7 +581,7 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) * allocate a buffer for memcopying into it */ av_log(ctx, AV_LOG_ERROR, "Failed to allocate a buffer descriptor\n"); - res = ioctl(s->fd, VIDIOC_QBUF, &buf); + res = v4l2_ioctl(s->fd, VIDIOC_QBUF, &buf); return AVERROR(ENOMEM); } @@ -504,7 +605,7 @@ static int mmap_start(AVFormatContext *ctx) .memory = V4L2_MEMORY_MMAP }; - res = ioctl(s->fd, VIDIOC_QBUF, &buf); + res = v4l2_ioctl(s->fd, VIDIOC_QBUF, &buf); if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n", strerror(errno)); @@ -514,7 +615,7 @@ static int mmap_start(AVFormatContext *ctx) } type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - res = ioctl(s->fd, VIDIOC_STREAMON, &type); + res = v4l2_ioctl(s->fd, VIDIOC_STREAMON, &type); if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_STREAMON): %s\n", strerror(errno)); @@ -534,9 +635,9 @@ static void mmap_close(struct video_data *s) /* We do not check for the result, because we could * not do anything about it anyway... */ - ioctl(s->fd, VIDIOC_STREAMOFF, &type); + v4l2_ioctl(s->fd, VIDIOC_STREAMOFF, &type); for (i = 0; i < s->buffers; i++) { - munmap(s->buf_start[i], s->buf_len[i]); + v4l2_munmap(s->buf_start[i], s->buf_len[i]); } av_free(s->buf_start); av_free(s->buf_len); @@ -563,14 +664,14 @@ static int v4l2_set_parameters(AVFormatContext *s1) /* set tv video input */ input.index = s->channel; - if (ioctl(s->fd, VIDIOC_ENUMINPUT, &input) < 0) { + if (v4l2_ioctl(s->fd, VIDIOC_ENUMINPUT, &input) < 0) { av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n"); return AVERROR(EIO); } av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n", s->channel, input.name); - if (ioctl(s->fd, VIDIOC_S_INPUT, &input.index) < 0) { + if (v4l2_ioctl(s->fd, VIDIOC_S_INPUT, &input.index) < 0) { av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set input(%d) failed\n", s->channel); @@ -583,22 +684,19 @@ static int v4l2_set_parameters(AVFormatContext *s1) /* set tv standard */ for(i=0;;i++) { standard.index = i; - if (ioctl(s->fd, VIDIOC_ENUMSTD, &standard) < 0) { - av_log(s1, AV_LOG_ERROR, - "The V4L2 driver ioctl set standard(%s) failed\n", - s->standard); - return AVERROR(EIO); - } - - if (!av_strcasecmp(standard.name, s->standard)) { + ret = v4l2_ioctl(s->fd, VIDIOC_ENUMSTD, &standard); + if (ret < 0 || !av_strcasecmp(standard.name, s->standard)) break; - } + } + if (ret < 0) { + av_log(s1, AV_LOG_ERROR, "Unknown standard '%s'\n", s->standard); + return ret; } av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s, id: %"PRIu64"\n", s->standard, (uint64_t)standard.id); - if (ioctl(s->fd, VIDIOC_S_STD, &standard.id) < 0) { + if (v4l2_ioctl(s->fd, VIDIOC_S_STD, &standard.id) < 0) { av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n", s->standard); @@ -612,7 +710,7 @@ static int v4l2_set_parameters(AVFormatContext *s1) tpf->numerator = framerate_q.den; tpf->denominator = framerate_q.num; - if (ioctl(s->fd, VIDIOC_S_PARM, &streamparm) != 0) { + if (v4l2_ioctl(s->fd, VIDIOC_S_PARM, &streamparm) != 0) { av_log(s1, AV_LOG_ERROR, "ioctl set time per frame(%d/%d) failed\n", framerate_q.den, framerate_q.num); @@ -628,7 +726,7 @@ static int v4l2_set_parameters(AVFormatContext *s1) tpf->numerator, tpf->denominator); } } else { - if (ioctl(s->fd, VIDIOC_G_PARM, &streamparm) != 0) { + if (v4l2_ioctl(s->fd, VIDIOC_G_PARM, &streamparm) != 0) { av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_PARM): %s\n", strerror(errno)); return AVERROR(errno); @@ -637,10 +735,6 @@ static int v4l2_set_parameters(AVFormatContext *s1) s1->streams[0]->codec->time_base.den = tpf->denominator; s1->streams[0]->codec->time_base.num = tpf->numerator; - s->timeout = 100 + - av_rescale_q(1, s1->streams[0]->codec->time_base, - (AVRational){1, 1000}); - return 0; } @@ -671,7 +765,7 @@ static uint32_t device_try_init(AVFormatContext *s1, if (desired_format != 0) { *codec_id = fmt_v4l2codec(desired_format); - assert(*codec_id != AV_CODEC_ID_NONE); + av_assert0(*codec_id != AV_CODEC_ID_NONE); } return desired_format; @@ -683,7 +777,7 @@ static int v4l2_read_header(AVFormatContext *s1) AVStream *st; int res = 0; uint32_t desired_format; - enum AVCodecID codec_id; + enum AVCodecID codec_id = AV_CODEC_ID_NONE; enum PixelFormat pix_fmt = PIX_FMT_NONE; st = avformat_new_stream(s1, NULL); @@ -706,13 +800,6 @@ static int v4l2_read_header(AVFormatContext *s1) avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ - if (s->video_size && - (res = av_parse_video_size(&s->width, &s->height, s->video_size)) < 0) { - av_log(s1, AV_LOG_ERROR, "Could not parse video size '%s'.\n", - s->video_size); - goto out; - } - if (s->pixel_format) { AVCodec *codec = avcodec_find_decoder_by_name(s->pixel_format); @@ -736,7 +823,7 @@ static int v4l2_read_header(AVFormatContext *s1) av_log(s1, AV_LOG_VERBOSE, "Querying the device for the current frame size\n"); fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if (ioctl(s->fd, VIDIOC_G_FMT, &fmt) < 0) { + if (v4l2_ioctl(s->fd, VIDIOC_G_FMT, &fmt) < 0) { av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_FMT): %s\n", strerror(errno)); res = AVERROR(errno); @@ -751,21 +838,28 @@ static int v4l2_read_header(AVFormatContext *s1) desired_format = device_try_init(s1, pix_fmt, &s->width, &s->height, &codec_id); + + /* If no pixel_format was specified, the codec_id was not known up + * until now. Set video_codec_id in the context, as codec_id will + * not be available outside this function + */ + if (codec_id != AV_CODEC_ID_NONE && s1->video_codec_id == AV_CODEC_ID_NONE) + s1->video_codec_id = codec_id; + if (desired_format == 0) { av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for " "codec_id %d, pix_fmt %d.\n", s1->video_codec_id, pix_fmt); - close(s->fd); + v4l2_close(s->fd); res = AVERROR(EIO); goto out; } - - if ((res = av_image_check_size(s->width, s->height, 0, s1) < 0)) + if ((res = av_image_check_size(s->width, s->height, 0, s1)) < 0) goto out; s->frame_format = desired_format; - if ((res = v4l2_set_parameters(s1) < 0)) + if ((res = v4l2_set_parameters(s1)) < 0) goto out; st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id); @@ -774,7 +868,7 @@ static int v4l2_read_header(AVFormatContext *s1) if ((res = mmap_init(s1)) || (res = mmap_start(s1)) < 0) { - close(s->fd); + v4l2_close(s->fd); goto out; } @@ -785,6 +879,8 @@ static int v4l2_read_header(AVFormatContext *s1) if (codec_id == AV_CODEC_ID_RAWVIDEO) st->codec->codec_tag = avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); + if (desired_format == V4L2_PIX_FMT_YVU420) + st->codec->codec_tag = MKTAG('Y', 'V', '1', '2'); st->codec->width = s->width; st->codec->height = s->height; st->codec->bit_rate = s->frame_size * 1/av_q2d(st->codec->time_base) * 8; @@ -818,16 +914,17 @@ static int v4l2_read_close(AVFormatContext *s1) mmap_close(s); - close(s->fd); + v4l2_close(s->fd); return 0; } #define OFFSET(x) offsetof(struct video_data, x) #define DEC AV_OPT_FLAG_DECODING_PARAM + static const AVOption options[] = { { "standard", "TV standard, used only by analog frame grabber", OFFSET(standard), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC }, { "channel", "TV channel, used only by frame grabber", OFFSET(channel), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, DEC }, - { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, + { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC }, { "pixel_format", "Preferred pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "input_format", "Preferred pixel format (for raw video) or codec name", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, @@ -835,6 +932,11 @@ static const AVOption options[] = { { "all", "Show all available formats", OFFSET(list_format), AV_OPT_TYPE_CONST, {.i64 = V4L_ALLFORMATS }, 0, INT_MAX, DEC, "list_formats" }, { "raw", "Show only non-compressed formats", OFFSET(list_format), AV_OPT_TYPE_CONST, {.i64 = V4L_RAWFORMATS }, 0, INT_MAX, DEC, "list_formats" }, { "compressed", "Show only compressed formats", OFFSET(list_format), AV_OPT_TYPE_CONST, {.i64 = V4L_COMPFORMATS }, 0, INT_MAX, DEC, "list_formats" }, + { "timestamps", "Kind of timestamps for grabbed frames", OFFSET(ts_mode), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, DEC, "timestamps" }, + { "default", "Use timestamps from the kernel", OFFSET(ts_mode), AV_OPT_TYPE_CONST, {.i64 = V4L_TS_DEFAULT }, 0, 2, DEC, "timestamps" }, + { "abs", "Use absolute timestamps (wall clock)", OFFSET(ts_mode), AV_OPT_TYPE_CONST, {.i64 = V4L_TS_ABS }, 0, 2, DEC, "timestamps" }, + { "mono2abs", "Force conversion from monotonic to absolute timestamps", OFFSET(ts_mode), AV_OPT_TYPE_CONST, {.i64 = V4L_TS_MONO2ABS }, 0, 2, DEC, "timestamps" }, + { "ts", "Kind of timestamps for grabbed frames", OFFSET(ts_mode), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, DEC, "timestamps" }, { NULL }, }; @@ -846,7 +948,7 @@ static const AVClass v4l2_class = { }; AVInputFormat ff_v4l2_demuxer = { - .name = "video4linux2", + .name = "video4linux2,v4l2", .long_name = NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"), .priv_data_size = sizeof(struct video_data), .read_header = v4l2_read_header, |