Skip to content

Commit 0819913

Browse files
ClemensLinnhoffpmai
authored andcommitted
Changed pixel order enum for explicit definition; adjusted documentation
Signed-off-by: ClemensLinnhoff <clemens.linnhoff@persival.de>
1 parent f63077f commit 0819913

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

osi_sensorview.proto

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,7 @@ message CameraSensorView
314314
// Raw image data.
315315
//
316316
// The raw image data in the memory layout specified by the camera sensor
317-
// input configuration. Default pixel order is left-to-right, top-to-bottom
318-
// (think of scan lines in a TV), but modifications can be
319-
// requested/indicated in CameraSensorViewConfiguration.pixel_order.
317+
// input configuration. The pixel order is specified in CameraSensorViewConfiguration.pixel_order with the default value PIXEL_ORDER_LEFT_RIGHT_TOP_BOTTOM.
320318
//
321319
optional bytes image_data = 2;
322320
}

osi_sensorviewconfiguration.proto

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -731,9 +731,9 @@ message CameraSensorViewConfiguration
731731

732732
// Indicates if and how the the pixel data is ordered
733733
//
734-
// By default, the pixel data is is left-to-right, top-to-bottom.
734+
// The default value is PIXEL_ORDER_LEFT_RIGHT_TOP_BOTTOM.
735735
//
736-
// \note for rotations of the pixel data, use the camera coordinate system.
736+
// \note For rotations of the pixel data, use the camera coordinate system.
737737
//
738738
optional PixelOrder pixel_order = 12;
739739

@@ -742,9 +742,8 @@ message CameraSensorViewConfiguration
742742
// Pixel layout documents the order of pixels in the \c image_data
743743
// in CameraSensorView.
744744
//
745-
// \note this enum does not contain an entry to do mirroring upside down
746-
// and left-to-right at the same time, because this is equivalent to a
747-
// 180-degree rotation, which should be indicated in the sensor coordinate
745+
// \note this enum does not contain an entry for right-to-left and bottom-to-top, because this is equivalent to a
746+
// 180-degree rotation of the default, which should be indicated in the sensor coordinate
748747
// system.
749748
//
750749
enum PixelOrder
@@ -759,20 +758,17 @@ message CameraSensorViewConfiguration
759758
//
760759
PIXEL_ORDER_OTHER = 1;
761760

762-
// Pixel data is not mirrored (Default).
763-
// Pixels are ordered left-to-right, top-to-bottom
761+
// Pixels are ordered left-to-right, top-to-bottom (default)
764762
//
765-
PIXEL_ORDER_DEFAULT = 2;
766-
767-
// Pixel data is mirrored along the vertical axis.
768-
// The image is mirrored left-to-right.
763+
PIXEL_ORDER_LEFT_RIGHT_TOP_BOTTOM = 2;
764+
765+
// Pixels are ordered right-to-left, top-to-bottom
769766
//
770-
PIXEL_ORDER_MIRRORED_LEFT_RIGHT = 3;
771-
772-
// Pixel data is mirrored along the horizontal axis.
773-
// The image is mirrored top-to-bottom.
774-
//
775-
PIXEL_ORDER_MIRRORED_UP_DOWN = 4;
767+
PIXEL_ORDER_RIGHT_LEFT_TOP_BOTTOM = 3;
768+
769+
// Pixels are ordered left-to-right, bottom-to-top
770+
//
771+
PIXEL_ORDER_LEFT_RIGHT_BOTTOM_TOP = 4;
776772
}
777773

778774

0 commit comments

Comments
 (0)