Skip to content

Commit 4a2ebf8

Browse files
Kmeid Saadpmai
authored andcommitted
Extend CameraSensorViewConfiguration formats
Updated CameraSensorViewConfiguration Message extended the channel formats and added several fields to CameraSensorViewConfiguration. Updated field numbers to ensure backward compatibility. Signed-off-by: Kmeid Saad <kmeid.saad@ansys.com>
1 parent b56641b commit 4a2ebf8

File tree

1 file changed

+105
-6
lines changed

1 file changed

+105
-6
lines changed

osi_sensorviewconfiguration.proto

Lines changed: 105 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ message CameraSensorViewConfiguration
686686
//
687687
optional uint32 number_of_pixels_vertical = 7;
688688

689-
// Format for image data (includes number, kind and format of channels).
689+
// Format for image data (includes number, kind and format of channels).
690690
//
691691
// In the message provided by the sensor model, this field can
692692
// be repeated and all values are acceptable to the model, with
@@ -701,7 +701,7 @@ message CameraSensorViewConfiguration
701701
// cannot provide image data in one of the requested formats.
702702
//
703703
// \rules
704-
// is_greater_than_or_equal_to: 1
704+
// is_greater_than_or_equal_to: 1
705705
// \endrules
706706
//
707707
repeated ChannelFormat channel_format = 8;
@@ -752,27 +752,126 @@ message CameraSensorViewConfiguration
752752
//
753753
CHANNEL_FORMAT_RGB_F32_LIN = 9;
754754

755-
// Bayer RGGB Channels UINT8 FP Linear.
755+
// Bayer BGGR Channels UINT8 FP Linear.
756756
//
757757
CHANNEL_FORMAT_BAYER_BGGR_U8_LIN = 10;
758758

759-
// Bayer RGGB Channels UINT16 FP Linear.
759+
// Bayer BGGR Channels UINT16 FP Linear.
760760
//
761761
CHANNEL_FORMAT_BAYER_BGGR_U16_LIN = 11;
762762

763-
// Bayer RGGB Channels UINT32 FP Linear.
763+
// Bayer BGGR Channels UINT32 FP Linear.
764764
//
765765
CHANNEL_FORMAT_BAYER_BGGR_U32_LIN = 12;
766766

767-
// Bayer RGGB Channels Single Precision FP Linear.
767+
// Bayer BGGR Channels Single Precision FP Linear.
768768
//
769769
CHANNEL_FORMAT_BAYER_BGGR_F32_LIN = 13;
770770

771+
// Bayer RGGB Channels UINT8 FP Linear.
772+
//
773+
CHANNEL_FORMAT_BAYER_RGGB_U8_LIN = 14;
774+
775+
// Bayer RGGB Channels UINT16 FP Linear.
776+
//
777+
CHANNEL_FORMAT_BAYER_RGGB_U16_LIN = 15;
778+
779+
// Bayer RGGB Channels UINT32 FP Linear.
780+
//
781+
CHANNEL_FORMAT_BAYER_RGGB_U32_LIN = 16;
782+
783+
// Bayer RGGB Channels Single Precision FP Linear.
784+
//
785+
CHANNEL_FORMAT_BAYER_RGGB_F32_LIN = 17;
786+
787+
// Read Clear Clear Clear Channels UINT8 FP Linear.
788+
//
789+
CHANNEL_FORMAT_RCCC_U8_LIN = 18;
790+
791+
// Read Clear Clear Clear Channels UINT16 FP Linear.
792+
//
793+
CHANNEL_FORMAT_RCCC_U16_LIN = 19;
794+
795+
// Read Clear Clear Clear Channels UINT32 FP Linear.
796+
//
797+
CHANNEL_FORMAT_RCCC_U32_LIN = 20;
798+
799+
// Read Clear Clear Clear Channels Single Precision FP Linear.
800+
//
801+
CHANNEL_FORMAT_RCCC_F32_LIN = 21;
802+
803+
// Read Clear Clear Blue Channels UINT8 FP Linear.
804+
//
805+
CHANNEL_FORMAT_RCCB_U8_LIN = 22;
806+
807+
// Read Clear Clear Blue Channels UINT16 FP Linear.
808+
//
809+
CHANNEL_FORMAT_RCCB_U16_LIN = 23;
810+
811+
// Read Clear Clear Blue Channels UINT32 FP Linear.
812+
//
813+
CHANNEL_FORMAT_RCCB_U32_LIN = 24;
814+
815+
// Read Clear Clear Blue Channels Single Precision FP Linear.
816+
//
817+
CHANNEL_FORMAT_RCCB_F32_LIN = 25;
818+
819+
771820
// TBD: Further channel permutations and padding (e.g. RGBZ,
772821
// BGR, BAYER_RGGB/GBRG/GRBG/...), non-BAYER filters, non-linear
773822
// encodings, ...
774823
}
775824

825+
// Number of samples per pixel.
826+
//
827+
// \note This is a characteristic of the ray tracing engine of the
828+
// environment simulation, not a direct characteristic of the sensor.
829+
//
830+
// \rules
831+
// is_greater_than_or_equal_to: 1
832+
// \endrules
833+
//
834+
optional uint32 samples_per_pixel = 9;
835+
836+
// Maximum number of interactions to take into account.
837+
//
838+
// \note This is a characteristic of the ray tracing engine of the
839+
// environment simulation, not a direct characteristic of the sensor.
840+
//
841+
// \rules
842+
// is_greater_than_or_equal_to: 1
843+
// \endrules
844+
//
845+
optional uint32 max_number_of_interactions = 10;
846+
847+
// In use-cases where a spectral ray-tracer is used, this message determines the range of the wavelength
848+
// and its desired number of samples.
849+
//
850+
optional WavelengthData wavelength_data = 11;
851+
852+
// \brief Detailed WavelengthRange message.
853+
//
854+
// Defines the start (minimum) and the end (maximum) values of the wavelength.
855+
// Additionally, the number of samples within this range is defined in this message.
856+
//
857+
message WavelengthData
858+
{
859+
// The start, or the minimum, wavelength to be considered by the spectral ray tracer.
860+
//
861+
// Unit: nm
862+
//
863+
optional uint32 start = 1;
864+
865+
// The end, or the maximum, wavelength to be considered by the spectral ray tracer.
866+
// Unit: nm
867+
//
868+
optional uint32 end = 2;
869+
870+
// Number of samples to be considered withing the defined wavelength range.
871+
//
872+
optional uint32 samples_number = 3;
873+
}
874+
776875
// TBD: Optical (and other) effects to apply to image, etc.
777876
//
778877
}

0 commit comments

Comments
 (0)