| Message ID | 20170213190836.26972-5-thibault.saunier@osg.samsung.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 13.02.2017 20:08, Thibault Saunier wrote: > It is required by the standard that the field order is set by the > driver. > > Signed-off-by: Thibault Saunier <thibault.saunier@osg.samsung.com> > > --- > > Changes in v4: None > Changes in v3: > - Do not check values in the g_fmt functions as Andrzej explained in previous review > > Changes in v2: > - Fix a silly build error that slipped in while rebasing the patches > > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > index 0976c3e0a5ce..c954b34cb988 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > @@ -385,6 +385,20 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) > struct s5p_mfc_dev *dev = video_drvdata(file); > struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; > struct s5p_mfc_fmt *fmt; > + enum v4l2_field field; > + > + field = f->fmt.pix.field; > + if (field == V4L2_FIELD_ANY) { > + field = V4L2_FIELD_NONE; > + } else if (field != V4L2_FIELD_NONE) { > + mfc_debug(2, "Not supported field order(%d)\n", pix_mp->field); > + return -EINVAL; > + } > + > + /* V4L2 specification suggests the driver corrects the format struct > + * if any of the dimensions is unsupported > + */ > + f->fmt.pix.field = field; It looks like you missed my previous comment. -- Regards Andrzej > > mfc_debug(2, "Type is %d\n", f->type); > if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 0976c3e0a5ce..c954b34cb988 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -385,6 +385,20 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) struct s5p_mfc_dev *dev = video_drvdata(file); struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; struct s5p_mfc_fmt *fmt; + enum v4l2_field field; + + field = f->fmt.pix.field; + if (field == V4L2_FIELD_ANY) { + field = V4L2_FIELD_NONE; + } else if (field != V4L2_FIELD_NONE) { + mfc_debug(2, "Not supported field order(%d)\n", pix_mp->field); + return -EINVAL; + } + + /* V4L2 specification suggests the driver corrects the format struct + * if any of the dimensions is unsupported + */ + f->fmt.pix.field = field; mfc_debug(2, "Type is %d\n", f->type); if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
It is required by the standard that the field order is set by the driver. Signed-off-by: Thibault Saunier <thibault.saunier@osg.samsung.com> --- Changes in v4: None Changes in v3: - Do not check values in the g_fmt functions as Andrzej explained in previous review Changes in v2: - Fix a silly build error that slipped in while rebasing the patches drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)