X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavdevice%2Fv4l2.c;h=566ee92801a81e541206b9cac913285fe81c40d5;hb=d20576d01b6489e37813302c208df01068418bfb;hp=a866f9e060a441f4dcac3eff8faa5a4c090b2635;hpb=158aa9f2db642f6f3989386989530b3de46ef31b;p=ffmpeg diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index a866f9e060a..566ee92801a 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -10,20 +10,20 @@ * V4L2_PIX_FMT_* and PIX_FMT_* * * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -43,6 +43,9 @@ #endif #include #include +#include "libavutil/imgutils.h" +#include "libavutil/log.h" +#include "libavutil/opt.h" static const int desired_video_buffers = 256; @@ -53,6 +56,7 @@ enum io_method { }; struct video_data { + AVClass *class; int fd; int frame_format; /* V4L2_PIX_FMT_* */ enum io_method io_method; @@ -63,6 +67,8 @@ struct video_data { int buffers; void **buf_start; unsigned int *buf_len; + char *standard; + int channel; }; struct buff_data { @@ -72,65 +78,34 @@ struct buff_data { struct fmt_map { enum PixelFormat ff_fmt; - int32_t v4l2_fmt; + enum CodecID codec_id; + uint32_t v4l2_fmt; }; static struct fmt_map fmt_conversion_table[] = { - { - .ff_fmt = PIX_FMT_YUV420P, - .v4l2_fmt = V4L2_PIX_FMT_YUV420, - }, - { - .ff_fmt = PIX_FMT_YUV422P, - .v4l2_fmt = V4L2_PIX_FMT_YUV422P, - }, - { - .ff_fmt = PIX_FMT_YUYV422, - .v4l2_fmt = V4L2_PIX_FMT_YUYV, - }, - { - .ff_fmt = PIX_FMT_UYVY422, - .v4l2_fmt = V4L2_PIX_FMT_UYVY, - }, - { - .ff_fmt = PIX_FMT_YUV411P, - .v4l2_fmt = V4L2_PIX_FMT_YUV411P, - }, - { - .ff_fmt = PIX_FMT_YUV410P, - .v4l2_fmt = V4L2_PIX_FMT_YUV410, - }, - { - .ff_fmt = PIX_FMT_RGB555, - .v4l2_fmt = V4L2_PIX_FMT_RGB555, - }, - { - .ff_fmt = PIX_FMT_RGB565, - .v4l2_fmt = V4L2_PIX_FMT_RGB565, - }, - { - .ff_fmt = PIX_FMT_BGR24, - .v4l2_fmt = V4L2_PIX_FMT_BGR24, - }, - { - .ff_fmt = PIX_FMT_RGB24, - .v4l2_fmt = V4L2_PIX_FMT_RGB24, - }, - { - .ff_fmt = PIX_FMT_BGRA, - .v4l2_fmt = V4L2_PIX_FMT_BGR32, - }, - { - .ff_fmt = PIX_FMT_GRAY8, - .v4l2_fmt = V4L2_PIX_FMT_GREY, - }, + //ff_fmt codec_id v4l2_fmt + { PIX_FMT_YUV420P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420 }, + { PIX_FMT_YUV422P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV422P }, + { PIX_FMT_YUYV422, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUYV }, + { PIX_FMT_UYVY422, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_UYVY }, + { PIX_FMT_YUV411P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV411P }, + { PIX_FMT_YUV410P, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV410 }, + { PIX_FMT_RGB555, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555 }, + { PIX_FMT_RGB565, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565 }, + { PIX_FMT_BGR24, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR24 }, + { PIX_FMT_RGB24, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB24 }, + { PIX_FMT_BGRA, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR32 }, + { PIX_FMT_GRAY8, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_GREY }, + { PIX_FMT_NV12, CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 }, + { PIX_FMT_NONE, CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG }, + { PIX_FMT_NONE, CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG }, }; static int device_open(AVFormatContext *ctx, uint32_t *capabilities) { struct v4l2_capability cap; int fd; - int res; + int res, err; int flags = O_RDWR; if (ctx->flags & AVFMT_FLAG_NONBLOCK) { @@ -141,37 +116,36 @@ static int device_open(AVFormatContext *ctx, uint32_t *capabilities) av_log(ctx, AV_LOG_ERROR, "Cannot open video device %s : %s\n", ctx->filename, strerror(errno)); - return -1; + return AVERROR(errno); } res = ioctl(fd, VIDIOC_QUERYCAP, &cap); // ENOIOCTLCMD definition only availble on __KERNEL__ - if (res < 0 && errno == 515) - { + if (res < 0 && ((err = errno) == 515)) { av_log(ctx, AV_LOG_ERROR, "QUERYCAP not implemented, probably V4L device but not supporting V4L2\n"); close(fd); - return -1; + return AVERROR(515); } if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYCAP): %s\n", strerror(errno)); close(fd); - return -1; + return AVERROR(err); } if ((cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) == 0) { av_log(ctx, AV_LOG_ERROR, "Not a video capture device\n"); close(fd); - return -1; + return AVERROR(ENODEV); } *capabilities = cap.capabilities; return fd; } -static int device_init(AVFormatContext *ctx, int *width, int *height, int pix_fmt) +static int device_init(AVFormatContext *ctx, int *width, int *height, uint32_t pix_fmt) { struct video_data *s = ctx->priv_data; int fd = s->fd; @@ -215,12 +189,15 @@ static int first_field(int fd) return 1; } -static uint32_t fmt_ff2v4l(enum PixelFormat pix_fmt) +static uint32_t fmt_ff2v4l(enum PixelFormat pix_fmt, enum CodecID codec_id) { int i; for (i = 0; i < FF_ARRAY_ELEMS(fmt_conversion_table); i++) { - if (fmt_conversion_table[i].ff_fmt == pix_fmt) { + if ((codec_id == CODEC_ID_NONE || + fmt_conversion_table[i].codec_id == codec_id) && + (pix_fmt == PIX_FMT_NONE || + fmt_conversion_table[i].ff_fmt == pix_fmt)) { return fmt_conversion_table[i].v4l2_fmt; } } @@ -228,12 +205,13 @@ static uint32_t fmt_ff2v4l(enum PixelFormat pix_fmt) return 0; } -static enum PixelFormat fmt_v4l2ff(uint32_t pix_fmt) +static enum PixelFormat fmt_v4l2ff(uint32_t v4l2_fmt, enum CodecID codec_id) { int i; for (i = 0; i < FF_ARRAY_ELEMS(fmt_conversion_table); i++) { - if (fmt_conversion_table[i].v4l2_fmt == pix_fmt) { + if (fmt_conversion_table[i].v4l2_fmt == v4l2_fmt && + fmt_conversion_table[i].codec_id == codec_id) { return fmt_conversion_table[i].ff_fmt; } } @@ -241,6 +219,19 @@ static enum PixelFormat fmt_v4l2ff(uint32_t pix_fmt) return PIX_FMT_NONE; } +static enum CodecID fmt_v4l2codec(uint32_t v4l2_fmt) +{ + int i; + + for (i = 0; i < FF_ARRAY_ELEMS(fmt_conversion_table); i++) { + if (fmt_conversion_table[i].v4l2_fmt == v4l2_fmt) { + return fmt_conversion_table[i].codec_id; + } + } + + return CODEC_ID_NONE; +} + static int mmap_init(AVFormatContext *ctx) { struct video_data *s = ctx->priv_data; @@ -251,7 +242,7 @@ static int mmap_init(AVFormatContext *ctx) req.count = desired_video_buffers; req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_MMAP; - res = ioctl (s->fd, VIDIOC_REQBUFS, &req); + res = ioctl(s->fd, VIDIOC_REQBUFS, &req); if (res < 0) { if (errno == EINVAL) { av_log(ctx, AV_LOG_ERROR, "Device does not support mmap\n"); @@ -259,27 +250,27 @@ static int mmap_init(AVFormatContext *ctx) av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_REQBUFS)\n"); } - return -1; + return AVERROR(errno); } if (req.count < 2) { av_log(ctx, AV_LOG_ERROR, "Insufficient buffer memory\n"); - return -1; + 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 -1; + 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 -1; + return AVERROR(ENOMEM); } for (i = 0; i < req.count; i++) { @@ -289,15 +280,15 @@ static int mmap_init(AVFormatContext *ctx) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_MMAP; buf.index = i; - res = ioctl (s->fd, VIDIOC_QUERYBUF, &buf); + res = ioctl(s->fd, VIDIOC_QUERYBUF, &buf); if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYBUF)\n"); - return -1; + return AVERROR(errno); } s->buf_len[i] = buf.length; - if (s->buf_len[i] < s->frame_size) { + if (s->frame_size > 0 && s->buf_len[i] < s->frame_size) { av_log(ctx, AV_LOG_ERROR, "Buffer len [%d] = %d != %d\n", i, s->buf_len[i], s->frame_size); return -1; @@ -307,7 +298,7 @@ static int mmap_init(AVFormatContext *ctx) if (s->buf_start[i] == MAP_FAILED) { av_log(ctx, AV_LOG_ERROR, "mmap: %s\n", strerror(errno)); - return -1; + return AVERROR(errno); } } @@ -336,9 +327,9 @@ static void mmap_release_buffer(AVPacket *pkt) fd = buf_descriptor->fd; av_free(buf_descriptor); - res = ioctl (fd, VIDIOC_QBUF, &buf); + res = ioctl(fd, VIDIOC_QBUF, &buf); if (res < 0) { - av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF)\n"); + av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n", strerror(errno)); } pkt->data = NULL; pkt->size = 0; @@ -365,13 +356,13 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) } av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_DQBUF): %s\n", strerror(errno)); - return -1; + return AVERROR(errno); } assert (buf.index < s->buffers); - if (buf.bytesused != s->frame_size) { + 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", buf.bytesused, s->frame_size); - return -1; + return AVERROR_INVALIDDATA; } /* Image is at s->buff_start[buf.index] */ @@ -385,9 +376,9 @@ 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 = ioctl(s->fd, VIDIOC_QBUF, &buf); - return -1; + return AVERROR(ENOMEM); } buf_descriptor->fd = s->fd; buf_descriptor->index = buf.index; @@ -415,20 +406,20 @@ static int mmap_start(AVFormatContext *ctx) buf.memory = V4L2_MEMORY_MMAP; buf.index = i; - res = ioctl (s->fd, VIDIOC_QBUF, &buf); + res = ioctl(s->fd, VIDIOC_QBUF, &buf); if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n", strerror(errno)); - return -1; + return AVERROR(errno); } } type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - res = ioctl (s->fd, VIDIOC_STREAMON, &type); + res = ioctl(s->fd, VIDIOC_STREAMON, &type); if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_STREAMON): %s\n", strerror(errno)); - return -1; + return AVERROR(errno); } return 0; @@ -451,79 +442,144 @@ static void mmap_close(struct video_data *s) av_free(s->buf_len); } -static int v4l2_set_parameters( AVFormatContext *s1, AVFormatParameters *ap ) +static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) { struct video_data *s = s1->priv_data; struct v4l2_input input; struct v4l2_standard standard; + struct v4l2_streamparm streamparm = { 0 }; + struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe; int i; - if(ap->channel>=0) { - /* set tv video input */ - memset (&input, 0, sizeof (input)); - input.index = ap->channel; - if(ioctl (s->fd, VIDIOC_ENUMINPUT, &input) < 0) { - av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n"); - return AVERROR(EIO); - } + streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n", - ap->channel, input.name); - if(ioctl (s->fd, VIDIOC_S_INPUT, &input.index) < 0 ) { - av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set input(%d) failed\n", - ap->channel); - return AVERROR(EIO); - } +#if FF_API_FORMAT_PARAMETERS + if (ap->channel > 0) + s->channel = ap->channel; +#endif + + /* set tv video input */ + memset (&input, 0, sizeof (input)); + input.index = s->channel; + if (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) { + av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set input(%d) failed\n", + s->channel); + return AVERROR(EIO); } - if(ap->standard) { +#if FF_API_FORMAT_PARAMETERS + if (ap->standard) { + av_freep(&s->standard); + s->standard = av_strdup(ap->standard); + } +#endif + + if (s->standard) { av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n", - ap->standard ); + s->standard); /* set tv standard */ memset (&standard, 0, sizeof (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", - ap->standard); + s->standard); return AVERROR(EIO); } - if(!strcasecmp(standard.name, ap->standard)) { + if (!strcasecmp(standard.name, s->standard)) { break; } } av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s, id: %"PRIu64"\n", - ap->standard, (uint64_t)standard.id); + s->standard, (uint64_t)standard.id); if (ioctl(s->fd, VIDIOC_S_STD, &standard.id) < 0) { av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n", - ap->standard); + s->standard); return AVERROR(EIO); } } + av_freep(&s->standard); + + if (ap->time_base.num && ap->time_base.den) { + av_log(s1, AV_LOG_DEBUG, "Setting time per frame to %d/%d\n", + ap->time_base.num, ap->time_base.den); + tpf->numerator = ap->time_base.num; + tpf->denominator = ap->time_base.den; + if (ioctl(s->fd, VIDIOC_S_PARM, &streamparm) != 0) { + av_log(s1, AV_LOG_ERROR, + "ioctl set time per frame(%d/%d) failed\n", + ap->time_base.num, ap->time_base.den); + return AVERROR(EIO); + } + + if (ap->time_base.den != tpf->denominator || + ap->time_base.num != tpf->numerator) { + av_log(s1, AV_LOG_INFO, + "The driver changed the time per frame from %d/%d to %d/%d\n", + ap->time_base.num, ap->time_base.den, + tpf->numerator, tpf->denominator); + } + } else { + /* if timebase value is not set in ap, read the timebase value from the driver */ + if (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); + } + } + ap->time_base.num = tpf->numerator; + ap->time_base.den = tpf->denominator; return 0; } +static uint32_t device_try_init(AVFormatContext *s1, + const AVFormatParameters *ap, + int *width, + int *height, + enum CodecID *codec_id) +{ + uint32_t desired_format = fmt_ff2v4l(ap->pix_fmt, s1->video_codec_id); + + if (desired_format == 0 || + device_init(s1, width, height, desired_format) < 0) { + int i; + + desired_format = 0; + for (i = 0; ivideo_codec_id == CODEC_ID_NONE || + fmt_conversion_table[i].codec_id == s1->video_codec_id) { + desired_format = fmt_conversion_table[i].v4l2_fmt; + if (device_init(s1, width, height, desired_format) >= 0) { + break; + } + desired_format = 0; + } + } + } + if (desired_format != 0) { + *codec_id = fmt_v4l2codec(desired_format); + assert(*codec_id != CODEC_ID_NONE); + } + + return desired_format; +} + static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) { struct video_data *s = s1->priv_data; AVStream *st; - int width, height; int res; uint32_t desired_format, capabilities; - - if (ap->width <= 0 || ap->height <= 0) { - av_log(s1, AV_LOG_ERROR, "Wrong size (%dx%d)\n", ap->width, ap->height); - return -1; - } - - width = ap->width; - height = ap->height; - - if(avcodec_check_dimensions(s1, ap->width, ap->height) < 0) - return -1; + enum CodecID codec_id; st = av_new_stream(s1, 0); if (!st) { @@ -531,47 +587,47 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) } av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ - s->width = width; - s->height = height; + s->width = ap->width; + s->height = ap->height; capabilities = 0; s->fd = device_open(s1, &capabilities); if (s->fd < 0) { return AVERROR(EIO); } - av_log(s1, AV_LOG_INFO, "[%d]Capabilities: %x\n", s->fd, capabilities); + av_log(s1, AV_LOG_VERBOSE, "[%d]Capabilities: %x\n", s->fd, capabilities); - desired_format = fmt_ff2v4l(ap->pix_fmt); - if (desired_format == 0 || (device_init(s1, &width, &height, desired_format) < 0)) { - int i, done; + if (!s->width && !s->height) { + struct v4l2_format fmt; - done = 0; i = 0; - while (!done) { - desired_format = fmt_conversion_table[i].v4l2_fmt; - if (device_init(s1, &width, &height, desired_format) < 0) { - desired_format = 0; - i++; - } else { - done = 1; - } - if (i == FF_ARRAY_ELEMS(fmt_conversion_table)) { - done = 1; - } + 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) { + av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_FMT): %s\n", strerror(errno)); + return AVERROR(errno); } + s->width = fmt.fmt.pix.width; + s->height = fmt.fmt.pix.height; + av_log(s1, AV_LOG_VERBOSE, "Setting frame size to %dx%d\n", s->width, s->height); } + + desired_format = device_try_init(s1, ap, &s->width, &s->height, &codec_id); if (desired_format == 0) { - av_log(s1, AV_LOG_ERROR, "Cannot find a proper format.\n"); + av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for " + "codec_id %d, pix_fmt %d.\n", s1->video_codec_id, ap->pix_fmt); close(s->fd); return AVERROR(EIO); } + if (av_image_check_size(s->width, s->height, 0, s1) < 0) + return AVERROR(EINVAL); s->frame_format = desired_format; - if( v4l2_set_parameters( s1, ap ) < 0 ) + if (v4l2_set_parameters(s1, ap) < 0) return AVERROR(EIO); - st->codec->pix_fmt = fmt_v4l2ff(desired_format); - s->frame_size = avpicture_get_size(st->codec->pix_fmt, width, height); + st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id); + s->frame_size = avpicture_get_size(st->codec->pix_fmt, s->width, s->height); if (capabilities & V4L2_CAP_STREAMING) { s->io_method = io_mmap; res = mmap_init(s1); @@ -589,10 +645,10 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) } s->top_field_first = first_field(s->fd); - st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_RAWVIDEO; - st->codec->width = width; - st->codec->height = height; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = codec_id; + st->codec->width = s->width; + st->codec->height = s->height; st->codec->time_base.den = ap->time_base.den; st->codec->time_base.num = ap->time_base.num; st->codec->bit_rate = s->frame_size * 1/av_q2d(st->codec->time_base) * 8; @@ -640,7 +696,20 @@ static int v4l2_read_close(AVFormatContext *s1) return 0; } -AVInputFormat v4l2_demuxer = { +static const AVOption options[] = { + { "standard", "", offsetof(struct video_data, standard), FF_OPT_TYPE_STRING, {.str = "NTSC" }, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, + { "channel", "", offsetof(struct video_data, channel), FF_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, + { NULL }, +}; + +static const AVClass v4l2_class = { + .class_name = "V4L2 indev", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVInputFormat ff_v4l2_demuxer = { "video4linux2", NULL_IF_CONFIG_SMALL("Video4Linux2 device grab"), sizeof(struct video_data), @@ -649,4 +718,5 @@ AVInputFormat v4l2_demuxer = { v4l2_read_packet, v4l2_read_close, .flags = AVFMT_NOFILE, + .priv_class = &v4l2_class, };