| Message ID | 20220620210658.20288-3-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Commit | 9007d37939b971930252fd74b973b0d9c0c83eed |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, On Tue, Jun 21, 2022 at 12:06:56AM +0300, Laurent Pinchart via libcamera-devel wrote: > With sensors supporting crop, the regexp used to parse the media-ctl > output isn't correct as the pad configuration may span multiple lines > and contain other parameters. Fix it. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> > --- > utils/rkisp1/rkisp1-capture.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/rkisp1/rkisp1-capture.sh b/utils/rkisp1/rkisp1-capture.sh > index d5ebe5b1d1ba..eee6b8027261 100755 > --- a/utils/rkisp1/rkisp1-capture.sh > +++ b/utils/rkisp1/rkisp1-capture.sh > @@ -51,7 +51,7 @@ get_sensor_format() { > local format > local sensor=$1 > > - format=$($mediactl --get-v4l2 "'$sensor':0" | sed 's/\[\([^ ]*\).*/\1/') > + format=$($mediactl --get-v4l2 "'$sensor':0" | grep 'fmt:' | sed 's/.*\(fmt:\S*\).*/\1/') > sensor_mbus_code=$(echo $format | sed 's/fmt:\([A-Z0-9_]*\).*/\1/') > sensor_size=$(echo $format | sed 's/[^\/]*\/\([0-9x]*\).*/\1/') > > --
diff --git a/utils/rkisp1/rkisp1-capture.sh b/utils/rkisp1/rkisp1-capture.sh index d5ebe5b1d1ba..eee6b8027261 100755 --- a/utils/rkisp1/rkisp1-capture.sh +++ b/utils/rkisp1/rkisp1-capture.sh @@ -51,7 +51,7 @@ get_sensor_format() { local format local sensor=$1 - format=$($mediactl --get-v4l2 "'$sensor':0" | sed 's/\[\([^ ]*\).*/\1/') + format=$($mediactl --get-v4l2 "'$sensor':0" | grep 'fmt:' | sed 's/.*\(fmt:\S*\).*/\1/') sensor_mbus_code=$(echo $format | sed 's/fmt:\([A-Z0-9_]*\).*/\1/') sensor_size=$(echo $format | sed 's/[^\/]*\/\([0-9x]*\).*/\1/')
With sensors supporting crop, the regexp used to parse the media-ctl output isn't correct as the pad configuration may span multiple lines and contain other parameters. Fix it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- utils/rkisp1/rkisp1-capture.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)