merge master into develop

etiennedub · Dec 15, 2020 · 74067b8 · 74067b8
2 parents a4849a2 + 89ba085
commit 74067b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pyk4a/playback.py b/pyk4a/playback.py
@@ -155,7 +155,7 @@ def get_next_capture(self):
         result, capture_handle = k4a_module.playback_get_next_capture(self._handle, self.thread_safe)
         self._verify_stream_error(result)
         return PyK4ACapture(
-            calibration=self._calibration,
+            calibration=self.calibration,
             capture_handle=capture_handle,
             color_format=self.configuration["color_format"],
             thread_safe=self.thread_safe,
@@ -166,7 +166,7 @@ def get_previouse_capture(self):
         result, capture_handle = k4a_module.playback_get_previous_capture(self._handle, self.thread_safe)
         self._verify_stream_error(result)
         return PyK4ACapture(
-            calibration=self._calibration,
+            calibration=self.calibration,
             capture_handle=capture_handle,
             color_format=self.configuration["color_format"],
             thread_safe=self.thread_safe,

diff --git a/tests/functional/test_playback.py b/tests/functional/test_playback.py
@@ -116,6 +116,7 @@ def test_get_next_capture(playback: PyK4APlayback):
         assert capture.depth_timestamp_usec == 800222
         assert capture.color_timestamp_usec == 800222
         assert capture.ir_timestamp_usec == 800222
+        assert capture._calibration is not None  # Issue #81
 
     @staticmethod
     def test_get_previouse_capture(playback: PyK4APlayback):
@@ -128,3 +129,5 @@ def test_get_previouse_capture(playback: PyK4APlayback):
         assert capture.depth_timestamp_usec == 800222
         assert capture.color_timestamp_usec == 800222
         assert capture.ir_timestamp_usec == 800222
+        assert capture._calibration is not None  # Issue #81
+