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.hpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/video-ps3eye/shm-layout.hpp b/video-ps3eye/shm-layout.hpp
index 7fa29115..eba4b8b0 100644
--- a/video-ps3eye/shm-layout.hpp
+++ b/video-ps3eye/shm-layout.hpp
@@ -3,25 +3,27 @@
namespace ps3eye {
-struct shm_out {
+struct shm_in {
enum class mode : uint8_t { qvga, vga, };
enum class status : uint8_t { starting, running, fail, terminate, };
- uint8_t settings_updated;
+ uint32_t settings_updated;
uint16_t framerate;
mode resolution;
status status_;
- uint8_t sharpness, contrast, brightness, hue, saturation;
- uint8_t gain, exposure, auto_gain, awb, test_pattern;
+ //uint8_t sharpness, contrast, brightness hue, saturation;
+ uint8_t gain, exposure, auto_gain, test_pattern;
+ uint8_t do_exit;
};
-struct shm_in {
- uint8_t settings_updated_ack;
- uint8_t timecode;
+struct shm_out {
+ uint32_t timecode;
+ uint32_t settings_updated_ack;
union {
uint8_t data_320x240[320][240][3];
uint8_t data_640x480[640][480][3];
};
+ char error_string[256];
};
struct shm {
@@ -29,8 +31,8 @@ struct shm {
static constexpr unsigned _padding_len =
(_cacheline_len - (sizeof(shm_in) & (_cacheline_len - 1))) & (_cacheline_len - 1);
- using resolution = shm_out::mode;
- using status = shm_out::status;
+ using resolution = shm_in::mode;
+ using status = shm_in::status;
shm_out out;
const char* _padding[_padding_len];