v4l-utils: Support multiplexed streams
v7 cover v4l-utils: Support multiplexed streams
Add support for multiplexed streams.
---
Changes in v7:
- Fixes and improvements to testSubDevRouting():
- Fix num_routes check
- Improve VIDIOC_SUBDEV_G_ROUTING test by verifying num_routes is
updated on successful call
- Fix test of routing.reserved field on a failing
VIDIOC_SUBDEV_S_ROUTING call.
- Link to v6: https://lore.kernel.org/all/[email protected]/
- Range diff against v6:
1: 5b814067 = 1: b6927486 v4l2-ctl: Improve sub-device options help text
2: 8e349ff0 = 2: 0b1dc325 v4l2-ctl: Add routing and streams support
3: 5977db8f = 3: 38a5fd3f media-ctl: Add support for routes and streams
4: 7af03ced = 4: 36d0a8e0 v4l2-ctl/compliance: Add routing and streams multiplexed streams
5: abb2d296 ! 5: beaa6a09 v4l2-ctl/compliance: Add simple routing test
@@ utils/v4l2-compliance/v4l2-test-subdevs.cpp: int testSubDevSelection(struct node
+ fail_on_test(ret == ENOSPC && routing.num_routes == 0);
+ fail_on_test(check_0(routing.reserved, sizeof(routing.reserved)));
+
-+ if (routing.num_routes)
++ if (!routing.num_routes)
+ return 0;
+
-+ /* Then get the actual routes */
++ /*
++ * Then get the actual routes, and verify that the num_routes gets
++ * updated to the correct number.
++ */
+
-+ routing.num_routes = NUM_ROUTES_MAX;
++ uint32_t num_routes = routing.num_routes;
++ routing.num_routes = num_routes + 1;
+ fail_on_test(doioctl(node, VIDIOC_SUBDEV_G_ROUTING, &routing));
++ fail_on_test(routing.num_routes != num_routes);
+
+ /* Check the validity of route pads and flags */
+
@@ utils/v4l2-compliance/v4l2-test-subdevs.cpp: int testSubDevSelection(struct node
+
+ memset(routing.reserved, 0xff, sizeof(routing.reserved));
+ fail_on_test(doioctl(node, VIDIOC_SUBDEV_S_ROUTING, &routing) != EINVAL);
-+ fail_on_test(check_0(routing.reserved, sizeof(routing.reserved)));
+ }
+
+ return 0;
6: bedf5aa3 = 6: 78cc79ce media-ctl: Check for Streams API support
7: 6e432bea = 7: bfe6e80a utils/common: Set V4L2_SUBDEV_CLIENT_CAP_STREAMS for subdevs
8: 05c3e4e6 = 8: 2096d081 v4l2-ctl: Check for Streams API support---
Tomi Valkeinen (8):
v4l2-ctl: Improve sub-device options help text
v4l2-ctl: Add routing and streams support
media-ctl: Add support for routes and streams v4l2-ctl/compliance: Add routing and streams multiplexed streams v4l2-ctl/compliance: Add simple routing test
media-ctl: Check for Streams API support utils/common: Set V4L2_SUBDEV_CLIENT_CAP_STREAMS for subdevs
v4l2-ctl: Check for Streams API support
utils/common/cv4l-helpers.h | 1 + utils/common/v4l-helpers.h | 18 ++ utils/common/v4l2-info.h | 6 + utils/media-ctl/libmediactl.c | 43 ++++ utils/media-ctl/libv4l2subdev.c | 345 +++++++++++++++++++++++--- utils/media-ctl/media-ctl.c | 113 +++++++-- utils/media-ctl/mediactl-priv.h | 1 + utils/media-ctl/mediactl.h | 16 ++ utils/media-ctl/options.c | 15 +- utils/media-ctl/options.h | 1 + utils/media-ctl/v4l2subdev.h | 66 ++++- utils/v4l2-compliance/v4l2-compliance.cpp | 132 ++++++++-- utils/v4l2-compliance/v4l2-compliance.h | 9 +- utils/v4l2-compliance/v4l2-test-subdevs.cpp | 121 ++++++++- utils/v4l2-ctl/v4l2-ctl-subdev.cpp | 364 +++++++++++++++++++++++++--- utils/v4l2-ctl/v4l2-ctl.cpp | 2 + utils/v4l2-ctl/v4l2-ctl.h | 2 + 17 files changed, 1132 insertions(+), 123 deletions(-)
---
base-commit: a0c26a97308ea1c5e809245df570e2f04e668168
change-id: 20230802-streams-support-76bec9e1bf85
Best regards,
Signature · 1 line
Tomi Valkeinen <[email protected]>
PATCH v7 1/8 v4l2-ctl: Improve sub-device options help text
Explicitly mention that all the parameters to the options are optional, and default to 0, and remove the one place where the default of 0 was mentioned.
--- utils/v4l2-ctl/v4l2-ctl-subdev.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
utils/v4l2-ctl/v4l2-ctl-subdev.cpp +2 -1
@@ -36,8 +36,9 @@ static double set_fps; void subdev_usage() { printf("\nSub-Device options:\n" + "Note: all parameters below (pad, code, etc.) are optional unless otherwise noted and default to 0\n" " --list-subdev-mbus-codes <pad>\n" - " display supported mediabus codes for this pad (0 is default)\n" + " display supported mediabus codes for this pad\n" " [VIDIOC_SUBDEV_ENUM_MBUS_CODE]\n" " --list-subdev-framesizes pad=<pad>,code=<code>\n" " list supported framesizes for this pad and code\n"
Signature · 1 line
2.34.1
PATCH v7 2/8 v4l2-ctl: Add routing and streams support
In reply to Tomi ValkeinenAdd support to get and set subdev routes and to get and set configurations per stream.
Based on work from Jacopo Mondi <[email protected]> and Niklas Söderlund <[email protected]>.
--- utils/common/v4l2-info.h | 6 + utils/v4l2-ctl/v4l2-ctl-subdev.cpp | 308 ++++++++++++++++++++++++++++++++----- utils/v4l2-ctl/v4l2-ctl.cpp | 2 + utils/v4l2-ctl/v4l2-ctl.h | 2 + 4 files changed, 282 insertions(+), 36 deletions(-)
utils/common/v4l2-info.h +6 -0
@@ -11,6 +11,12 @@#include <linux/videodev2.h> #include <linux/v4l2-subdev.h> +/* +* The max value comes from a check in the kernel source code +* drivers/media/v4l2-core/v4l2-ioctl.c check_array_args() +*/ +#define NUM_ROUTES_MAX 256 +struct flag_def {unsigned flag;const char *str;
utils/v4l2-ctl/v4l2-ctl-subdev.cpp +272 -36
555 lines not on this page · raw message
utils/v4l2-ctl/v4l2-ctl.cpp +2 -0
@@ -64,6 +64,8 @@ static struct option long_options[] = { {"get-fmt-video-out", no_argument, nullptr, OptGetVideoOutFormat}, {"set-fmt-video-out", required_argument, nullptr, OptSetVideoOutFormat}, {"try-fmt-video-out", required_argument, nullptr, OptTryVideoOutFormat}, + {"get-routing", no_argument, 0, OptGetRouting}, + {"set-routing", required_argument, 0, OptSetRouting}, {"help", no_argument, nullptr, OptHelp}, {"help-tuner", no_argument, nullptr, OptHelpTuner}, {"help-io", no_argument, nullptr, OptHelpIO},
utils/v4l2-ctl/v4l2-ctl.h +2 -0
@@ -191,6 +191,8 @@ enum Option { OptInfoEdid, OptShowEdid, OptFixEdidChecksums, + OptGetRouting, + OptSetRouting, OptFreqSeek, OptEncoderCmd, OptTryEncoderCmd,
Signature · 1 line
2.34.1
PATCH v7 3/8 media-ctl: Add support for routes and streams
In reply to Tomi ValkeinenAdd support to get and set subdev routes and to get and set configurations per stream.
Based on work from Sakari Ailus <[email protected]>.
--- utils/media-ctl/libmediactl.c | 43 ++++++ utils/media-ctl/libv4l2subdev.c | 289 +++++++++++++++++++++++++++++++++++----- utils/media-ctl/media-ctl.c | 113 ++++++++++++++-- utils/media-ctl/mediactl.h | 16 +++ utils/media-ctl/options.c | 15 ++- utils/media-ctl/options.h | 1 + utils/media-ctl/v4l2subdev.h | 66 ++++++++- 7 files changed, 490 insertions(+), 53 deletions(-)
utils/media-ctl/libmediactl.c +43 -0
@@ -874,6 +874,49 @@ struct media_pad *media_parse_pad(struct media_device *media,return &entity->pads[pad]; } +struct media_pad *media_parse_pad_stream (struct media_device *media, +const char *p,unsigned int *stream, +char **endp) +{ +struct media_pad *pad; +const char *orig_p = p; +char *ep; + + pad =media_parse_pad (media, p, &ep); +if (pad ==NULL ) +return NULL ; + + p = ep; + +if (*p =='/' ) { +unsigned int s; + + p++; + + s =strtoul (p, &ep,10 ); + +if (ep == p) { +media_dbg (media,"Unable to parse stream: '%s'\n" , orig_p); +if (endp) + *endp = (char *)p; +return NULL ; + } + + *stream = s; + + p++; + }else { + *stream =0 ; + } + +for (;isspace (*p); ++p); + +if (endp) + *endp = (char *)p; + +return pad; +} +struct media_link *media_parse_link (struct media_device *media,const char *p,char **endp) {
utils/media-ctl/libv4l2subdev.c +259 -30
475 lines not on this page · raw message
utils/media-ctl/media-ctl.c +99 -14
219 lines not on this page · raw message
utils/media-ctl/mediactl.h +16 -0
@@ -394,6 +394,22 @@ struct media_entity *media_parse_entity(struct media_device *media,struct media_pad *media_parse_pad (struct media_device *media,const char *p,char **endp); +/** +* @brief Parse string to a pad and stream on the media device. +* @param media - media device. +* @param p - input string +* @param stream - pointer to uint where the stream number is stored +* @param endp - pointer to string where parsing ended +* +* Parse NULL terminated string describing a pad and stream and return its struct +* media_pad instance and the stream number. +* +* @return Pointer to struct media_pad on success, NULL on failure. +*/ +struct media_pad *media_parse_pad_stream (struct media_device *media, +const char *p,unsigned int *stream, +char **endp); +/** * @brief Parse string to a link on the media device. * @param media - media device.
utils/media-ctl/options.c +13 -2
@@ -63,6 +63,7 @@ static void usage(const char *argv0)printf (" --get-v4l2 pad Print the active format on a given pad\n" );printf (" --get-dv pad Print detected and current DV timings on a given pad\n" );printf (" --set-dv pad Configure DV timings on a given pad\n" ); +printf ("-R, --set-routes routes Configure routes on a given subdev entity\n" );printf ("-h, --help Show verbose help and exit\n" );printf ("-i, --interactive Modify links interactively\n" );printf ("-l, --links links Comma-separated list of link descriptors to setup\n" );
@@ -78,7 +79,7 @@ static void usage(const char *argv0)printf ("Links and formats are defined as\n" );printf ("\tlinks = link { ',' link } ;\n" );printf ("\tlink = pad '->' pad '[' flags ']' ;\n" ); -printf ("\tpad = entity ':' pad-number ;\n" ); +printf ("\tpad = entity ':' pad-number { '/' stream-number } ;\n" );printf ("\tentity = entity-number | ( '\"' entity-name '\"' ) ;\n" );printf ("\n" );printf ("\tv4l2 = pad '[' v4l2-properties ']' ;\n" );
@@ -95,11 +96,16 @@ static void usage(const char *argv0)printf ("\trectangle = '(' left ',' top, ')' '/' size ;\n" );printf ("\tsize = width 'x' height ;\n" );printf ("\n" ); +printf ("\troutes = entity '[' route { ',' route } ']' ;\n" ); +printf ("\troute = pad-number '/' stream-number '->' pad-number '/' stream-number '[' route-flags ']' ;\n" ); +printf ("\n" );printf ("where the fields are\n" );printf ("\tentity-number Entity numeric identifier\n" );printf ("\tentity-name Entity name (string) \n" );printf ("\tpad-number Pad numeric identifier\n" ); +printf ("\tstream-number Stream numeric identifier\n" );printf ("\tflags Link flags (0: inactive, 1: active)\n" ); +printf ("\troute-flags Route flags (bitmask of route flags: active - 0x1)\n" );printf ("\tfcc Format FourCC\n" );printf ("\twidth Image width in pixels\n" );printf ("\theight Image height in pixels\n" );
@@ -152,6 +158,7 @@ static struct option opts[] = { {"get-v4l2", 1, 0, OPT_GET_FORMAT}, {"get-dv", 1, 0, OPT_GET_DV}, {"set-dv", 1, 0, OPT_SET_DV}, + {"set-routes", 1, 0, 'R'}, {"help", 0, 0, 'h'}, {"interactive", 0, 0, 'i'}, {"links", 1, 0, 'l'},
@@ -237,7 +244,7 @@ int parse_cmdline(int argc, char **argv) }/* parse options */ -while ((opt =getopt_long (argc, argv,"d:e:f:hil:prvV:" , +while ((opt =getopt_long (argc, argv,"d:e:f:hil:prvV:R:" , opts,NULL )) !=-1 ) {switch (opt) {case 'd' :
@@ -283,6 +290,10 @@ int parse_cmdline(int argc, char **argv) media_opts.verbose =1 ;break ; +case 'R' : + media_opts.routes = optarg; +break ; +case OPT_PRINT_DOT : media_opts.print_dot =1 ;break ;
utils/media-ctl/options.h +1 -0
@@ -36,6 +36,7 @@ struct media_optionsconst char *fmt_pad;const char *get_dv_pad;const char *dv_pad; +const char *routes; };extern struct media_options media_opts;
utils/media-ctl/v4l2subdev.h +59 -7
143 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 4/8 v4l2-ctl/compliance: Add routing and streams multiplexed streams
In reply to Tomi ValkeinenAdd basic support for routing and streams.
--- utils/v4l2-compliance/v4l2-compliance.cpp | 120 ++++++++++++++++++++++------ utils/v4l2-compliance/v4l2-compliance.h | 8 +- utils/v4l2-compliance/v4l2-test-subdevs.cpp | 43 ++++++++-- 3 files changed, 137 insertions(+), 34 deletions(-)
utils/v4l2-compliance/v4l2-compliance.cpp +95 -25
@@ -1233,6 +1233,10 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ if (node.is_subdev()) { bool has_source = false; bool has_sink = false; + struct v4l2_subdev_routing sd_routing[2] = {}; + struct v4l2_subdev_route sd_routes[2][NUM_ROUTES_MAX] = {}; + bool has_routes = !!(subdevcap.capabilities & V4L2_SUBDEV_CAP_STREAMS); + int ret; node.frame_interval_pad = -1; node.enum_frame_interval_pad = -1;
@@ -1244,6 +1248,22 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ } node.is_passthrough_subdev = has_source && has_sink; + if (has_routes) { + for (unsigned which = V4L2_SUBDEV_FORMAT_TRY; + which <= V4L2_SUBDEV_FORMAT_ACTIVE; which++) { + + sd_routing[which].which = which; + sd_routing[which].routes = (__u64)sd_routes[which]; + sd_routing[which].num_routes = NUM_ROUTES_MAX; + + ret = doioctl(&node, VIDIOC_SUBDEV_G_ROUTING, &sd_routing[which]); + if (ret) { + fail("VIDIOC_SUBDEV_G_ROUTING: failed to get routing\n"); + sd_routing[which].num_routes = 0; + } + } + } + for (unsigned pad = 0; pad < node.entity.pads; pad++) { printf("Sub-Device ioctls (%s Pad %u):\n", (node.pads[pad].flags & MEDIA_PAD_FL_SINK) ?
@@ -1253,32 +1273,82 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ node.has_subdev_enum_fival = 0; for (unsigned which = V4L2_SUBDEV_FORMAT_TRY; which <= V4L2_SUBDEV_FORMAT_ACTIVE; which++) { - printf("\ttest %s VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: %s\n", - which ? "Active" : "Try", - ok(testSubDevEnum(&node, which, pad))); - printf("\ttest %s VIDIOC_SUBDEV_G/S_FMT: %s\n", - which ? "Active" : "Try", - ok(testSubDevFormat(&node, which, pad))); - printf("\ttest %s VIDIOC_SUBDEV_G/S_SELECTION/CROP: %s\n", - which ? "Active" : "Try", - ok(testSubDevSelection(&node, which, pad))); - if (which) - printf("\ttest VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: %s\n", - ok(testSubDevFrameInterval(&node, pad))); + struct v4l2_subdev_routing dummy_routing; + struct v4l2_subdev_route dummy_routes[1]; + + const struct v4l2_subdev_routing *routing; + const struct v4l2_subdev_route *routes; + + if (has_routes) { + routing = &sd_routing[which]; + routes = sd_routes[which]; + } else { + dummy_routing.num_routes = 1; + dummy_routing.routes = (__u64)&dummy_routes; + dummy_routes[0].source_pad = pad; + dummy_routes[0].source_stream = 0; + dummy_routes[0].sink_pad = pad; + dummy_routes[0].sink_stream = 0; + dummy_routes[0].flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE; + + routing = &dummy_routing; + routes = dummy_routes; + } + + for (unsigned i = 0; i < routing->num_routes; ++i) { + const struct v4l2_subdev_route *r = &routes[i]; + unsigned stream; + + if (!(r->flags & V4L2_SUBDEV_ROUTE_FL_ACTIVE)) + continue; + + if ((node.pads[pad].flags & MEDIA_PAD_FL_SINK) && + (r->sink_pad == pad)) + stream = r->sink_stream; + else if ((node.pads[pad].flags & MEDIA_PAD_FL_SOURCE) && + (r->source_pad == pad)) + stream = r->source_stream; + else + continue; + + printf("\t%s Stream %u\n",which ? "Active" : "Try", + stream); + + printf("\ttest %s VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: %s\n", + which ? "Active" : "Try", + ok(testSubDevEnum(&node, which, pad, stream))); + printf("\ttest %s VIDIOC_SUBDEV_G/S_FMT: %s\n", + which ? "Active" : "Try", + ok(testSubDevFormat(&node, which, pad, stream))); + printf("\ttest %s VIDIOC_SUBDEV_G/S_SELECTION/CROP: %s\n", + which ? "Active" : "Try", + ok(testSubDevSelection(&node, which, pad, stream))); + if (which) + printf("\ttest VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: %s\n", + ok(testSubDevFrameInterval(&node, pad, stream))); + } + } + + /* + * These tests do not make sense for subdevs with multiplexed streams, + * as the try & active cases may have different routing and thus different + * behavior. + */ + if (!has_routes) { + if (node.has_subdev_enum_code && node.has_subdev_enum_code < 3) + fail("VIDIOC_SUBDEV_ENUM_MBUS_CODE: try/active mismatch\n"); + if (node.has_subdev_enum_fsize && node.has_subdev_enum_fsize < 3) + fail("VIDIOC_SUBDEV_ENUM_FRAME_SIZE: try/active mismatch\n"); + if (node.has_subdev_enum_fival && node.has_subdev_enum_fival < 3) + fail("VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL: try/active mismatch\n"); + if (node.has_subdev_fmt && node.has_subdev_fmt < 3) + fail("VIDIOC_SUBDEV_G/S_FMT: try/active mismatch\n"); + if (node.has_subdev_selection && node.has_subdev_selection < 3) + fail("VIDIOC_SUBDEV_G/S_SELECTION: try/active mismatch\n"); + if (node.has_subdev_selection && + node.has_subdev_selection != node.has_subdev_fmt) + fail("VIDIOC_SUBDEV_G/S_SELECTION: fmt/selection mismatch\n"); } - if (node.has_subdev_enum_code && node.has_subdev_enum_code < 3) - fail("VIDIOC_SUBDEV_ENUM_MBUS_CODE: try/active mismatch\n"); - if (node.has_subdev_enum_fsize && node.has_subdev_enum_fsize < 3) - fail("VIDIOC_SUBDEV_ENUM_FRAME_SIZE: try/active mismatch\n"); - if (node.has_subdev_enum_fival && node.has_subdev_enum_fival < 3) - fail("VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL: try/active mismatch\n"); - if (node.has_subdev_fmt && node.has_subdev_fmt < 3) - fail("VIDIOC_SUBDEV_G/S_FMT: try/active mismatch\n"); - if (node.has_subdev_selection && node.has_subdev_selection < 3) - fail("VIDIOC_SUBDEV_G/S_SELECTION: try/active mismatch\n"); - if (node.has_subdev_selection && - node.has_subdev_selection != node.has_subdev_fmt) - fail("VIDIOC_SUBDEV_G/S_SELECTION: fmt/selection mismatch\n"); printf("\n"); } }
utils/v4l2-compliance/v4l2-compliance.h +4 -4
@@ -371,10 +371,10 @@ int testDecoder(struct node *node);// SubDev ioctl tests int testSubDevCap (struct node *node); -int testSubDevEnum (struct node *node,unsigned which,unsigned pad); -int testSubDevFormat (struct node *node,unsigned which,unsigned pad); -int testSubDevSelection (struct node *node,unsigned which,unsigned pad); -int testSubDevFrameInterval (struct node *node,unsigned pad); +int testSubDevEnum (struct node *node,unsigned which,unsigned pad,unsigned stream); +int testSubDevFormat (struct node *node,unsigned which,unsigned pad,unsigned stream); +int testSubDevSelection (struct node *node,unsigned which,unsigned pad,unsigned stream); +int testSubDevFrameInterval (struct node *node,unsigned pad,unsigned stream);// Buffer ioctl tests int testReqBufs (struct node *node);
utils/v4l2-compliance/v4l2-test-subdevs.cpp +38 -5
246 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 5/8 v4l2-ctl/compliance: Add simple routing test
In reply to Tomi ValkeinenAdd a simple test for VIDIOC_SUBDEV_G_ROUTING/VIDIOC_SUBDEV_S_ROUTING.
We can't (at least at the moment) really know here what kind of routings the driver would accept, but we can test a VIDIOC_SUBDEV_G_ROUTING call, followed by a VIDIOC_SUBDEV_S_ROUTING call with the routing we received.
Additionally, we can check that the returned pads and flags look fine, and also that setting obviously invalid routing will fail.
--- utils/v4l2-compliance/v4l2-compliance.cpp | 12 +++++ utils/v4l2-compliance/v4l2-compliance.h | 1 + utils/v4l2-compliance/v4l2-test-subdevs.cpp | 78 +++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+)
utils/v4l2-compliance/v4l2-compliance.cpp +12 -0
@@ -1249,6 +1249,18 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ node.is_passthrough_subdev = has_source && has_sink; if (has_routes) { + printf("Sub-Device routing ioctls:\n"); + + for (unsigned which = V4L2_SUBDEV_FORMAT_TRY; + which <= V4L2_SUBDEV_FORMAT_ACTIVE; which++) { + + printf("\ttest %s VIDIOC_SUBDEV_G_ROUTING/VIDIOC_SUBDEV_S_ROUTING: %s\n", + which ? "Active" : "Try", + ok(testSubDevRouting(&node, which))); + } + + printf("\n"); + for (unsigned which = V4L2_SUBDEV_FORMAT_TRY; which <= V4L2_SUBDEV_FORMAT_ACTIVE; which++) {
utils/v4l2-compliance/v4l2-compliance.h +1 -0
@@ -375,6 +375,7 @@ int testSubDevEnum(struct node *node, unsigned which, unsigned pad, unsigned strint testSubDevFormat (struct node *node,unsigned which,unsigned pad,unsigned stream);int testSubDevSelection (struct node *node,unsigned which,unsigned pad,unsigned stream);int testSubDevFrameInterval (struct node *node,unsigned pad,unsigned stream); +int testSubDevRouting (struct node *node,unsigned which);// Buffer ioctl tests int testReqBufs (struct node *node);
utils/v4l2-compliance/v4l2-test-subdevs.cpp +78 -0
81 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v7 6/8 media-ctl: Check for Streams API support
In reply to Tomi ValkeinenUse the new VIDIOC_SUBDEV_S_CLIENT_CAP ioctl to inform the kernel that we support streams, and use the return values of VIDIOC_SUBDEV_S_CLIENT_CAP and VIDIOC_SUBDEV_QUERYCAP to decide if the entity supports streams. If not, return an error in case the user tries to use streams.
--- utils/media-ctl/libv4l2subdev.c | 56 +++++++++++++++++++++++++++++++++++++++++ utils/media-ctl/mediactl-priv.h | 1 + 2 files changed, 57 insertions(+)
utils/media-ctl/libv4l2subdev.c +56 -0
@@ -48,6 +48,12 @@int v4l2_subdev_open (struct media_entity *entity) { +struct v4l2_subdev_client_capability clientcap = {}; +struct v4l2_subdev_capability subdevcap = {}; +bool subdev_streams; +bool client_streams; +int ret; +if (entity->fd !=-1 )return 0 ;
@@ -60,6 +66,16 @@ int v4l2_subdev_open(struct media_entity *entity)return ret; } + ret =ioctl (entity->fd,VIDIOC_SUBDEV_QUERYCAP , &subdevcap); + subdev_streams = !ret && (subdevcap.capabilities &V4L2_SUBDEV_CAP_STREAMS ); + + clientcap.capabilities =V4L2_SUBDEV_CLIENT_CAP_STREAMS ; + + ret =ioctl (entity->fd,VIDIOC_SUBDEV_S_CLIENT_CAP , &clientcap); + client_streams = !ret && (clientcap.capabilities &V4L2_SUBDEV_CLIENT_CAP_STREAMS ); + + entity->supports_streams = subdev_streams && client_streams; +return 0 ; }
@@ -80,6 +96,11 @@ int v4l2_subdev_get_format(struct media_entity *entity,if (ret <0 )return ret; +if (!entity->supports_streams && stream) { +media_dbg (entity->media,"Streams API not supported\n" ); +return -ENOTSUP ; + } +memset (&fmt,0 ,sizeof (fmt)); fmt.pad = pad; fmt.stream = stream;
@@ -105,6 +126,11 @@ int v4l2_subdev_set_format(struct media_entity *entity,if (ret <0 )return ret; +if (!entity->supports_streams && stream) { +media_dbg (entity->media,"Streams API not supported\n" ); +return -ENOTSUP ; + } +memset (&fmt,0 ,sizeof (fmt)); fmt.pad = pad; fmt.stream = stream;
@@ -133,6 +159,11 @@ int v4l2_subdev_get_selection(struct media_entity *entity,if (ret <0 )return ret; +if (!entity->supports_streams && stream) { +media_dbg (entity->media,"Streams API not supported\n" ); +return -ENOTSUP ; + } +memset (&u.sel,0 ,sizeof (u.sel)); u.sel.pad = pad; u.sel.target = target;
@@ -172,6 +203,11 @@ int v4l2_subdev_set_selection(struct media_entity *entity,if (ret <0 )return ret; +if (!entity->supports_streams && stream) { +media_dbg (entity->media,"Streams API not supported\n" ); +return -ENOTSUP ; + } +memset (&u.sel,0 ,sizeof (u.sel)); u.sel.pad = pad; u.sel.stream = stream;
@@ -215,6 +251,11 @@ int v4l2_subdev_get_routing(struct media_entity *entity,if (ret <0 )return ret; +if (!entity->supports_streams) { +media_dbg (entity->media,"Streams API not supported\n" ); +return -ENOTSUP ; + } + ret =ioctl (entity->fd,VIDIOC_SUBDEV_G_ROUTING , &routing);if (ret ==-1 && errno !=ENOSPC )return -errno;
@@ -257,6 +298,11 @@ int v4l2_subdev_set_routing(struct media_entity *entity,if (ret <0 )return ret; +if (!entity->supports_streams) { +media_dbg (entity->media,"Streams API not supported\n" ); +return -ENOTSUP ; + } + ret =ioctl (entity->fd,VIDIOC_SUBDEV_S_ROUTING , &routing);if (ret ==-1 )return -errno;
@@ -347,6 +393,11 @@ int v4l2_subdev_get_frame_interval(struct media_entity *entity,if (ret <0 )return ret; +if (!entity->supports_streams && stream) { +media_dbg (entity->media,"Streams API not supported\n" ); +return -ENOTSUP ; + } +memset (&ival,0 ,sizeof (ival)); ival.pad = pad; ival.stream = stream;
@@ -370,6 +421,11 @@ int v4l2_subdev_set_frame_interval(struct media_entity *entity,if (ret <0 )return ret; +if (!entity->supports_streams && stream) { +media_dbg (entity->media,"Streams API not supported\n" ); +return -ENOTSUP ; + } +memset (&ival,0 ,sizeof (ival)); ival.pad = pad; ival.stream = stream;
utils/media-ctl/mediactl-priv.h +1 -0
@@ -33,6 +33,7 @@ struct media_entity {struct media_link *links;unsigned int max_links;unsigned int num_links; +bool supports_streams;char devname[32 ];int fd;
Signature · 1 line
2.34.1
PATCH v7 7/8 utils/common: Set V4L2_SUBDEV_CLIENT_CAP_STREAMS for subdevs
In reply to Tomi ValkeinenUse the new VIDIOC_SUBDEV_S_CLIENT_CAP ioctl to inform the kernel that we support streams, and use the return values of VIDIOC_SUBDEV_S_CLIENT_CAP and VIDIOC_SUBDEV_QUERYCAP to decide if the entity supports streams.
--- utils/common/cv4l-helpers.h | 1 + utils/common/v4l-helpers.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+)
utils/common/cv4l-helpers.h +1 -0
@@ -82,6 +82,7 @@ public: bool has_rw() const { return v4l_has_rw(this); } bool has_streaming() const { return v4l_has_streaming(this); } bool has_ext_pix_format() const { return v4l_has_ext_pix_format(this); } + bool has_streams() const { return have_streams; } int querycap(v4l2_capability &cap, bool force = false) {
utils/common/v4l-helpers.h +18 -0
@@ -9,6 +9,7 @@#ifndef _V4L_HELPERS_H_#define _V4L_HELPERS_H_ +#include <linux/v4l2-subdev.h> #include <linux/videodev2.h> #include <string.h> #include <stdlib.h>
@@ -39,6 +40,7 @@ struct v4l_fd {bool have_selection;bool is_subdev;bool is_media; +bool have_streams;int (*open)(struct v4l_fd *f,const char *file,int oflag, ...);int (*close)(struct v4l_fd *f);
@@ -507,6 +509,12 @@ static inline int v4l_open(struct v4l_fd *f, const char *devname, bool non_blockstatic inline int v4l_subdev_s_fd (struct v4l_fd *f,int fd,const char *devname) { +struct v4l2_subdev_client_capability clientcap = {}; +struct v4l2_subdev_capability subdevcap = {}; +bool subdev_streams; +bool client_streams; +int ret; +if (f->fd >=0 ) f->close (f);
@@ -528,6 +536,16 @@ static inline int v4l_subdev_s_fd(struct v4l_fd *f, int fd, const char *devname) f->have_next_ctrl = false; f->have_selection = false; + ret =ioctl (f->fd,VIDIOC_SUBDEV_QUERYCAP , &subdevcap); + subdev_streams = !ret && (subdevcap.capabilities &V4L2_SUBDEV_CAP_STREAMS ); + + clientcap.capabilities =V4L2_SUBDEV_CLIENT_CAP_STREAMS ; + + ret =ioctl (f->fd,VIDIOC_SUBDEV_S_CLIENT_CAP , &clientcap); + client_streams = !ret && (clientcap.capabilities &V4L2_SUBDEV_CLIENT_CAP_STREAMS ); + + f->have_streams = subdev_streams && client_streams; +return f->fd; }
Signature · 1 line
2.34.1
PATCH v7 8/8 v4l2-ctl: Check for Streams API support
In reply to Tomi ValkeinenReturn an error if the user tries to use streams related features, but streams are not supported.
--- utils/v4l2-ctl/v4l2-ctl-subdev.cpp | 55 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)
utils/v4l2-ctl/v4l2-ctl-subdev.cpp +55 -0
@@ -562,6 +562,11 @@ void subdev_set(cv4l_fd &_fd) if (options[OptSetSubDevFormat] || options[OptTrySubDevFormat]) { struct v4l2_subdev_format fmt; + if (!_fd.has_streams() && set_fmt_stream) { + printf("Streams API not supported.\n"); + return; + } + memset(&fmt, 0, sizeof(fmt)); fmt.pad = set_fmt_pad; fmt.stream = set_fmt_stream;
@@ -610,6 +615,11 @@ void subdev_set(cv4l_fd &_fd) if (options[OptSetSubDevSelection] || options[OptTrySubDevSelection]) { struct v4l2_subdev_selection sel; + if (!_fd.has_streams() && vsel.stream) { + printf("Streams API not supported.\n"); + return; + } + memset(&sel, 0, sizeof(sel)); sel.pad = vsel.pad; sel.stream = vsel.stream;
@@ -642,6 +652,11 @@ void subdev_set(cv4l_fd &_fd) if (options[OptSetSubDevFPS]) { struct v4l2_subdev_frame_interval fival; + if (!_fd.has_streams() && set_fps_stream) { + printf("Streams API not supported.\n"); + return; + } + memset(&fival, 0, sizeof(fival)); fival.pad = set_fps_pad; fival.stream = set_fps_stream;
@@ -667,6 +682,11 @@ void subdev_set(cv4l_fd &_fd) } } if (options[OptSetRouting]) { + if (!_fd.has_streams()) { + printf("Streams API not supported.\n"); + return; + } + if (doioctl(fd, VIDIOC_SUBDEV_S_ROUTING, &routing) == 0) printf("Routing set\n"); }
@@ -724,6 +744,11 @@ void subdev_get(cv4l_fd &_fd) if (options[OptGetSubDevFormat]) { struct v4l2_subdev_format fmt; + if (!_fd.has_streams() && get_fmt_stream) { + printf("Streams API not supported.\n"); + return; + } + memset(&fmt, 0, sizeof(fmt)); fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; fmt.pad = get_fmt_pad;
@@ -738,6 +763,11 @@ void subdev_get(cv4l_fd &_fd) struct v4l2_subdev_selection sel; unsigned idx = 0; + if (!_fd.has_streams() && get_sel_stream) { + printf("Streams API not supported.\n"); + return; + } + memset(&sel, 0, sizeof(sel)); sel.which = V4L2_SUBDEV_FORMAT_ACTIVE; sel.pad = get_sel_pad;
@@ -760,6 +790,11 @@ void subdev_get(cv4l_fd &_fd) if (options[OptGetSubDevFPS]) { struct v4l2_subdev_frame_interval fival; + if (!_fd.has_streams() && get_fps_stream) { + printf("Streams API not supported.\n"); + return; + } + memset(&fival, 0, sizeof(fival)); fival.pad = get_fps_pad; fival.stream = get_fps_stream;
@@ -777,6 +812,11 @@ void subdev_get(cv4l_fd &_fd) } if (options[OptGetRouting]) { + if (!_fd.has_streams()) { + printf("Streams API not supported.\n"); + return; + } + memset(&routing, 0, sizeof(routing)); memset(routes, 0, sizeof(routes[0]) * NUM_ROUTES_MAX); routing.which = V4L2_SUBDEV_FORMAT_ACTIVE;
@@ -860,11 +900,21 @@ void subdev_list(cv4l_fd &_fd) int fd = _fd.g_fd(); if (options[OptListSubDevMBusCodes]) { + if (!_fd.has_streams() && list_mbus_codes_stream) { + printf("Streams API not supported.\n"); + return; + } + printf("ioctl: VIDIOC_SUBDEV_ENUM_MBUS_CODE (pad=%u,stream=%u)\n", list_mbus_codes_pad, list_mbus_codes_stream); print_mbus_codes(fd, list_mbus_codes_pad, list_mbus_codes_stream); } if (options[OptListSubDevFrameSizes]) { + if (!_fd.has_streams() && frmsize.stream) { + printf("Streams API not supported.\n"); + return; + } + printf("ioctl: VIDIOC_SUBDEV_ENUM_FRAME_SIZE (pad=%u,stream=%u)\n", frmsize.pad, frmsize.stream); frmsize.index = 0;
@@ -875,6 +925,11 @@ void subdev_list(cv4l_fd &_fd) } } if (options[OptListSubDevFrameIntervals]) { + if (!_fd.has_streams() && frmival.stream) { + printf("Streams API not supported.\n"); + return; + } + printf("ioctl: VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL (pad=%u,stream=%u)\n", frmival.pad, frmival.stream); frmival.index = 0;
Signature · 1 line
2.34.1