summaryrefslogtreecommitdiffhomepage
path: root/video-ps3eye/shm-layout.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'video-ps3eye/shm-layout.hpp')
-rw-r--r--video-ps3eye/shm-layout.hpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/video-ps3eye/shm-layout.hpp b/video-ps3eye/shm-layout.hpp
index 2335eab8..577021b9 100644
--- a/video-ps3eye/shm-layout.hpp
+++ b/video-ps3eye/shm-layout.hpp
@@ -5,20 +5,22 @@ namespace ps3eye {
struct shm_in {
enum class mode : uint8_t { qvga, vga, };
- enum class status : uint8_t { starting, running, fail, terminate, };
uint32_t settings_updated;
uint8_t framerate;
mode resolution;
- status status_;
//uint8_t sharpness, contrast, brightness hue, saturation;
uint8_t gain, exposure, auto_gain, test_pattern;
uint8_t do_exit;
};
-struct shm_out {
+struct shm_out
+{
+ enum class status : uint8_t { starting, running, fail, terminate, };
+
uint32_t timecode;
uint32_t settings_updated_ack;
+ status status_;
char error_string[256];
union {
uint8_t data_320x240[320][240][3];
@@ -31,9 +33,6 @@ struct shm {
static constexpr unsigned _padding_len =
(_cacheline_len - (sizeof(shm_in) & (_cacheline_len - 1))) & (_cacheline_len - 1);
- using resolution = shm_in::mode;
- using status = shm_in::status;
-
shm_out out;
const char* _padding[_padding_len];
shm_in in;