revert some structure changes
This commit is contained in:
parent
f4fc129ecf
commit
58c39f930e
|
@ -45,17 +45,20 @@
|
||||||
// This is the main class for monitors. Each monitor is associated
|
// This is the main class for monitors. Each monitor is associated
|
||||||
// with a camera and is effectively a collector for events.
|
// with a camera and is effectively a collector for events.
|
||||||
//
|
//
|
||||||
class Monitor {
|
class Monitor
|
||||||
|
{
|
||||||
friend class MonitorStream;
|
friend class MonitorStream;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
QUERY=0,
|
QUERY=0,
|
||||||
CAPTURE,
|
CAPTURE,
|
||||||
ANALYSIS
|
ANALYSIS
|
||||||
} Purpose;
|
} Purpose;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
NONE=1,
|
NONE=1,
|
||||||
MONITOR,
|
MONITOR,
|
||||||
MODECT,
|
MODECT,
|
||||||
|
@ -64,7 +67,8 @@ public:
|
||||||
NODECT
|
NODECT
|
||||||
} Function;
|
} Function;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
ROTATE_0=1,
|
ROTATE_0=1,
|
||||||
ROTATE_90,
|
ROTATE_90,
|
||||||
ROTATE_180,
|
ROTATE_180,
|
||||||
|
@ -73,7 +77,8 @@ public:
|
||||||
FLIP_VERT
|
FLIP_VERT
|
||||||
} Orientation;
|
} Orientation;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum
|
||||||
|
{
|
||||||
IDLE,
|
IDLE,
|
||||||
PREALARM,
|
PREALARM,
|
||||||
ALARM,
|
ALARM,
|
||||||
|
@ -89,7 +94,8 @@ protected:
|
||||||
typedef enum { CLOSE_TIME, CLOSE_IDLE, CLOSE_ALARM } EventCloseMode;
|
typedef enum { CLOSE_TIME, CLOSE_IDLE, CLOSE_ALARM } EventCloseMode;
|
||||||
|
|
||||||
/* sizeof(SharedData) expected to be 336 bytes on 32bit and 64bit */
|
/* sizeof(SharedData) expected to be 336 bytes on 32bit and 64bit */
|
||||||
typedef struct {
|
typedef struct
|
||||||
|
{
|
||||||
uint32_t size; /* +0 */
|
uint32_t size; /* +0 */
|
||||||
uint32_t last_write_index; /* +4 */
|
uint32_t last_write_index; /* +4 */
|
||||||
uint32_t last_read_index; /* +8 */
|
uint32_t last_read_index; /* +8 */
|
||||||
|
|
Loading…
Reference in New Issue