[libcamera-devel] [PATCH] libcamera: ipa: Move IPA control serialization structures to libcamera namespace

paul.elder at ideasonboard.com paul.elder at ideasonboard.com
Fri May 27 14:11:08 CEST 2022


On Wed, May 25, 2022 at 01:25:33PM +0300, Laurent Pinchart via libcamera-devel wrote:
> The C structures used to serialize controls are currently defined in the
> root namespace, which places them at the root level in the class list
> generated by Doxygen. Move them to the libcamera namespace to fix that.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Reviewed-by: Paul Elder <paul.elder at ideasonboard.com>

> ---
>  include/libcamera/ipa/ipa_controls.h | 4 ++++
>  src/libcamera/ipa_controls.cpp       | 4 ++++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/include/libcamera/ipa/ipa_controls.h b/include/libcamera/ipa/ipa_controls.h
> index da1a759618e0..e5da1946ce1d 100644
> --- a/include/libcamera/ipa/ipa_controls.h
> +++ b/include/libcamera/ipa/ipa_controls.h
> @@ -10,6 +10,8 @@
>  #include <stdint.h>
>  
>  #ifdef __cplusplus
> +namespace libcamera {
> +
>  extern "C" {
>  #endif
>  
> @@ -48,5 +50,7 @@ struct ipa_control_info_entry {
>  };
>  
>  #ifdef __cplusplus
> +} /* namespace libcamera */
> +
>  }
>  #endif
> diff --git a/src/libcamera/ipa_controls.cpp b/src/libcamera/ipa_controls.cpp
> index c3489bbff646..870a443b0f38 100644
> --- a/src/libcamera/ipa_controls.cpp
> +++ b/src/libcamera/ipa_controls.cpp
> @@ -131,6 +131,8 @@
>   * shall be ignored when parsing the packet.
>   */
>  
> +namespace libcamera {
> +
>  /**
>   * \def IPA_CONTROLS_FORMAT_VERSION
>   * \brief The current control serialization format version
> @@ -224,3 +226,5 @@ static_assert(sizeof(ipa_control_value_entry) == 16,
>  
>  static_assert(sizeof(ipa_control_info_entry) == 16,
>  	      "Invalid ABI size change for struct ipa_control_info_entry");
> +
> +} /* namespace libcamera */
> 
> base-commit: 3e7f54a3128d8143afb200d626d3b208d493623a


More information about the libcamera-devel mailing list