| Message ID | 20170209200420.3046-4-thibault.saunier@osg.samsung.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 09.02.2017 21:04, Thibault Saunier wrote: > The media documentation says that the V4L2_COLORSPACE_SMPTE170M colorspace > should be used for SDTV and V4L2_COLORSPACE_REC709 for HDTV but the driver > didn't set the colorimetry, also respect usespace setting. > > Use 576p display resolution as a threshold to set this. > > Signed-off-by: Thibault Saunier <thibault.saunier@osg.samsung.com> > --- > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > index 367ef8e8dbf0..960d6c7052bd 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > @@ -354,6 +354,15 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) > pix_mp->plane_fmt[0].sizeimage = ctx->luma_size; > pix_mp->plane_fmt[1].bytesperline = ctx->buf_width; > pix_mp->plane_fmt[1].sizeimage = ctx->chroma_size; > + > + if (pix_mp->colorspace != V4L2_COLORSPACE_REC709 && > + pix_mp->colorspace != V4L2_COLORSPACE_SMPTE170M && > + pix_mp->colorspace != V4L2_COLORSPACE_DEFAULT) { > + if (pix_mp->width > 720 && pix_mp->height > 576) /* HD */ > + pix_mp->colorspace = V4L2_COLORSPACE_REC709; > + else /* SD */ > + pix_mp->colorspace = V4L2_COLORSPACE_SMPTE170M; > + } Again, in g_fmt you should not check values of fields you have to fill. Regards Andrzej > } else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { > /* This is run on OUTPUT > The buffer contains compressed image > @@ -378,6 +387,7 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) > 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; > > mfc_debug(2, "Type is %d\n", f->type); > @@ -405,6 +415,15 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) > mfc_err("Unsupported format by this MFC version.\n"); > return -EINVAL; > } > + > + if (pix_mp->colorspace != V4L2_COLORSPACE_REC709 && > + pix_mp->colorspace != V4L2_COLORSPACE_SMPTE170M && > + pix_mp->colorspace != V4L2_COLORSPACE_DEFAULT) { > + if (pix_mp->width > 720 && pix_mp->height > 576) /* HD */ > + pix_mp->colorspace = V4L2_COLORSPACE_REC709; > + else /* SD */ > + pix_mp->colorspace = V4L2_COLORSPACE_SMPTE170M; > + } > } > > return 0; -- 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 367ef8e8dbf0..960d6c7052bd 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -354,6 +354,15 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) pix_mp->plane_fmt[0].sizeimage = ctx->luma_size; pix_mp->plane_fmt[1].bytesperline = ctx->buf_width; pix_mp->plane_fmt[1].sizeimage = ctx->chroma_size; + + if (pix_mp->colorspace != V4L2_COLORSPACE_REC709 && + pix_mp->colorspace != V4L2_COLORSPACE_SMPTE170M && + pix_mp->colorspace != V4L2_COLORSPACE_DEFAULT) { + if (pix_mp->width > 720 && pix_mp->height > 576) /* HD */ + pix_mp->colorspace = V4L2_COLORSPACE_REC709; + else /* SD */ + pix_mp->colorspace = V4L2_COLORSPACE_SMPTE170M; + } } else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { /* This is run on OUTPUT The buffer contains compressed image @@ -378,6 +387,7 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) 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; mfc_debug(2, "Type is %d\n", f->type); @@ -405,6 +415,15 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) mfc_err("Unsupported format by this MFC version.\n"); return -EINVAL; } + + if (pix_mp->colorspace != V4L2_COLORSPACE_REC709 && + pix_mp->colorspace != V4L2_COLORSPACE_SMPTE170M && + pix_mp->colorspace != V4L2_COLORSPACE_DEFAULT) { + if (pix_mp->width > 720 && pix_mp->height > 576) /* HD */ + pix_mp->colorspace = V4L2_COLORSPACE_REC709; + else /* SD */ + pix_mp->colorspace = V4L2_COLORSPACE_SMPTE170M; + } } return 0;
The media documentation says that the V4L2_COLORSPACE_SMPTE170M colorspace should be used for SDTV and V4L2_COLORSPACE_REC709 for HDTV but the driver didn't set the colorimetry, also respect usespace setting. Use 576p display resolution as a threshold to set this. Signed-off-by: Thibault Saunier <thibault.saunier@osg.samsung.com> --- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)