diff for duplicates of <53AD6558.9050403@xs4all.nl> diff --git a/a/1.txt b/N1/1.txt index ec3416a..0b61a83 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -174,7 +174,7 @@ s/field/fields/ > pixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M; > pixfmt->field = V4L2_FIELD_INTERLACED; > - pixfmt->priv = 0; -> if (id->type = CX18_ENC_STREAM_TYPE_YUV) { +> if (id->type == CX18_ENC_STREAM_TYPE_YUV) { > pixfmt->pixelformat = s->pixelformat; > pixfmt->sizeimage = s->vb_bytes_per_frame; > diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c @@ -214,7 +214,7 @@ s/field/fields/ > pixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M; > pixfmt->field = V4L2_FIELD_INTERLACED; > - pixfmt->priv = 0; -> if (id->type = IVTV_ENC_STREAM_TYPE_YUV) { +> if (id->type == IVTV_ENC_STREAM_TYPE_YUV) { > pixfmt->pixelformat = V4L2_PIX_FMT_HM12; > /* YUV size is (Y=(h*720) + UV=(h*(720/2))) */ > @@ -418,7 +417,6 @@ static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f @@ -222,7 +222,7 @@ s/field/fields/ > pixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M; > pixfmt->field = V4L2_FIELD_INTERLACED; > - pixfmt->priv = 0; -> if (id->type = IVTV_DEC_STREAM_TYPE_YUV) { +> if (id->type == IVTV_DEC_STREAM_TYPE_YUV) { > switch (itv->yuv_info.lace_mode & IVTV_YUV_MODE_MASK) { > case IVTV_YUV_MODE_INTERLACED: > @@ -1384,7 +1382,6 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) @@ -232,7 +232,7 @@ s/field/fields/ > - fb->fmt.priv = 0; > if (fb->fmt.pixelformat != V4L2_PIX_FMT_PAL8) > fb->fmt.bytesperline *= 2; -> if (fb->fmt.pixelformat = V4L2_PIX_FMT_RGB32 || +> if (fb->fmt.pixelformat == V4L2_PIX_FMT_RGB32 || > diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c > index 54d5c82..4e7fba0 100644 > --- a/drivers/media/pci/meye/meye.c @@ -286,14 +286,16 @@ s/field/fields/ > --- a/drivers/media/pci/saa7134/saa7134-video.c > +++ b/drivers/media/pci/saa7134/saa7134-video.c > @@ -1235,7 +1235,6 @@ static int saa7134_g_fmt_vid_cap(struct file *file, void *priv, -> f->fmt.pix.sizeimage > f->fmt.pix.height * f->fmt.pix.bytesperline; +> f->fmt.pix.sizeimage = +> f->fmt.pix.height * f->fmt.pix.bytesperline; > f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; > - f->fmt.pix.priv = 0; > return 0; > } > > @@ -1315,7 +1314,6 @@ static int saa7134_try_fmt_vid_cap(struct file *file, void *priv, -> f->fmt.pix.sizeimage > f->fmt.pix.height * f->fmt.pix.bytesperline; +> f->fmt.pix.sizeimage = +> f->fmt.pix.height * f->fmt.pix.bytesperline; > f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; > - f->fmt.pix.priv = 0; > @@ -393,14 +395,16 @@ s/field/fields/ > --- a/drivers/media/platform/vino.c > +++ b/drivers/media/platform/vino.c > @@ -3147,7 +3147,6 @@ static int vino_try_fmt_vid_cap(struct file *file, void *__fh, -> pf->colorspace > vino_data_formats[tempvcs.data_format].colorspace; +> pf->colorspace = +> vino_data_formats[tempvcs.data_format].colorspace; > > - pf->priv = 0; > return 0; > } > > @@ -3175,8 +3174,6 @@ static int vino_g_fmt_vid_cap(struct file *file, void *__fh, -> pf->colorspace > vino_data_formats[vcs->data_format].colorspace; +> pf->colorspace = +> vino_data_formats[vcs->data_format].colorspace; > > - pf->priv = 0; > - @@ -408,7 +412,8 @@ s/field/fields/ > return 0; > } > @@ -3219,8 +3216,6 @@ static int vino_s_fmt_vid_cap(struct file *file, void *__fh, -> pf->colorspace > vino_data_formats[vcs->data_format].colorspace; +> pf->colorspace = +> vino_data_formats[vcs->data_format].colorspace; > > - pf->priv = 0; > - @@ -502,7 +507,7 @@ s/field/fields/ > f->fmt.pix.sizeimage = dev->bulk_in_size; > f->fmt.pix.bytesperline = 0; > - f->fmt.pix.priv = 0; -> if (f->fmt.pix.width = 720) { +> if (f->fmt.pix.width == 720) { > /* SDTV formats */ > f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; > diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c @@ -543,7 +548,8 @@ s/field/fields/ > +++ b/drivers/media/usb/tm6000/tm6000-video.c > @@ -918,7 +918,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, > (f->fmt.pix.width * fh->fmt->depth) >> 3; -> f->fmt.pix.sizeimage > f->fmt.pix.height * f->fmt.pix.bytesperline; +> f->fmt.pix.sizeimage = +> f->fmt.pix.height * f->fmt.pix.bytesperline; > - f->fmt.pix.priv = 0; > > return 0; @@ -554,7 +560,8 @@ s/field/fields/ > f->fmt.pix.field = field; > - f->fmt.pix.priv = 0; > -> f->fmt.pix.bytesperline > (f->fmt.pix.width * fmt->depth) >> 3; +> f->fmt.pix.bytesperline = +> (f->fmt.pix.width * fmt->depth) >> 3; > diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c > index 74d56df..0f63954 100644 > --- a/drivers/media/usb/zr364xx/zr364xx.c @@ -582,7 +589,7 @@ s/field/fields/ > - f->fmt.pix.priv = 0; > cam->vb_vidq.field = f->fmt.pix.field; > -> if (f->fmt.pix.width = 160 && f->fmt.pix.height = 120) +> if (f->fmt.pix.width == 160 && f->fmt.pix.height == 120) > diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > index 7e2411c..cca6c2f 100644 > --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -656,7 +663,7 @@ s/field/fields/ > + fmt->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) > + return; > + -> + if (fmt->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC) +> + if (fmt->fmt.pix.priv == V4L2_PIX_FMT_PRIV_MAGIC) > + return; > + > + fmt->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC; @@ -685,7 +692,7 @@ s/field/fields/ > > static int v4l_s_input(const struct v4l2_ioctl_ops *ops, > @@ -1089,12 +1124,17 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops, -> bool is_sdr = vfd->vfl_type = VFL_TYPE_SDR; +> bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR; > bool is_rx = vfd->vfl_dir != VFL_DIR_TX; > bool is_tx = vfd->vfl_dir != VFL_DIR_RX; > + int ret; @@ -737,8 +744,8 @@ Ditto. > + > + ret = ops->vidioc_create_bufs(file, fh, create); > + -> + if (create->format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE || -> + create->format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT) +> + if (create->format.type == V4L2_BUF_TYPE_VIDEO_CAPTURE || +> + create->format.type == V4L2_BUF_TYPE_VIDEO_OUTPUT) > + create->format.fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC; Ditto. diff --git a/a/content_digest b/N1/content_digest index 7c47088..27b3056 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01403567669-18539-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "From\0Hans Verkuil <hverkuil@xs4all.nl>\0" "Subject\0Re: [PATCH v2 03/23] v4l: Support extending the v4l2_pix_format structure\0" - "Date\0Fri, 27 Jun 2014 12:36:40 +0000\0" + "Date\0Fri, 27 Jun 2014 14:36:40 +0200\0" "To\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" " linux-media@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org\0" @@ -184,7 +184,7 @@ "> \tpixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M;\n" "> \tpixfmt->field = V4L2_FIELD_INTERLACED;\n" "> -\tpixfmt->priv = 0;\n" - "> \tif (id->type = CX18_ENC_STREAM_TYPE_YUV) {\n" + "> \tif (id->type == CX18_ENC_STREAM_TYPE_YUV) {\n" "> \t\tpixfmt->pixelformat = s->pixelformat;\n" "> \t\tpixfmt->sizeimage = s->vb_bytes_per_frame;\n" "> diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c\n" @@ -224,7 +224,7 @@ "> \tpixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M;\n" "> \tpixfmt->field = V4L2_FIELD_INTERLACED;\n" "> -\tpixfmt->priv = 0;\n" - "> \tif (id->type = IVTV_ENC_STREAM_TYPE_YUV) {\n" + "> \tif (id->type == IVTV_ENC_STREAM_TYPE_YUV) {\n" "> \t\tpixfmt->pixelformat = V4L2_PIX_FMT_HM12;\n" "> \t\t/* YUV size is (Y=(h*720) + UV=(h*(720/2))) */\n" "> @@ -418,7 +417,6 @@ static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f\n" @@ -232,7 +232,7 @@ "> \tpixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M;\n" "> \tpixfmt->field = V4L2_FIELD_INTERLACED;\n" "> -\tpixfmt->priv = 0;\n" - "> \tif (id->type = IVTV_DEC_STREAM_TYPE_YUV) {\n" + "> \tif (id->type == IVTV_DEC_STREAM_TYPE_YUV) {\n" "> \t\tswitch (itv->yuv_info.lace_mode & IVTV_YUV_MODE_MASK) {\n" "> \t\tcase IVTV_YUV_MODE_INTERLACED:\n" "> @@ -1384,7 +1382,6 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)\n" @@ -242,7 +242,7 @@ "> -\tfb->fmt.priv = 0;\n" "> \tif (fb->fmt.pixelformat != V4L2_PIX_FMT_PAL8)\n" "> \t\tfb->fmt.bytesperline *= 2;\n" - "> \tif (fb->fmt.pixelformat = V4L2_PIX_FMT_RGB32 ||\n" + "> \tif (fb->fmt.pixelformat == V4L2_PIX_FMT_RGB32 ||\n" "> diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c\n" "> index 54d5c82..4e7fba0 100644\n" "> --- a/drivers/media/pci/meye/meye.c\n" @@ -296,14 +296,16 @@ "> --- a/drivers/media/pci/saa7134/saa7134-video.c\n" "> +++ b/drivers/media/pci/saa7134/saa7134-video.c\n" "> @@ -1235,7 +1235,6 @@ static int saa7134_g_fmt_vid_cap(struct file *file, void *priv,\n" - "> \tf->fmt.pix.sizeimage > \t\tf->fmt.pix.height * f->fmt.pix.bytesperline;\n" + "> \tf->fmt.pix.sizeimage =\n" + "> \t\tf->fmt.pix.height * f->fmt.pix.bytesperline;\n" "> \tf->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;\n" "> -\tf->fmt.pix.priv = 0;\n" "> \treturn 0;\n" "> }\n" ">\n" "> @@ -1315,7 +1314,6 @@ static int saa7134_try_fmt_vid_cap(struct file *file, void *priv,\n" - "> \tf->fmt.pix.sizeimage > \t\tf->fmt.pix.height * f->fmt.pix.bytesperline;\n" + "> \tf->fmt.pix.sizeimage =\n" + "> \t\tf->fmt.pix.height * f->fmt.pix.bytesperline;\n" "> \tf->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;\n" "> -\tf->fmt.pix.priv = 0;\n" ">\n" @@ -403,14 +405,16 @@ "> --- a/drivers/media/platform/vino.c\n" "> +++ b/drivers/media/platform/vino.c\n" "> @@ -3147,7 +3147,6 @@ static int vino_try_fmt_vid_cap(struct file *file, void *__fh,\n" - "> \tpf->colorspace > \t\tvino_data_formats[tempvcs.data_format].colorspace;\n" + "> \tpf->colorspace =\n" + "> \t\tvino_data_formats[tempvcs.data_format].colorspace;\n" ">\n" "> -\tpf->priv = 0;\n" "> \treturn 0;\n" "> }\n" ">\n" "> @@ -3175,8 +3174,6 @@ static int vino_g_fmt_vid_cap(struct file *file, void *__fh,\n" - "> \tpf->colorspace > \t\tvino_data_formats[vcs->data_format].colorspace;\n" + "> \tpf->colorspace =\n" + "> \t\tvino_data_formats[vcs->data_format].colorspace;\n" ">\n" "> -\tpf->priv = 0;\n" "> -\n" @@ -418,7 +422,8 @@ "> \treturn 0;\n" "> }\n" "> @@ -3219,8 +3216,6 @@ static int vino_s_fmt_vid_cap(struct file *file, void *__fh,\n" - "> \tpf->colorspace > \t\tvino_data_formats[vcs->data_format].colorspace;\n" + "> \tpf->colorspace =\n" + "> \t\tvino_data_formats[vcs->data_format].colorspace;\n" ">\n" "> -\tpf->priv = 0;\n" "> -\n" @@ -512,7 +517,7 @@ "> \tf->fmt.pix.sizeimage\t= dev->bulk_in_size;\n" "> \tf->fmt.pix.bytesperline\t= 0;\n" "> -\tf->fmt.pix.priv\t\t= 0;\n" - "> \tif (f->fmt.pix.width = 720) {\n" + "> \tif (f->fmt.pix.width == 720) {\n" "> \t\t/* SDTV formats */\n" "> \t\tf->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;\n" "> diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c\n" @@ -553,7 +558,8 @@ "> +++ b/drivers/media/usb/tm6000/tm6000-video.c\n" "> @@ -918,7 +918,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,\n" "> \t\t(f->fmt.pix.width * fh->fmt->depth) >> 3;\n" - "> \tf->fmt.pix.sizeimage > \t\tf->fmt.pix.height * f->fmt.pix.bytesperline;\n" + "> \tf->fmt.pix.sizeimage =\n" + "> \t\tf->fmt.pix.height * f->fmt.pix.bytesperline;\n" "> -\tf->fmt.pix.priv = 0;\n" ">\n" "> \treturn 0;\n" @@ -564,7 +570,8 @@ "> \tf->fmt.pix.field = field;\n" "> -\tf->fmt.pix.priv = 0;\n" ">\n" - "> \tf->fmt.pix.bytesperline > \t\t(f->fmt.pix.width * fmt->depth) >> 3;\n" + "> \tf->fmt.pix.bytesperline =\n" + "> \t\t(f->fmt.pix.width * fmt->depth) >> 3;\n" "> diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c\n" "> index 74d56df..0f63954 100644\n" "> --- a/drivers/media/usb/zr364xx/zr364xx.c\n" @@ -592,7 +599,7 @@ "> -\tf->fmt.pix.priv = 0;\n" "> \tcam->vb_vidq.field = f->fmt.pix.field;\n" ">\n" - "> \tif (f->fmt.pix.width = 160 && f->fmt.pix.height = 120)\n" + "> \tif (f->fmt.pix.width == 160 && f->fmt.pix.height == 120)\n" "> diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c\n" "> index 7e2411c..cca6c2f 100644\n" "> --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c\n" @@ -666,7 +673,7 @@ "> +\t fmt->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)\n" "> +\t\treturn;\n" "> +\n" - "> +\tif (fmt->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC)\n" + "> +\tif (fmt->fmt.pix.priv == V4L2_PIX_FMT_PRIV_MAGIC)\n" "> +\t\treturn;\n" "> +\n" "> +\tfmt->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;\n" @@ -695,7 +702,7 @@ ">\n" "> static int v4l_s_input(const struct v4l2_ioctl_ops *ops,\n" "> @@ -1089,12 +1124,17 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,\n" - "> \tbool is_sdr = vfd->vfl_type = VFL_TYPE_SDR;\n" + "> \tbool is_sdr = vfd->vfl_type == VFL_TYPE_SDR;\n" "> \tbool is_rx = vfd->vfl_dir != VFL_DIR_TX;\n" "> \tbool is_tx = vfd->vfl_dir != VFL_DIR_RX;\n" "> +\tint ret;\n" @@ -747,8 +754,8 @@ "> +\n" "> +\tret = ops->vidioc_create_bufs(file, fh, create);\n" "> +\n" - "> +\tif (create->format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE ||\n" - "> +\t create->format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT)\n" + "> +\tif (create->format.type == V4L2_BUF_TYPE_VIDEO_CAPTURE ||\n" + "> +\t create->format.type == V4L2_BUF_TYPE_VIDEO_OUTPUT)\n" "> +\t\tcreate->format.fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;\n" "\n" "Ditto.\n" @@ -828,4 +835,4 @@ "\n" "\tHans" -1ae8c2b0d39ebb02cbbe60d5c25ee6715b254446fb84dbb198a2e084f2f42185 +8b119a5251193959f72c95c78a004d1fe91ffda5586bccd6b7bf1f58498be15c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.