Skip to content

Commit 56d0c15

Browse files
committed
Fixed enum style, unknow=, other=, etc,
1 parent 70d5b01 commit 56d0c15

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

osi_modelinternal.proto

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ message ModelInternalObject
4040
//
4141
enum ObjectType
4242
{
43-
// Object is a ghost object and does not exist in ground truth.
43+
// The object type is unknown. Value must not be used in ground truth.
4444
//
45-
OBJECT_TYPE_GHOST = 0;
45+
OBJECT_TYPE_UNKNOWN = 0;
4646

4747
// Other (unspecified but known) type of object.
4848
//
@@ -67,5 +67,9 @@ message ModelInternalObject
6767
// Object of type \c TrafficLight.
6868
//
6969
OBJECT_TYPE_TRAFFIC_LIGHT = 6;
70+
71+
// Object is a ghost object and does not exist in ground truth.
72+
//
73+
OBJECT_TYPE_GHOST = 7;
7074
}
7175
}

osi_object.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ message MovingObject
260260

261261
// Definition of object types.
262262
//
263-
enum Type {
263+
enum Type
264+
{
264265
// Type of the object is unknown (must not be used in ground truth).
265266
//
266267
TYPE_UNKNOWN = 0;

osi_sensorviewconfiguration.proto

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -508,54 +508,59 @@ message CameraSensorViewConfiguration
508508
// Type of channel format is unknown (must not be used).
509509
//
510510
FORMAT_UNKNOWN = 0;
511+
512+
// Unspecified but known channel format.
513+
// Consider proposing an additional format if using FORMAT_OTHER.
514+
//
515+
FORMAT_OTHER = 1;
511516

512517
// Single Luminance Channel UINT8 Linear
513518
//
514-
FORMAT_MONO_U8_LIN = 1;
519+
FORMAT_MONO_U8_LIN = 2;
515520

516521
// Single Luminance Channel UINT16 Linear
517522
//
518-
FORMAT_MONO_U16_LIN = 2;
523+
FORMAT_MONO_U16_LIN = 3;
519524

520525
// Single Luminance Channel UINT32 Linear
521526
//
522-
FORMAT_MONO_U32_LIN = 3;
527+
FORMAT_MONO_U32_LIN = 4;
523528

524529
// Single Luminance Channel Single Precision FP Linear
525530
//
526-
FORMAT_MONO_F32_LIN = 4;
531+
FORMAT_MONO_F32_LIN = 5;
527532

528533
// Packed RGB Channels (no padding) UINT8 Linear
529534
//
530-
FORMAT_RGB_U8_LIN = 5;
535+
FORMAT_RGB_U8_LIN = 6;
531536

532537
// Packed RGB Channels (no padding) UINT16 Linear
533538
//
534-
FORMAT_RGB_U16_LIN = 6;
539+
FORMAT_RGB_U16_LIN = 7;
535540

536541
// Packed RGB Channels (no padding) UINT32 Linear
537542
//
538-
FORMAT_RGB_U32_LIN = 7;
543+
FORMAT_RGB_U32_LIN = 8;
539544

540545
// Packed RGB Channels (no padding) Single Precision FP Linear
541546
//
542-
FORMAT_RGB_F32_LIN = 8;
547+
FORMAT_RGB_F32_LIN = 9;
543548

544549
// Bayer RGGB Channels UINT8 FP Linear
545550
//
546-
FORMAT_BAYER_BGGR_U8_LIN = 9;
551+
FORMAT_BAYER_BGGR_U8_LIN = 10;
547552

548553
// Bayer RGGB Channels UINT16 FP Linear
549554
//
550-
FORMAT_BAYER_BGGR_U16_LIN = 10;
555+
FORMAT_BAYER_BGGR_U16_LIN = 11;
551556

552557
// Bayer RGGB Channels UINT32 FP Linear
553558
//
554-
FORMAT_BAYER_BGGR_U32_LIN = 11;
559+
FORMAT_BAYER_BGGR_U32_LIN = 12;
555560

556561
// Bayer RGGB Channels Single Precision FP Linear
557562
//
558-
FORMAT_BAYER_BGGR_F32_LIN = 12;
563+
FORMAT_BAYER_BGGR_F32_LIN = 13;
559564

560565
// TBD: Further channel permutations and padding (e.g. RGBZ,
561566
// BGR, BAYER_RGGB/GBRG/GRBG/...), non-BAYER filters, non-linear

0 commit comments

Comments
 (0)