mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 05:16:01 +00:00
fix: preserve linear color in Quest VR frames
This commit is contained in:
1 parent
52d351908f
commit
15ef4b064b
7 files changed
+46
-21
No files matched your search
+2
-1
@@ -435,7 +435,7 @@ def xr_capture(adb: str, serial: str, destination: Path, timeout: float) -> dict
|
||||
detail = 'No valid XR projection layer is being submitted' if not metadata.get('validLayer') else 'GPU readback or image write failed'
|
||||
raise ControlError(detail, 'XR_CAPTURE_FAILED')
|
||||
images = {}
|
||||
for eye in ('left', 'right'):
|
||||
for eye in (('left', 'right', 'source') if metadata.get('sourceImage') else ('left', 'right')):
|
||||
local = Path(temporary) / (eye + '.ppm')
|
||||
pulled = run_adb(adb, serial, 'pull', remote + '-' + eye + '.ppm', str(local), timeout=120)
|
||||
if pulled.returncode:
|
||||
@@ -455,6 +455,7 @@ def xr_capture(adb: str, serial: str, destination: Path, timeout: float) -> dict
|
||||
(destination / 'capture.json').write_text(json.dumps(metadata, indent=2), encoding='utf-8')
|
||||
return {'ok': True, 'command': 'xr-frame', 'deviceSerial': serial, 'capture': metadata,
|
||||
'left': str((destination / 'left.png').resolve()), 'right': str((destination / 'right.png').resolve()),
|
||||
**({'source': str((destination / 'source.png').resolve())} if 'source' in images else {}),
|
||||
'scope': 'App eye textures before headset compositor reprojection; excludes Meta system overlays'}
|
||||
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ class XrCaptureTest(unittest.TestCase):
|
||||
with self.subTest(data=data), self.assertRaises(ctl.ControlError):
|
||||
ctl.xr_ppm_to_png(data)
|
||||
|
||||
def capture(self, root, failed=False, replaced=False, no_response=False):
|
||||
def capture(self, root, failed=False, replaced=False, no_response=False, source=False):
|
||||
calls = []
|
||||
token = None
|
||||
reads = 0
|
||||
@@ -47,7 +47,7 @@ class XrCaptureTest(unittest.TestCase):
|
||||
if args[:2] == ('shell', 'cat'):
|
||||
reads += 1
|
||||
stdout = json.dumps({'id': ('old' if reads == 1 or no_response or (replaced and reads > 2) else token),
|
||||
'ok': not failed, 'validLayer': not failed}).encode()
|
||||
'ok': not failed, 'validLayer': not failed, 'sourceImage': source}).encode()
|
||||
if args[0] == 'pull':
|
||||
Path(args[2]).write_bytes(b'P6\n1 1\n255\n\x12\x34\x56')
|
||||
return subprocess.CompletedProcess(args, 0, stdout, b'')
|
||||
@@ -72,6 +72,13 @@ class XrCaptureTest(unittest.TestCase):
|
||||
self.capture(root, **flags)
|
||||
self.assertFalse(root.exists())
|
||||
|
||||
def test_source_capture_is_pulled_when_supported_by_the_headset(self):
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
root = Path(directory) / 'capture'
|
||||
result, calls = self.capture(root, source=True)
|
||||
self.assertEqual(result['source'], str((root / 'source.png').resolve()))
|
||||
self.assertEqual(len([c for c in calls if c[0] == 'pull']), 3)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -260,7 +260,8 @@ public:
|
||||
if (xrWidth_) {
|
||||
frame_.render.magic = DROIDDECK_XR_FRAME_MAGIC; frame_.render.version = DROIDDECK_XR_FRAME_VERSION;
|
||||
frame_.render.width = xrWidth_; frame_.render.height = xrHeight_;
|
||||
frame_.render.bytes = xrWidth_ * xrHeight_ * 4; frame_.render.color_space = 1;
|
||||
frame_.render.bytes = xrWidth_ * xrHeight_ * 4;
|
||||
frame_.render.color_space = DROIDDECK_XR_COLOR_LINEAR_RGBA8;
|
||||
}
|
||||
for (int e = 0; e < 2; e++) {
|
||||
frame_.texture[e] = eyes[e].hTexture;
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#define DROIDDECK_XR_FRAME_VERSION 1u
|
||||
#define DROIDDECK_XR_FRAME_SOCKET "droiddeck-xr-frames"
|
||||
#define DROIDDECK_XR_FRAME_MAX_BYTES (64u * 1024u * 1024u)
|
||||
#define DROIDDECK_XR_COLOR_LINEAR_RGBA8 1u
|
||||
|
||||
struct DroidDeckXrFrameHeader {
|
||||
uint32_t magic, version, width, height;
|
||||
@@ -23,7 +24,7 @@ inline bool xr_frame_valid(const DroidDeckXrFrameHeader &header) {
|
||||
if (header.magic != DROIDDECK_XR_FRAME_MAGIC || header.version != DROIDDECK_XR_FRAME_VERSION
|
||||
|| !header.frame_id || header.width < 2 || (header.width & 1u) || !header.height
|
||||
|| header.width > 8192 || header.height > 4096 || bytes > DROIDDECK_XR_FRAME_MAX_BYTES
|
||||
|| header.bytes != bytes || header.color_space != 1 || header.captured_ns <= 0) return false;
|
||||
|| header.bytes != bytes || header.color_space != DROIDDECK_XR_COLOR_LINEAR_RGBA8 || header.captured_ns <= 0) return false;
|
||||
for (int eye = 0; eye < 2; eye++) {
|
||||
for (const auto &row : header.eye_pose[eye]) for (float value : row) if (!std::isfinite(value)) return false;
|
||||
for (const auto &row : header.projection[eye]) for (float value : row) if (!std::isfinite(value)) return false;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
static DroidDeckXrFrameHeader Header(uint64_t id = 1) {
|
||||
DroidDeckXrFrameHeader header{};
|
||||
header.magic = DROIDDECK_XR_FRAME_MAGIC; header.version = DROIDDECK_XR_FRAME_VERSION;
|
||||
header.width = 8; header.height = 4; header.bytes = 128; header.color_space = 1;
|
||||
header.width = 8; header.height = 4; header.bytes = 128; header.color_space = DROIDDECK_XR_COLOR_LINEAR_RGBA8;
|
||||
header.frame_id = id; header.captured_ns = xr_frame_now();
|
||||
for (int eye = 0; eye < 2; eye++) {
|
||||
for (int axis = 0; axis < 3; axis++) header.eye_pose[eye][axis][axis] = 1;
|
||||
|
||||
Reference in new issue
Block a user