Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

v4l2: replace memset() with explicit struct initialization

Browse Source
pull/2/head
Stefano Sabatini 14 years ago
parent 50fee0fc8b
commit 7b017086d4
1 changed files with 8 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      libavdevice/v4l2.c

24
libavdevice/v4l2.c
Unescape View File

@ -153,10 +153,9 @@ static int device_init(AVFormatContext *ctx, int *width, int *height, uint32_t p
{ {
struct video_data *s = ctx->priv_data; struct video_data *s = ctx->priv_data;
int fd = s->fd; int fd = s->fd;
struct v4l2_format fmt; struct v4l2_format fmt = {0};
int res; int res;
memset(&fmt, 0, sizeof(struct v4l2_format));
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
fmt.fmt.pix.width = *width; fmt.fmt.pix.width = *width;
fmt.fmt.pix.height = *height; fmt.fmt.pix.height = *height;
@ -239,10 +238,9 @@ static enum CodecID fmt_v4l2codec(uint32_t v4l2_fmt)
static int mmap_init(AVFormatContext *ctx) static int mmap_init(AVFormatContext *ctx)
{ {
struct video_data *s = ctx->priv_data; struct video_data *s = ctx->priv_data;
struct v4l2_requestbuffers req; struct v4l2_requestbuffers req = {0};
int i, res; int i, res;
memset(&req, 0, sizeof(struct v4l2_requestbuffers));
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;
@ -274,9 +272,8 @@ static int mmap_init(AVFormatContext *ctx)
} }
for (i = 0; i < req.count; i++) { for (i = 0; i < req.count; i++) {
struct v4l2_buffer buf; struct v4l2_buffer buf = {0};
memset(&buf, 0, sizeof(struct v4l2_buffer));
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;
@ -310,7 +307,7 @@ static int read_init(AVFormatContext *ctx)
static void mmap_release_buffer(AVPacket *pkt) static void mmap_release_buffer(AVPacket *pkt)
{ {
struct v4l2_buffer buf; struct v4l2_buffer buf = {0};
int res, fd; int res, fd;
struct buff_data *buf_descriptor = pkt->priv; struct buff_data *buf_descriptor = pkt->priv;
@ -318,7 +315,6 @@ static void mmap_release_buffer(AVPacket *pkt)
return; return;
} }
memset(&buf, 0, sizeof(struct v4l2_buffer));
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 = buf_descriptor->index; buf.index = buf_descriptor->index;
@ -336,11 +332,10 @@ static void mmap_release_buffer(AVPacket *pkt)
static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
{ {
struct video_data *s = ctx->priv_data; struct video_data *s = ctx->priv_data;
struct v4l2_buffer buf; struct v4l2_buffer buf = {0};
struct buff_data *buf_descriptor; struct buff_data *buf_descriptor;
int res; int res;
memset(&buf, 0, sizeof(struct v4l2_buffer));
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP; buf.memory = V4L2_MEMORY_MMAP;
@ -395,9 +390,8 @@ static int mmap_start(AVFormatContext *ctx)
int i, res; int i, res;
for (i = 0; i < s->buffers; i++) { for (i = 0; i < s->buffers; i++) {
struct v4l2_buffer buf; struct v4l2_buffer buf = {0};
memset(&buf, 0, sizeof(struct v4l2_buffer));
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;
@ -439,8 +433,8 @@ static void mmap_close(struct video_data *s)
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 = {0};
struct v4l2_standard standard; struct v4l2_standard standard = {0};
struct v4l2_streamparm streamparm = { 0 }; struct v4l2_streamparm streamparm = { 0 };
struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe; struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe;
int i; int i;
@ -453,7 +447,6 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
#endif #endif
/* set tv video input */ /* set tv video input */
memset (&input, 0, sizeof (input));
input.index = s->channel; input.index = s->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");
@ -479,7 +472,6 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
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",
s->standard); s->standard);
/* set tv standard */ /* set tv standard */
memset (&standard, 0, sizeof (standard));
for(i=0;;i++) { for(i=0;;i++) {
standard.index = i; standard.index = i;
if (ioctl(s->fd, VIDIOC_ENUMSTD, &standard) < 0) { if (ioctl(s->fd, VIDIOC_ENUMSTD, &standard) < 0) {

Write Preview
Loading…
Cancel
Save