[libcamera-devel] [PATCH 2/6] libcamera: color_space: Reorder members in the same order as the header
Umang Jain
umang.jain at ideasonboard.com
Wed Aug 24 01:21:34 CEST 2022
hi Laurent,
Thank you for the patch
On 8/23/22 11:13 PM, Laurent Pinchart via libcamera-devel wrote:
> Sort the members of the ColorSpace class in color_space.cpp to match the
> color_space.h order. No functional change intended.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain at ideasonboard.com>
> ---
> src/libcamera/color_space.cpp | 168 +++++++++++++++++-----------------
> 1 file changed, 84 insertions(+), 84 deletions(-)
>
> diff --git a/src/libcamera/color_space.cpp b/src/libcamera/color_space.cpp
> index f0d6109ac4fb..1b2dd2404452 100644
> --- a/src/libcamera/color_space.cpp
> +++ b/src/libcamera/color_space.cpp
> @@ -124,6 +124,90 @@ namespace libcamera {
> * \param[in] r The range of the pixel values in this color space
> */
>
> +/**
> + * \brief A constant representing a raw color space (from a sensor)
> + */
> +const ColorSpace ColorSpace::Raw = {
> + Primaries::Raw,
> + TransferFunction::Linear,
> + YcbcrEncoding::None,
> + Range::Full
> +};
> +
> +/**
> + * \brief A constant representing the sRGB color space
> + *
> + * This is identical to the sYCC color space except that the Y'CbCr
> + * range is limited rather than full.
> + */
> +const ColorSpace ColorSpace::Srgb = {
> + Primaries::Rec709,
> + TransferFunction::Srgb,
> + YcbcrEncoding::Rec601,
> + Range::Limited
> +};
> +
> +/**
> + * \brief A constant representing the sYCC color space, typically used for
> + * encoding JPEG images
> + */
> +const ColorSpace ColorSpace::Sycc = {
> + Primaries::Rec709,
> + TransferFunction::Srgb,
> + YcbcrEncoding::Rec601,
> + Range::Full
> +};
> +
> +/**
> + * \brief A constant representing the SMPTE170M color space
> + */
> +const ColorSpace ColorSpace::Smpte170m = {
> + Primaries::Smpte170m,
> + TransferFunction::Rec709,
> + YcbcrEncoding::Rec601,
> + Range::Limited
> +};
> +
> +/**
> + * \brief A constant representing the Rec.709 color space
> + */
> +const ColorSpace ColorSpace::Rec709 = {
> + Primaries::Rec709,
> + TransferFunction::Rec709,
> + YcbcrEncoding::Rec709,
> + Range::Limited
> +};
> +
> +/**
> + * \brief A constant representing the Rec.2020 color space
> + */
> +const ColorSpace ColorSpace::Rec2020 = {
> + Primaries::Rec2020,
> + TransferFunction::Rec709,
> + YcbcrEncoding::Rec2020,
> + Range::Limited
> +};
> +
> +/**
> + * \var ColorSpace::primaries
> + * \brief The color primaries of this color space
> + */
> +
> +/**
> + * \var ColorSpace::transferFunction
> + * \brief The transfer function used by this color space
> + */
> +
> +/**
> + * \var ColorSpace::ycbcrEncoding
> + * \brief The Y'CbCr encoding used by this color space
> + */
> +
> +/**
> + * \var ColorSpace::range
> + * \brief The pixel range used with by color space
> + */
> +
> /**
> * \brief Assemble and return a readable string representation of the
> * ColorSpace
> @@ -219,90 +303,6 @@ std::string ColorSpace::toString(const std::optional<ColorSpace> &colorSpace)
> return colorSpace->toString();
> }
>
> -/**
> - * \var ColorSpace::primaries
> - * \brief The color primaries of this color space
> - */
> -
> -/**
> - * \var ColorSpace::transferFunction
> - * \brief The transfer function used by this color space
> - */
> -
> -/**
> - * \var ColorSpace::ycbcrEncoding
> - * \brief The Y'CbCr encoding used by this color space
> - */
> -
> -/**
> - * \var ColorSpace::range
> - * \brief The pixel range used with by color space
> - */
> -
> -/**
> - * \brief A constant representing a raw color space (from a sensor)
> - */
> -const ColorSpace ColorSpace::Raw = {
> - Primaries::Raw,
> - TransferFunction::Linear,
> - YcbcrEncoding::None,
> - Range::Full
> -};
> -
> -/**
> - * \brief A constant representing the sRGB color space
> - *
> - * This is identical to the sYCC color space except that the Y'CbCr
> - * range is limited rather than full.
> - */
> -const ColorSpace ColorSpace::Srgb = {
> - Primaries::Rec709,
> - TransferFunction::Srgb,
> - YcbcrEncoding::Rec601,
> - Range::Limited
> -};
> -
> -/**
> - * \brief A constant representing the sYCC color space, typically used for
> - * encoding JPEG images
> - */
> -const ColorSpace ColorSpace::Sycc = {
> - Primaries::Rec709,
> - TransferFunction::Srgb,
> - YcbcrEncoding::Rec601,
> - Range::Full
> -};
> -
> -/**
> - * \brief A constant representing the SMPTE170M color space
> - */
> -const ColorSpace ColorSpace::Smpte170m = {
> - Primaries::Smpte170m,
> - TransferFunction::Rec709,
> - YcbcrEncoding::Rec601,
> - Range::Limited
> -};
> -
> -/**
> - * \brief A constant representing the Rec.709 color space
> - */
> -const ColorSpace ColorSpace::Rec709 = {
> - Primaries::Rec709,
> - TransferFunction::Rec709,
> - YcbcrEncoding::Rec709,
> - Range::Limited
> -};
> -
> -/**
> - * \brief A constant representing the Rec.2020 color space
> - */
> -const ColorSpace ColorSpace::Rec2020 = {
> - Primaries::Rec2020,
> - TransferFunction::Rec709,
> - YcbcrEncoding::Rec2020,
> - Range::Limited
> -};
> -
> /**
> * \brief Compare color spaces for equality
> * \return True if the two color spaces are identical, false otherwise
More information about the libcamera-devel
mailing list