| Message ID | 20190327151743.18528-5-andrealmeid@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: vimc: Add support for multiplanar formats | expand |
On 3/27/19 12:17 PM, André Almeida wrote: > Define the pixelformat of the streamer depending to the > mode (single/multiplanar). > > Signed-off-by: André Almeida <andrealmeid@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> > --- > Change in v2: > - Add a macro to check if device is in multiplanar mode. Now, this check > is done using the capture device capabilities, rather than using the > multiplanar module parameter > > drivers/media/platform/vimc/vimc-capture.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c > index de52f20b5c85..add6df565fa9 100644 > --- a/drivers/media/platform/vimc/vimc-capture.c > +++ b/drivers/media/platform/vimc/vimc-capture.c > @@ -28,6 +28,10 @@ > > #define VIMC_CAP_DRV_NAME "vimc-capture" > > +/* Checks if the device supports multiplanar capture */ > +#define IS_MULTIPLANAR(vcap) \ > + (vcap->vdev.device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > + > static const u32 vimc_cap_supported_pixfmt[] = { > V4L2_PIX_FMT_BGR24, > V4L2_PIX_FMT_RGB24, > @@ -282,7 +286,12 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count) > return ret; > } > > - vcap->stream.producer_pixfmt = vcap->format.fmt.pix.pixelformat; > + if (IS_MULTIPLANAR(vcap)) > + vcap->stream.producer_pixfmt = > + vcap->format.fmt.pix_mp.pixelformat; > + else > + vcap->stream.producer_pixfmt = > + vcap->format.fmt.pix.pixelformat; > > ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1); > if (ret) { >
diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c index de52f20b5c85..add6df565fa9 100644 --- a/drivers/media/platform/vimc/vimc-capture.c +++ b/drivers/media/platform/vimc/vimc-capture.c @@ -28,6 +28,10 @@ #define VIMC_CAP_DRV_NAME "vimc-capture" +/* Checks if the device supports multiplanar capture */ +#define IS_MULTIPLANAR(vcap) \ + (vcap->vdev.device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) + static const u32 vimc_cap_supported_pixfmt[] = { V4L2_PIX_FMT_BGR24, V4L2_PIX_FMT_RGB24, @@ -282,7 +286,12 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count) return ret; } - vcap->stream.producer_pixfmt = vcap->format.fmt.pix.pixelformat; + if (IS_MULTIPLANAR(vcap)) + vcap->stream.producer_pixfmt = + vcap->format.fmt.pix_mp.pixelformat; + else + vcap->stream.producer_pixfmt = + vcap->format.fmt.pix.pixelformat; ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1); if (ret) {
Define the pixelformat of the streamer depending to the mode (single/multiplanar). Signed-off-by: André Almeida <andrealmeid@collabora.com> --- Change in v2: - Add a macro to check if device is in multiplanar mode. Now, this check is done using the capture device capabilities, rather than using the multiplanar module parameter drivers/media/platform/vimc/vimc-capture.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)