| Message ID | 20190327151743.18528-11-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: > Add a multiplanar flag in vimc_stream in order to propagate the > state (singleplanar/multiplanar) to subdevices at the stream. > > Signed-off-by: André Almeida <andrealmeid@collabora.com> > --- > Change in v2: > - New commit > > drivers/media/platform/vimc/vimc-capture.c | 7 +++++-- > drivers/media/platform/vimc/vimc-streamer.h | 3 +++ > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c > index 57bc2b64b093..3c93fbd51629 100644 > --- a/drivers/media/platform/vimc/vimc-capture.c > +++ b/drivers/media/platform/vimc/vimc-capture.c > @@ -454,12 +454,15 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count) > return ret; > } > > - if (IS_MULTIPLANAR(vcap)) > + if (IS_MULTIPLANAR(vcap)) { > vcap->stream.producer_pixfmt = > vcap->format.fmt.pix_mp.pixelformat; > - else > + vcap->stream.multiplanar = true; > + } else { > vcap->stream.producer_pixfmt = > vcap->format.fmt.pix.pixelformat; > + vcap->stream.multiplanar = false; > + } I believe you could have just: vcap->stream.multiplanar = IS_MULTIPLANAR(vcap); > > ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1); > if (ret) { > diff --git a/drivers/media/platform/vimc/vimc-streamer.h b/drivers/media/platform/vimc/vimc-streamer.h > index 2b3667408794..4878e0b72ea7 100644 > --- a/drivers/media/platform/vimc/vimc-streamer.h > +++ b/drivers/media/platform/vimc/vimc-streamer.h > @@ -25,6 +25,8 @@ > * processed in the pipeline. > * @pipe_size: size of @ved_pipeline > * @kthread: thread that generates the frames of the stream. > + * @multiplanar: sets if the stream is running in multiplanar or > + * singleplanar format mode > * @producer_pixfmt: the pixel format requested from the pipeline. This must > * be set just before calling vimc_streamer_s_stream(ent, 1). This value is > * propagated up to the source of the base image (usually a sensor node) and > @@ -40,6 +42,7 @@ struct vimc_stream { > struct vimc_ent_device *ved_pipeline[VIMC_STREAMER_PIPELINE_MAX_SIZE]; > unsigned int pipe_size; > struct task_struct *kthread; > + bool multiplanar; > u32 producer_pixfmt; > }; > >
diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c index 57bc2b64b093..3c93fbd51629 100644 --- a/drivers/media/platform/vimc/vimc-capture.c +++ b/drivers/media/platform/vimc/vimc-capture.c @@ -454,12 +454,15 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count) return ret; } - if (IS_MULTIPLANAR(vcap)) + if (IS_MULTIPLANAR(vcap)) { vcap->stream.producer_pixfmt = vcap->format.fmt.pix_mp.pixelformat; - else + vcap->stream.multiplanar = true; + } else { vcap->stream.producer_pixfmt = vcap->format.fmt.pix.pixelformat; + vcap->stream.multiplanar = false; + } ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1); if (ret) { diff --git a/drivers/media/platform/vimc/vimc-streamer.h b/drivers/media/platform/vimc/vimc-streamer.h index 2b3667408794..4878e0b72ea7 100644 --- a/drivers/media/platform/vimc/vimc-streamer.h +++ b/drivers/media/platform/vimc/vimc-streamer.h @@ -25,6 +25,8 @@ * processed in the pipeline. * @pipe_size: size of @ved_pipeline * @kthread: thread that generates the frames of the stream. + * @multiplanar: sets if the stream is running in multiplanar or + * singleplanar format mode * @producer_pixfmt: the pixel format requested from the pipeline. This must * be set just before calling vimc_streamer_s_stream(ent, 1). This value is * propagated up to the source of the base image (usually a sensor node) and @@ -40,6 +42,7 @@ struct vimc_stream { struct vimc_ent_device *ved_pipeline[VIMC_STREAMER_PIPELINE_MAX_SIZE]; unsigned int pipe_size; struct task_struct *kthread; + bool multiplanar; u32 producer_pixfmt; };
Add a multiplanar flag in vimc_stream in order to propagate the state (singleplanar/multiplanar) to subdevices at the stream. Signed-off-by: André Almeida <andrealmeid@collabora.com> --- Change in v2: - New commit drivers/media/platform/vimc/vimc-capture.c | 7 +++++-- drivers/media/platform/vimc/vimc-streamer.h | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-)