#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"
{ 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 },
+#ifdef V4L2_PIX_FMT_H264
+ { AV_PIX_FMT_NONE, AV_CODEC_ID_H264, V4L2_PIX_FMT_H264 },
+#endif
};
static int device_open(AVFormatContext *ctx)
int fd;
int res, err;
int flags = O_RDWR;
+ char errbuf[128];
if (ctx->flags & AVFMT_FLAG_NONBLOCK) {
flags |= O_NONBLOCK;
}
- fd = open(ctx->filename, flags, 0);
+ fd = avpriv_open(ctx->filename, flags);
if (fd < 0) {
- err = errno;
+ err = AVERROR(errno);
+ av_strerror(err, errbuf, sizeof(errbuf));
av_log(ctx, AV_LOG_ERROR, "Cannot open video device %s : %s\n",
- ctx->filename, strerror(err));
+ ctx->filename, errbuf);
- return AVERROR(err);
+ return err;
}
res = ioctl(fd, VIDIOC_QUERYCAP, &cap);
if (res < 0) {
- err = errno;
+ err = AVERROR(errno);
+ av_strerror(err, errbuf, sizeof(errbuf));
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYCAP): %s\n",
- strerror(err));
+ errbuf);
goto fail;
}
if (!(cap.capabilities & V4L2_CAP_VIDEO_CAPTURE)) {
av_log(ctx, AV_LOG_ERROR, "Not a video capture device.\n");
- err = ENODEV;
+ err = AVERROR(ENODEV);
goto fail;
}
if (!(cap.capabilities & V4L2_CAP_STREAMING)) {
av_log(ctx, AV_LOG_ERROR,
"The device does not support the streaming I/O method.\n");
- err = ENOSYS;
+ err = AVERROR(ENOSYS);
goto fail;
}
fail:
close(fd);
- return AVERROR(err);
+ return err;
}
static int device_init(AVFormatContext *ctx, int *width, int *height,
vfd.description);
} else if (vfd.flags & V4L2_FMT_FLAG_COMPRESSED &&
type & V4L_COMPFORMATS) {
- AVCodec *codec = avcodec_find_encoder(codec_id);
+ const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id);
av_log(ctx, AV_LOG_INFO, "C : %9s : %20s :",
- codec ? codec->name : "Unsupported",
+ desc ? desc->name : "Unsupported",
vfd.description);
} else {
continue;
res = ioctl(s->fd, VIDIOC_REQBUFS, &req);
if (res < 0) {
- if (errno == EINVAL) {
+ res = AVERROR(errno);
+ if (res == AVERROR(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);
+ return res;
}
if (req.count < 2) {
}
s->buffers = req.count;
s->buf_start = av_malloc(sizeof(void *) * s->buffers);
- if (s->buf_start == NULL) {
+ if (!s->buf_start) {
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) {
+ if (!s->buf_len) {
av_log(ctx, AV_LOG_ERROR, "Cannot allocate buffer sizes\n");
av_free(s->buf_start);
res = ioctl(s->fd, VIDIOC_QUERYBUF, &buf);
if (res < 0) {
+ res = AVERROR(errno);
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYBUF)\n");
- return AVERROR(errno);
+ return res;
}
s->buf_len[i] = buf.length;
s->fd, buf.m.offset);
if (s->buf_start[i] == MAP_FAILED) {
- av_log(ctx, AV_LOG_ERROR, "mmap: %s\n", strerror(errno));
+ char errbuf[128];
+ res = AVERROR(errno);
+ av_strerror(res, errbuf, sizeof(errbuf));
+ av_log(ctx, AV_LOG_ERROR, "mmap: %s\n", errbuf);
- return AVERROR(errno);
+ return res;
}
}
return 0;
}
-#if FF_API_DESTRUCT_PACKET
-static void dummy_release_buffer(AVPacket *pkt)
-{
- av_assert0(0);
-}
-#endif
-
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;
+ char errbuf[128];
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP;
av_free(buf_descriptor);
res = ioctl(fd, VIDIOC_QBUF, &buf);
- if (res < 0)
+ if (res < 0) {
+ av_strerror(AVERROR(errno), errbuf, sizeof(errbuf));
av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n",
- strerror(errno));
+ errbuf);
+ }
avpriv_atomic_int_add_and_fetch(&s->buffers_queued, 1);
}
/* FIXME: Some special treatment might be needed in case of loss of signal... */
while ((res = ioctl(s->fd, VIDIOC_DQBUF, &buf)) < 0 && (errno == EINTR));
if (res < 0) {
+ char errbuf[128];
if (errno == EAGAIN) {
pkt->size = 0;
return AVERROR(EAGAIN);
}
+ res = AVERROR(errno);
+ av_strerror(res, errbuf, sizeof(errbuf));
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_DQBUF): %s\n",
- strerror(errno));
+ errbuf);
- return AVERROR(errno);
+ return res;
}
if (buf.index >= s->buffers) {
res = ioctl(s->fd, VIDIOC_QBUF, &buf);
if (res < 0) {
+ res = AVERROR(errno);
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF)\n");
- av_free_packet(pkt);
- return AVERROR(errno);
+ av_packet_unref(pkt);
+ return res;
}
avpriv_atomic_int_add_and_fetch(&s->buffers_queued, 1);
} else {
pkt->data = s->buf_start[buf.index];
pkt->size = buf.bytesused;
-#if FF_API_DESTRUCT_PACKET
- pkt->destruct = dummy_release_buffer;
-#endif
buf_descriptor = av_malloc(sizeof(struct buff_data));
- if (buf_descriptor == NULL) {
+ if (!buf_descriptor) {
/* Something went wrong... Since av_malloc() failed, we cannot even
* allocate a buffer for memcpying into it
*/
{
struct video_data *s = ctx->priv_data;
enum v4l2_buf_type type;
- int i, res;
+ int i, res, err;
+ char errbuf[128];
for (i = 0; i < s->buffers; i++) {
struct v4l2_buffer buf = {
res = ioctl(s->fd, VIDIOC_QBUF, &buf);
if (res < 0) {
+ err = AVERROR(errno);
+ av_strerror(err, errbuf, sizeof(errbuf));
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n",
- strerror(errno));
+ errbuf);
- return AVERROR(errno);
+ return err;
}
}
s->buffers_queued = s->buffers;
type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
res = ioctl(s->fd, VIDIOC_STREAMON, &type);
if (res < 0) {
+ err = AVERROR(errno);
+ av_strerror(err, errbuf, sizeof(errbuf));
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_STREAMON): %s\n",
- strerror(errno));
+ errbuf);
- return AVERROR(errno);
+ return err;
}
return 0;
}
} else {
if (ioctl(s->fd, VIDIOC_G_PARM, &streamparm) != 0) {
+ char errbuf[128];
+ ret = AVERROR(errno);
+ av_strerror(ret, errbuf, sizeof(errbuf));
av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_PARM): %s\n",
- strerror(errno));
- return AVERROR(errno);
+ errbuf);
+ return ret;
}
}
s1->streams[0]->avg_frame_rate.num = tpf->denominator;
if (s->pixel_format) {
AVCodec *codec = avcodec_find_decoder_by_name(s->pixel_format);
- if (codec)
+ if (codec) {
s1->video_codec_id = codec->id;
+ st->need_parsing = AVSTREAM_PARSE_HEADERS;
+ }
pix_fmt = av_get_pix_fmt(s->pixel_format);
"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) {
+ char errbuf[128];
+ res = AVERROR(errno);
+ av_strerror(res, errbuf, sizeof(errbuf));
av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_FMT): %s\n",
- strerror(errno));
- return AVERROR(errno);
+ errbuf);
+ return res;
}
s->width = fmt.fmt.pix.width;
return res;
st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);
- s->frame_size =
- avpicture_get_size(st->codec->pix_fmt, s->width, s->height);
+ s->frame_size = av_image_get_buffer_size(st->codec->pix_fmt,
+ s->width, s->height, 1);
if ((res = mmap_init(s1)) ||
(res = mmap_start(s1)) < 0) {
static int v4l2_read_packet(AVFormatContext *s1, AVPacket *pkt)
{
struct video_data *s = s1->priv_data;
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
AVFrame *frame = s1->streams[0]->codec->coded_frame;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
int res;
av_init_packet(pkt);
return res;
}
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
if (frame && s->interlaced) {
frame->interlaced_frame = 1;
frame->top_field_first = s->top_field_first;
}
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
return pkt->size;
}
projects / ffmpeg / blobdiff