virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Cosmetics: apply minor style fixes.

Browse Source 
Originally committed as revision 25106 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-09-11 16:44:10 +00:00
parent 0c41d554e2
commit 680861ca73
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavdevice/v4l2.c
View File

@ -296,7 +296,7 @@ static int mmap_init(AVFormatContext *ctx)
req.count = desired_video_buffers; req.count = desired_video_buffers;
req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
req.memory = V4L2_MEMORY_MMAP; req.memory = V4L2_MEMORY_MMAP;
res = ioctl (s->fd, VIDIOC_REQBUFS, &req); res = ioctl(s->fd, VIDIOC_REQBUFS, &req);
if (res < 0) { if (res < 0) {
if (errno == EINVAL) { if (errno == EINVAL) {
av_log(ctx, AV_LOG_ERROR, "Device does not support mmap\n"); av_log(ctx, AV_LOG_ERROR, "Device does not support mmap\n");
@ -334,7 +334,7 @@ static int mmap_init(AVFormatContext *ctx)
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP; buf.memory = V4L2_MEMORY_MMAP;
buf.index = i; buf.index = i;
res = ioctl (s->fd, VIDIOC_QUERYBUF, &buf); res = ioctl(s->fd, VIDIOC_QUERYBUF, &buf);
if (res < 0) { if (res < 0) {
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYBUF)\n"); av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QUERYBUF)\n");
@ -381,7 +381,7 @@ static void mmap_release_buffer(AVPacket *pkt)
fd = buf_descriptor->fd; fd = buf_descriptor->fd;
av_free(buf_descriptor); av_free(buf_descriptor);
res = ioctl (fd, VIDIOC_QBUF, &buf); res = ioctl(fd, VIDIOC_QBUF, &buf);
if (res < 0) { if (res < 0) {
av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF)\n"); av_log(NULL, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF)\n");
} }
@ -430,7 +430,7 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
* allocate a buffer for memcopying into it * allocate a buffer for memcopying into it
*/ */
av_log(ctx, AV_LOG_ERROR, "Failed to allocate a buffer descriptor\n"); 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 AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -460,7 +460,7 @@ static int mmap_start(AVFormatContext *ctx)
buf.memory = V4L2_MEMORY_MMAP; buf.memory = V4L2_MEMORY_MMAP;
buf.index = i; buf.index = i;
res = ioctl (s->fd, VIDIOC_QBUF, &buf); res = ioctl(s->fd, VIDIOC_QBUF, &buf);
if (res < 0) { if (res < 0) {
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n", strerror(errno)); av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_QBUF): %s\n", strerror(errno));
@ -469,7 +469,7 @@ static int mmap_start(AVFormatContext *ctx)
} }
type = V4L2_BUF_TYPE_VIDEO_CAPTURE; type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
res = ioctl (s->fd, VIDIOC_STREAMON, &type); res = ioctl(s->fd, VIDIOC_STREAMON, &type);
if (res < 0) { if (res < 0) {
av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_STREAMON): %s\n", strerror(errno)); av_log(ctx, AV_LOG_ERROR, "ioctl(VIDIOC_STREAMON): %s\n", strerror(errno));
@ -496,34 +496,34 @@ static void mmap_close(struct video_data *s)
av_free(s->buf_len); 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 video_data *s = s1->priv_data;
struct v4l2_input input; struct v4l2_input input;
struct v4l2_standard standard; struct v4l2_standard standard;
int i; int i;
if(ap->channel>=0) { if (ap->channel>=0) {
/* set tv video input */ /* set tv video input */
memset (&input, 0, sizeof (input)); memset (&input, 0, sizeof (input));
input.index = ap->channel; input.index = ap->channel;
if(ioctl (s->fd, VIDIOC_ENUMINPUT, &input) < 0) { if (ioctl(s->fd, VIDIOC_ENUMINPUT, &input) < 0) {
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n"); av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n");
return AVERROR(EIO); return AVERROR(EIO);
} }
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n", av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n",
ap->channel, input.name); ap->channel, input.name);
if(ioctl (s->fd, VIDIOC_S_INPUT, &input.index) < 0 ) { 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", av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set input(%d) failed\n",
ap->channel); ap->channel);
return AVERROR(EIO); return AVERROR(EIO);
} }
} }
if(ap->standard) { if (ap->standard) {
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n", av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n",
ap->standard ); ap->standard);
/* set tv standard */ /* set tv standard */
memset (&standard, 0, sizeof (standard)); memset (&standard, 0, sizeof (standard));
for(i=0;;i++) { for(i=0;;i++) {
@ -534,7 +534,7 @@ static int v4l2_set_parameters( AVFormatContext *s1, AVFormatParameters *ap )
return AVERROR(EIO); return AVERROR(EIO);
} }
if(!strcasecmp(standard.name, ap->standard)) { if (!strcasecmp(standard.name, ap->standard)) {
break; break;
} }
} }
@ -633,7 +633,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return AVERROR(EINVAL); return AVERROR(EINVAL);
s->frame_format = desired_format; s->frame_format = desired_format;
if( v4l2_set_parameters( s1, ap ) < 0 ) if (v4l2_set_parameters(s1, ap) < 0)
return AVERROR(EIO); return AVERROR(EIO);
st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id); st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);