X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavdevice%2Fv4l2.c;h=adb289d14085267bbbc6e961368ed019d233385f;hb=d6a27f885b5d4cba7a82e50af423c741d2f37c3e;hp=9c5da39e6a9640da1671130e50088f0570c6474f;hpb=b8c310cb0a071d998b90e9b166ed29062524de8b;p=ffmpeg diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 9c5da39e6a9..adb289d1408 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -7,7 +7,7 @@ * (http://v4l2spec.bytesex.org/v4l2spec/capture.c) * * Thanks to Michael Niedermayer for providing the mapping between - * V4L2_PIX_FMT_* and PIX_FMT_* + * V4L2_PIX_FMT_* and AV_PIX_FMT_* * * * This file is part of Libav. @@ -36,18 +36,22 @@ #include #include #include +#include #if HAVE_SYS_VIDEOIO_H #include #else #include #endif -#include +#include "libavutil/atomic.h" +#include "libavutil/avassert.h" #include "libavutil/imgutils.h" +#include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" #include "libavutil/avstring.h" +#include "libavutil/mathematics.h" static const int desired_video_buffers = 256; @@ -61,10 +65,12 @@ struct video_data { int frame_format; /* V4L2_PIX_FMT_* */ int width, height; int frame_size; + int timeout; int interlaced; int top_field_first; int buffers; + volatile int buffers_queued; void **buf_start; unsigned int *buf_len; char *standard; @@ -77,33 +83,34 @@ struct video_data { }; struct buff_data { + struct video_data *s; int index; int fd; }; struct fmt_map { - enum PixelFormat ff_fmt; - enum CodecID codec_id; + enum AVPixelFormat ff_fmt; + enum AVCodecID codec_id; uint32_t v4l2_fmt; }; static struct fmt_map fmt_conversion_table[] = { //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 }, + { AV_PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420 }, + { AV_PIX_FMT_YUV422P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV422P }, + { AV_PIX_FMT_YUYV422, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUYV }, + { AV_PIX_FMT_UYVY422, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_UYVY }, + { AV_PIX_FMT_YUV411P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV411P }, + { AV_PIX_FMT_YUV410P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV410 }, + { AV_PIX_FMT_RGB555, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB555 }, + { AV_PIX_FMT_RGB565, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB565 }, + { AV_PIX_FMT_BGR24, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR24 }, + { AV_PIX_FMT_RGB24, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_RGB24 }, + { AV_PIX_FMT_BGRA, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_BGR32 }, + { AV_PIX_FMT_GRAY8, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_GREY }, + { AV_PIX_FMT_NV12, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 }, + { AV_PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG }, + { AV_PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG }, }; static int device_open(AVFormatContext *ctx) @@ -117,7 +124,7 @@ static int device_open(AVFormatContext *ctx) flags |= O_NONBLOCK; } - fd = open(ctx->filename, flags, 0); + fd = avpriv_open(ctx->filename, flags); if (fd < 0) { err = errno; @@ -166,14 +173,11 @@ static int device_init(AVFormatContext *ctx, int *width, int *height, { struct video_data *s = ctx->priv_data; int fd = s->fd; - struct v4l2_format fmt; + struct v4l2_format fmt = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE }; struct v4l2_pix_format *pix = &fmt.fmt.pix; int res; - memset(&fmt, 0, sizeof(struct v4l2_format)); - - fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; pix->width = *width; pix->height = *height; pix->pixelformat = pix_fmt; @@ -221,14 +225,14 @@ static int first_field(int fd) return 1; } -static uint32_t fmt_ff2v4l(enum PixelFormat pix_fmt, enum CodecID codec_id) +static uint32_t fmt_ff2v4l(enum AVPixelFormat pix_fmt, enum AVCodecID codec_id) { int i; for (i = 0; i < FF_ARRAY_ELEMS(fmt_conversion_table); i++) { - if ((codec_id == CODEC_ID_NONE || + if ((codec_id == AV_CODEC_ID_NONE || fmt_conversion_table[i].codec_id == codec_id) && - (pix_fmt == PIX_FMT_NONE || + (pix_fmt == AV_PIX_FMT_NONE || fmt_conversion_table[i].ff_fmt == pix_fmt)) { return fmt_conversion_table[i].v4l2_fmt; } @@ -237,7 +241,7 @@ static uint32_t fmt_ff2v4l(enum PixelFormat pix_fmt, enum CodecID codec_id) return 0; } -static enum PixelFormat fmt_v4l2ff(uint32_t v4l2_fmt, enum CodecID codec_id) +static enum AVPixelFormat fmt_v4l2ff(uint32_t v4l2_fmt, enum AVCodecID codec_id) { int i; @@ -248,10 +252,10 @@ static enum PixelFormat fmt_v4l2ff(uint32_t v4l2_fmt, enum CodecID codec_id) } } - return PIX_FMT_NONE; + return AV_PIX_FMT_NONE; } -static enum CodecID fmt_v4l2codec(uint32_t v4l2_fmt) +static enum AVCodecID fmt_v4l2codec(uint32_t v4l2_fmt) { int i; @@ -261,7 +265,7 @@ static enum CodecID fmt_v4l2codec(uint32_t v4l2_fmt) } } - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } #if HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE @@ -295,8 +299,8 @@ static void list_formats(AVFormatContext *ctx, int fd, int type) struct v4l2_fmtdesc vfd = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE }; while(!ioctl(fd, VIDIOC_ENUM_FMT, &vfd)) { - enum CodecID codec_id = fmt_v4l2codec(vfd.pixelformat); - enum PixelFormat pix_fmt = fmt_v4l2ff(vfd.pixelformat, codec_id); + enum AVCodecID codec_id = fmt_v4l2codec(vfd.pixelformat); + enum AVPixelFormat pix_fmt = fmt_v4l2ff(vfd.pixelformat, codec_id); vfd.index++; @@ -331,14 +335,14 @@ static void list_formats(AVFormatContext *ctx, int fd, int type) static int mmap_init(AVFormatContext *ctx) { - struct video_data *s = ctx->priv_data; - struct v4l2_requestbuffers req; int i, res; + struct video_data *s = ctx->priv_data; + struct v4l2_requestbuffers req = { + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, + .count = desired_video_buffers, + .memory = V4L2_MEMORY_MMAP + }; - memset(&req, 0, sizeof(struct v4l2_requestbuffers)); - req.count = desired_video_buffers; - req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - req.memory = V4L2_MEMORY_MMAP; res = ioctl(s->fd, VIDIOC_REQBUFS, &req); if (res < 0) { if (errno == EINVAL) { @@ -371,12 +375,12 @@ static int mmap_init(AVFormatContext *ctx) } for (i = 0; i < req.count; i++) { - struct v4l2_buffer buf; + struct v4l2_buffer buf = { + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, + .index = i, + .memory = V4L2_MEMORY_MMAP + }; - memset(&buf, 0, sizeof(struct v4l2_buffer)); - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.memory = V4L2_MEMORY_MMAP; - buf.index = i; res = ioctl(s->fd, VIDIOC_QUERYBUF, &buf); if (res < 0) { av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYBUF)\n"); @@ -406,16 +410,20 @@ static int mmap_init(AVFormatContext *ctx) return 0; } -static void mmap_release_buffer(AVPacket *pkt) +#if FF_API_DESTRUCT_PACKET +static void dummy_release_buffer(AVPacket *pkt) { - struct v4l2_buffer buf; - int res, fd; - struct buff_data *buf_descriptor = pkt->priv; + av_assert0(0); +} +#endif - if (pkt->data == NULL) - return; +static void mmap_release_buffer(void *opaque, uint8_t *data) +{ + struct v4l2_buffer buf = { 0 }; + int res, fd; + struct buff_data *buf_descriptor = opaque; + struct video_data *s = buf_descriptor->s; - memset(&buf, 0, sizeof(struct v4l2_buffer)); buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_MMAP; buf.index = buf_descriptor->index; @@ -426,21 +434,25 @@ static void mmap_release_buffer(AVPacket *pkt) if (res < 0) av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n", strerror(errno)); - - pkt->data = NULL; - pkt->size = 0; + avpriv_atomic_int_add_and_fetch(&s->buffers_queued, 1); } static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) { struct video_data *s = ctx->priv_data; - struct v4l2_buffer buf; - struct buff_data *buf_descriptor; + struct v4l2_buffer buf = { + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, + .memory = V4L2_MEMORY_MMAP + }; + struct pollfd p = { .fd = s->fd, .events = POLLIN }; int res; - memset(&buf, 0, sizeof(struct v4l2_buffer)); - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.memory = V4L2_MEMORY_MMAP; + 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)); @@ -455,7 +467,15 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) return AVERROR(errno); } - assert (buf.index < s->buffers); + + if (buf.index >= s->buffers) { + av_log(ctx, AV_LOG_ERROR, "Invalid buffer index received.\n"); + return AVERROR(EINVAL); + } + avpriv_atomic_int_add_and_fetch(&s->buffers_queued, -1); + // always keep at least one buffer queued + av_assert0(avpriv_atomic_int_get(&s->buffers_queued) >= 1); + 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", @@ -465,23 +485,55 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) } /* Image is at s->buff_start[buf.index] */ - pkt->data= s->buf_start[buf.index]; - pkt->size = buf.bytesused; - pkt->pts = buf.timestamp.tv_sec * INT64_C(1000000) + buf.timestamp.tv_usec; - pkt->destruct = mmap_release_buffer; - buf_descriptor = av_malloc(sizeof(struct buff_data)); - if (buf_descriptor == NULL) { - /* Something went wrong... Since av_malloc() failed, we cannot even - * allocate a buffer for memcopying into it - */ - av_log(ctx, AV_LOG_ERROR, "Failed to allocate a buffer descriptor\n"); + if (avpriv_atomic_int_get(&s->buffers_queued) == FFMAX(s->buffers / 8, 1)) { + /* when we start getting low on queued buffers, fall back on copying data */ + res = av_new_packet(pkt, buf.bytesused); + if (res < 0) { + av_log(ctx, AV_LOG_ERROR, "Error allocating a packet.\n"); + return res; + } + memcpy(pkt->data, s->buf_start[buf.index], buf.bytesused); + res = ioctl(s->fd, VIDIOC_QBUF, &buf); + if (res < 0) { + av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF)\n"); + av_free_packet(pkt); + return AVERROR(errno); + } + avpriv_atomic_int_add_and_fetch(&s->buffers_queued, 1); + } else { + struct buff_data *buf_descriptor; + + pkt->data = s->buf_start[buf.index]; + pkt->size = buf.bytesused; +#if FF_API_DESTRUCT_PACKET +FF_DISABLE_DEPRECATION_WARNINGS + pkt->destruct = dummy_release_buffer; +FF_ENABLE_DEPRECATION_WARNINGS +#endif - return AVERROR(ENOMEM); + buf_descriptor = av_malloc(sizeof(struct buff_data)); + if (buf_descriptor == NULL) { + /* Something went wrong... Since av_malloc() failed, we cannot even + * allocate a buffer for memcpying into it + */ + av_log(ctx, AV_LOG_ERROR, "Failed to allocate a buffer descriptor\n"); + res = ioctl(s->fd, VIDIOC_QBUF, &buf); + + return AVERROR(ENOMEM); + } + buf_descriptor->fd = s->fd; + buf_descriptor->index = buf.index; + buf_descriptor->s = s; + + pkt->buf = av_buffer_create(pkt->data, pkt->size, mmap_release_buffer, + buf_descriptor, 0); + if (!pkt->buf) { + av_freep(&buf_descriptor); + return AVERROR(ENOMEM); + } } - buf_descriptor->fd = s->fd; - buf_descriptor->index = buf.index; - pkt->priv = buf_descriptor; + pkt->pts = buf.timestamp.tv_sec * INT64_C(1000000) + buf.timestamp.tv_usec; return s->buf_len[buf.index]; } @@ -493,12 +545,11 @@ static int mmap_start(AVFormatContext *ctx) int i, res; for (i = 0; i < s->buffers; i++) { - struct v4l2_buffer buf; - - memset(&buf, 0, sizeof(struct v4l2_buffer)); - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.memory = V4L2_MEMORY_MMAP; - buf.index = i; + struct v4l2_buffer buf = { + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, + .index = i, + .memory = V4L2_MEMORY_MMAP + }; res = ioctl(s->fd, VIDIOC_QBUF, &buf); if (res < 0) { @@ -508,6 +559,7 @@ static int mmap_start(AVFormatContext *ctx) return AVERROR(errno); } } + s->buffers_queued = s->buffers; type = V4L2_BUF_TYPE_VIDEO_CAPTURE; res = ioctl(s->fd, VIDIOC_STREAMON, &type); @@ -538,15 +590,15 @@ 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) { struct video_data *s = s1->priv_data; - struct v4l2_input input; - struct v4l2_standard standard; + struct v4l2_input input = { 0 }; + struct v4l2_standard standard = { 0 }; struct v4l2_streamparm streamparm = { 0 }; struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe; + AVRational framerate_q = { 0 }; int i, ret; - AVRational framerate_q; streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; @@ -558,7 +610,6 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) } /* 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"); @@ -578,7 +629,6 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n", 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) { @@ -632,17 +682,21 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) return AVERROR(errno); } } - s1->streams[0]->codec->time_base.den = tpf->denominator; - s1->streams[0]->codec->time_base.num = tpf->numerator; + s1->streams[0]->avg_frame_rate.num = tpf->denominator; + s1->streams[0]->avg_frame_rate.den = tpf->numerator; + + s->timeout = 100 + + av_rescale_q(1, s1->streams[0]->avg_frame_rate, + (AVRational){1, 1000}); return 0; } static uint32_t device_try_init(AVFormatContext *s1, - enum PixelFormat pix_fmt, + enum AVPixelFormat pix_fmt, int *width, int *height, - enum CodecID *codec_id) + enum AVCodecID *codec_id) { uint32_t desired_format = fmt_ff2v4l(pix_fmt, s1->video_codec_id); @@ -652,7 +706,7 @@ static uint32_t device_try_init(AVFormatContext *s1, desired_format = 0; for (i = 0; ivideo_codec_id == CODEC_ID_NONE || + if (s1->video_codec_id == AV_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) { @@ -665,37 +719,32 @@ static uint32_t device_try_init(AVFormatContext *s1, if (desired_format != 0) { *codec_id = fmt_v4l2codec(desired_format); - assert(*codec_id != CODEC_ID_NONE); + assert(*codec_id != AV_CODEC_ID_NONE); } return desired_format; } -static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) +static int v4l2_read_header(AVFormatContext *s1) { struct video_data *s = s1->priv_data; AVStream *st; int res = 0; uint32_t desired_format; - enum CodecID codec_id; - enum PixelFormat pix_fmt = PIX_FMT_NONE; + enum AVCodecID codec_id; + enum AVPixelFormat pix_fmt = AV_PIX_FMT_NONE; st = avformat_new_stream(s1, NULL); - if (!st) { - res = AVERROR(ENOMEM); - goto out; - } + if (!st) + return AVERROR(ENOMEM); s->fd = device_open(s1); - if (s->fd < 0) { - res = s->fd; - goto out; - } + if (s->fd < 0) + return s->fd; if (s->list_format) { list_formats(s1, s->fd, s->list_format); - res = AVERROR_EXIT; - goto out; + return AVERROR_EXIT; } avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ @@ -704,7 +753,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) (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; + return res; } if (s->pixel_format) { @@ -715,12 +764,11 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) pix_fmt = av_get_pix_fmt(s->pixel_format); - if (pix_fmt == PIX_FMT_NONE && !codec) { + if (pix_fmt == AV_PIX_FMT_NONE && !codec) { av_log(s1, AV_LOG_ERROR, "No such input format: %s.\n", s->pixel_format); - res = AVERROR(EINVAL); - goto out; + return AVERROR(EINVAL); } } @@ -733,8 +781,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) if (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); - goto out; + return AVERROR(errno); } s->width = fmt.fmt.pix.width; @@ -750,17 +797,16 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) "codec_id %d, pix_fmt %d.\n", s1->video_codec_id, pix_fmt); close(s->fd); - res = AVERROR(EIO); - goto out; + return AVERROR(EIO); } if ((res = av_image_check_size(s->width, s->height, 0, s1) < 0)) - goto out; + return res; s->frame_format = desired_format; - if ((res = v4l2_set_parameters(s1, ap) < 0)) - goto out; + if ((res = v4l2_set_parameters(s1) < 0)) + return res; st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id); s->frame_size = @@ -769,22 +815,21 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) if ((res = mmap_init(s1)) || (res = mmap_start(s1)) < 0) { close(s->fd); - goto out; + return res; } s->top_field_first = first_field(s->fd); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = codec_id; - if (codec_id == CODEC_ID_RAWVIDEO) + if (codec_id == AV_CODEC_ID_RAWVIDEO) st->codec->codec_tag = avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt); 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; + st->codec->bit_rate = s->frame_size * av_q2d(st->avg_frame_rate) * 8; -out: - return res; + return 0; } static int v4l2_read_packet(AVFormatContext *s1, AVPacket *pkt) @@ -810,6 +855,10 @@ static int v4l2_read_close(AVFormatContext *s1) { struct video_data *s = s1->priv_data; + if (avpriv_atomic_int_get(&s->buffers_queued) != s->buffers) + av_log(s1, AV_LOG_WARNING, "Some buffers are still owned by the caller on " + "close.\n"); + mmap_close(s); close(s->fd); @@ -820,15 +869,15 @@ static int v4l2_read_close(AVFormatContext *s1) #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, {.dbl = 0 }, 0, INT_MAX, 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 }, { "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 }, - { "list_formats", "List available formats and exit", OFFSET(list_format), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, DEC, "list_formats" }, - { "all", "Show all available formats", OFFSET(list_format), AV_OPT_TYPE_CONST, {.dbl = V4L_ALLFORMATS }, 0, INT_MAX, DEC, "list_formats" }, - { "raw", "Show only non-compressed formats", OFFSET(list_format), AV_OPT_TYPE_CONST, {.dbl = V4L_RAWFORMATS }, 0, INT_MAX, DEC, "list_formats" }, - { "compressed", "Show only compressed formats", OFFSET(list_format), AV_OPT_TYPE_CONST, {.dbl = V4L_COMPFORMATS }, 0, INT_MAX, DEC, "list_formats" }, + { "list_formats", "List available formats and exit", OFFSET(list_format), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, DEC, "list_formats" }, + { "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" }, { NULL }, };