From: Kaaira Gupta <kgupta@es.iitr.ac.in>
To: Helen Koike <helen.koike@collabora.com>,
Shuah Khan <skhan@linuxfoundation.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Kieran Bingham <kieran.bingham@ideasonboard.com>
Cc: Kaaira Gupta <kgupta@es.iitr.ac.in>
Subject: [PATCH v3 4/9] media: vimc: Separate starting stream from pipeline initialisation
Date: Wed, 19 Aug 2020 23:34:37 +0530 [thread overview]
Message-ID: <20200819180442.11630-5-kgupta@es.iitr.ac.in> (raw)
In-Reply-To: <20200819180442.11630-1-kgupta@es.iitr.ac.in>
Separate the process of initialising pipeline array from starting
streaming for all entities in path of a stream. This is needed because
multiple streams can stream, but only one pipeline object is needed.
Process frames only for those entities in a pipeline which are
streaming. This is known through their use counts.
Signed-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>
---
.../media/test-drivers/vimc/vimc-streamer.c | 95 ++++++++++++++++---
1 file changed, 83 insertions(+), 12 deletions(-)
diff --git a/drivers/media/test-drivers/vimc/vimc-streamer.c b/drivers/media/test-drivers/vimc/vimc-streamer.c
index c1644d69686d..cc40ecabe95a 100644
--- a/drivers/media/test-drivers/vimc/vimc-streamer.c
+++ b/drivers/media/test-drivers/vimc/vimc-streamer.c
@@ -40,33 +40,30 @@ static void vimc_streamer_pipeline_terminate(struct vimc_stream *stream)
}
/**
- * vimc_streamer_pipeline_init - Initializes the stream structure
+ * vimc_streamer_stream_start - Starts streaming for all entities
+ * in a stream
*
- * @stream: the pointer to the stream structure to be initialized
* @ved: the pointer to the vimc entity initializing the stream
*
- * Initializes the stream structure. Walks through the entity graph to
- * construct the pipeline used later on the streamer thread.
- * Calls vimc_streamer_s_stream() to enable stream in all entities of
- * the pipeline.
+ * Walks through the entity graph to call vimc_streamer_s_stream()
+ * to enable stream in all entities in path of a stream.
*
* Return: 0 if success, error code otherwise.
*/
-static int vimc_streamer_pipeline_init(struct vimc_stream *stream,
- struct vimc_ent_device *ved)
+static int vimc_streamer_stream_start(struct vimc_stream *stream,
+ struct vimc_ent_device *ved)
{
struct media_entity *entity;
struct video_device *vdev;
struct v4l2_subdev *sd;
+ int stream_size = 0;
int ret = 0;
- stream->pipe_size = 0;
- while (stream->pipe_size < VIMC_STREAMER_PIPELINE_MAX_SIZE) {
+ while (stream_size < VIMC_STREAMER_PIPELINE_MAX_SIZE) {
if (!ved) {
vimc_streamer_pipeline_terminate(stream);
return -EINVAL;
}
- stream->ved_pipeline[stream->pipe_size++] = ved;
if (is_media_entity_v4l2_subdev(ved->ent)) {
sd = media_entity_to_v4l2_subdev(ved->ent);
@@ -104,6 +101,73 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream,
entity);
ved = video_get_drvdata(vdev);
}
+ stream_size++;
+ }
+
+ vimc_streamer_pipeline_terminate(stream);
+ return -EINVAL;
+}
+
+/**
+ * vimc_streamer_pipeline_init - Initialises pipeline and pipe size
+ *
+ * @stream: the pointer to the stream structure
+ * @ved: the pointer to the vimc entity initializing the stream pipeline
+ *
+ * Walks through the entity graph to initialise ved_pipeline and updates
+ * pipe_size too.
+ *
+ * Return: 0 if success, error code otherwise.
+ */
+static int vimc_streamer_pipeline_init(struct vimc_stream *stream,
+ struct vimc_ent_device *ved)
+{
+ struct media_entity *entity;
+ struct media_device *mdev;
+ struct media_graph graph;
+ struct video_device *vdev;
+ struct v4l2_subdev *sd;
+ int ret;
+
+ entity = ved->ent;
+ mdev = entity->graph_obj.mdev;
+
+ ret = media_graph_walk_init(&graph, mdev);
+ if (ret)
+ return ret;
+
+ media_graph_walk_start(&graph, entity);
+
+ /*
+ * Start pipeline array initialisation from RAW Capture only to get
+ * entities in the correct order of their frame processing.
+ */
+ if (!strncmp(entity->name, "RGB", 3)) {
+ entity = media_graph_walk_next(&graph);
+ mdev = entity->graph_obj.mdev;
+ media_graph_walk_cleanup(&graph);
+
+ ret = media_graph_walk_init(&graph, mdev);
+ if (ret)
+ return ret;
+ media_graph_walk_start(&graph, entity);
+ }
+
+ while (stream->pipe_size < VIMC_STREAMER_PIPELINE_MAX_SIZE) {
+ if (is_media_entity_v4l2_subdev(entity)) {
+ sd = media_entity_to_v4l2_subdev(entity);
+ ved = v4l2_get_subdevdata(sd);
+ } else {
+ vdev = container_of(entity, struct video_device, entity);
+ ved = video_get_drvdata(vdev);
+ }
+ stream->ved_pipeline[stream->pipe_size++] = ved;
+ entity = media_graph_walk_next(&graph);
+
+ if (!strcmp(entity->name, stream->ved_pipeline[0]->ent->name)) {
+ media_graph_walk_cleanup(&graph);
+ return 0;
+ }
}
vimc_streamer_pipeline_terminate(stream);
@@ -138,8 +202,11 @@ static int vimc_streamer_thread(void *data)
for (i = stream->pipe_size - 1; i >= 0; i--) {
ved = stream->ved_pipeline[i];
- ret = ved->process_frame(ved);
+ if (atomic_read(&ved->use_count) == 0)
+ continue;
+
+ ret = ved->process_frame(ved);
if (ret)
break;
}
@@ -179,6 +246,10 @@ int vimc_streamer_s_stream(struct vimc_stream *stream,
if (stream->kthread)
return 0;
+ ret = vimc_streamer_stream_start(stream, ved);
+ if (ret)
+ return ret;
+
ret = vimc_streamer_pipeline_init(stream, ved);
if (ret)
return ret;
--
2.17.1
next prev parent reply other threads:[~2020-08-19 18:06 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-19 18:04 [PATCH v3 0/9] media: vimc: Multiple stream support in vimc Kaaira Gupta
2020-08-19 18:04 ` [PATCH v3 1/9] media: vimc: Move get_source_entity to vimc-common Kaaira Gupta
2020-08-20 15:32 ` Kieran Bingham
2020-08-19 18:04 ` [PATCH v3 2/9] media: vimc: Add get_frame callback Kaaira Gupta
2020-08-20 15:36 ` Kieran Bingham
2020-09-12 10:01 ` Kaaira Gupta
2020-10-02 11:08 ` Dafna Hirschfeld
2020-08-19 18:04 ` [PATCH v3 3/9] media: vimc: Add usage count to subdevices Kaaira Gupta
2020-10-02 11:13 ` Dafna Hirschfeld
2020-08-19 18:04 ` Kaaira Gupta [this message]
2020-08-21 15:11 ` [PATCH v3 4/9] media: vimc: Separate starting stream from pipeline initialisation Dafna Hirschfeld
2020-08-21 21:01 ` Kaaira Gupta
2020-08-28 20:37 ` Dafna Hirschfeld
2020-09-02 9:56 ` Kieran Bingham
2020-09-12 10:21 ` Kaaira Gupta
2020-10-02 12:18 ` Dafna Hirschfeld
2020-09-12 10:16 ` Kaaira Gupta
2020-08-19 18:04 ` [PATCH v3 5/9] media: vimc: Separate closing of stream and thread Kaaira Gupta
2020-09-02 10:13 ` Kieran Bingham
2020-09-12 10:28 ` Kaaira Gupta
2020-08-19 18:04 ` [PATCH v3 6/9] media: vimc: Serialize vimc_streamer_s_stream() Kaaira Gupta
2020-08-19 18:04 ` [PATCH v3 7/9] media: vimc: Dynamically allocate stream struct Kaaira Gupta
2020-09-02 10:29 ` Kieran Bingham
2020-09-12 10:39 ` Kaaira Gupta
2020-08-19 18:04 ` [PATCH v3 8/9] media: vimc: Join pipeline if one already exists Kaaira Gupta
2020-09-02 10:40 ` Kieran Bingham
2020-08-19 18:04 ` [PATCH v3 9/9] media: vimc: Run multiple captures on same thread Kaaira Gupta
2020-09-02 10:46 ` Kieran Bingham
2020-09-12 10:45 ` Kaaira Gupta
2020-09-02 10:51 ` [PATCH v3 0/9] media: vimc: Multiple stream support in vimc Kieran Bingham
2020-09-12 10:49 ` Kaaira Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200819180442.11630-5-kgupta@es.iitr.ac.in \
--to=kgupta@es.iitr.ac.in \
--cc=helen.koike@collabora.com \
--cc=kieran.bingham@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).