[libcamera-devel] [PATCH 1/1] cam: Add Rectangle type parsing in capture script

[Daniel Semkowicz]

On Wed, Jun 22, 2022 at 6:02 PM Daniel Semkowicz <dse at thaumatec.com> wrote:
>
> This change is required for AfWindows control from capture script.
> Parser expects array of arrays of parameters, so it is possible to
> specify multiple rectangles.
> ---
>  src/cam/capture_script.cpp | 104 +++++++++++++++++++++++++++++++++----
>  src/cam/capture_script.h   |   9 +++-
>  2 files changed, 102 insertions(+), 11 deletions(-)
>
> diff --git a/src/cam/capture_script.cpp b/src/cam/capture_script.cpp
> index 9f22d5f7..ff620abd 100644
> --- a/src/cam/capture_script.cpp
> +++ b/src/cam/capture_script.cpp
> @@ -232,12 +232,19 @@ int CaptureScript::parseControl(EventPtr event, ControlList &controls)
>                 return -EINVAL;
>         }
>
> -       std::string value = parseScalar();
> -       if (value.empty())
> -               return -EINVAL;
> -
>         const ControlId *controlId = it->second;
> -       ControlValue val = unpackControl(controlId, value);
> +       ControlValue val;
> +
> +       if (controlId->type() == ControlTypeRectangle) {
> +               int result = parseRectangles(val);
> +               if (result)
> +                       return result;
> +       } else {
> +               int result = parseBasicType(controlId, val);
> +               if (result)
> +                       return result;
> +       }
> +
>         controls.set(controlId->id(), val);
>
>         return 0;
> @@ -252,6 +259,77 @@ std::string CaptureScript::parseScalar()
>         return eventScalarValue(event);
>  }
>
> +int CaptureScript::parseBasicType(const ControlId *id, ControlValue &controlValue)
> +{
> +       std::string value = parseScalar();
> +       if (value.empty())
> +               return -EINVAL;
> +
> +       controlValue = unpackBasicType(id, value);
> +
> +       return 0;
> +}
> +
> +int CaptureScript::parseRectangles(libcamera::ControlValue &controlValue)
> +{
> +       std::vector<libcamera::Rectangle> rectangles;
> +
> +       EventPtr event = nextEvent(YAML_SEQUENCE_START_EVENT);
> +       if (!event)
> +               return -EINVAL;
> +
> +       while (1) {
> +               event = nextEvent();
> +               if (!event)
> +                       return -EINVAL;
> +
> +               if (event->type == YAML_SEQUENCE_END_EVENT) {
> +                       break;
> +               }
> +
> +               if (event->type != YAML_SEQUENCE_START_EVENT) {
> +                       return -EINVAL;
> +               }
> +
> +               std::vector<std::string> values = parseArray();
> +               if (values.size() != 4) {
> +                       std::cerr << "Error parsing Rectangle: "
> +                                 << "expected array with 4 parameters"
> +                                 << std::endl;
> +                       return -EINVAL;
> +               }
> +
> +               Rectangle rect = unpackRectangle(values);
> +               rectangles.push_back(rect);
> +       }
> +
> +       controlValue.set(Span<const Rectangle>(rectangles));
> +
> +       return 0;
> +}
> +
> +std::vector<std::string> CaptureScript::parseArray()
> +{
> +       std::vector<std::string> values;
> +
> +       while (1) {
> +               EventPtr event = nextEvent();
> +               if (!event)
> +                       break;
> +
> +               if (event->type != YAML_SCALAR_EVENT) {
> +                       break;
> +               }
> +
> +               std::string value = eventScalarValue(event);
> +               values.push_back(value);
> +               if (value.empty())
> +                       break;
> +       }
> +
> +       return values;
> +}
> +
>  void CaptureScript::unpackFailure(const ControlId *id, const std::string &repr)
>  {
>         static const std::map<unsigned int, const char *> typeNames = {
> @@ -277,7 +355,7 @@ void CaptureScript::unpackFailure(const ControlId *id, const std::string &repr)
>                   << typeName << " control " << id->name() << std::endl;
>  }
>
> -ControlValue CaptureScript::unpackControl(const ControlId *id,
> +ControlValue CaptureScript::unpackBasicType(const ControlId *id,
>                                           const std::string &repr)
>  {
>         ControlValue value{};
> @@ -325,12 +403,20 @@ ControlValue CaptureScript::unpackControl(const ControlId *id,
>                 break;
>         }
>         case ControlTypeRectangle:
> -               /* \todo Parse rectangles. */
> -               break;
>         case ControlTypeSize:
> -               /* \todo Parse Sizes. */
> +               unpackFailure(id, repr);
>                 break;
>         }
>
>         return value;
>  }
> +
> +libcamera::Rectangle CaptureScript::unpackRectangle(const std::vector<std::string> &strVec)
> +{
> +       int x = strtol(strVec[0].c_str(), NULL, 10);
> +       int y = strtol(strVec[1].c_str(), NULL, 10);
> +       unsigned int width = strtoul(strVec[2].c_str(), NULL, 10);
> +       unsigned int height = strtoul(strVec[3].c_str(), NULL, 10);
> +
> +       return Rectangle(x, y, width, height);
> +}
> diff --git a/src/cam/capture_script.h b/src/cam/capture_script.h
> index 8b4f8f62..73b7e101 100644
> --- a/src/cam/capture_script.h
> +++ b/src/cam/capture_script.h
> @@ -52,11 +52,16 @@ private:
>         int parseFrames();
>         int parseFrame(EventPtr event);
>         int parseControl(EventPtr event, libcamera::ControlList &controls);
> +       int parseBasicType(const libcamera::ControlId *id,
> +                          libcamera::ControlValue &controlValue);
> +       int parseRectangles(libcamera::ControlValue &controlValue);
>
>         std::string parseScalar();
> +       std::vector<std::string> parseArray();
>
>         void unpackFailure(const libcamera::ControlId *id,
>                            const std::string &repr);
> -       libcamera::ControlValue unpackControl(const libcamera::ControlId *id,
> -                                             const std::string &repr);
> +       libcamera::ControlValue unpackBasicType(const libcamera::ControlId *id,
> +                                               const std::string &repr);
> +       libcamera::Rectangle unpackRectangle(const std::vector<std::string> &strVec);
>  };
> --
> 2.34.1
>


Sorry, I forgot to sign-off this commit... I will fix this after
review with any additional corrections

Best regards

Daniel