wrann: allow intervals larger than 2**31 - 1.

Benjamin Moody · Benjamin Moody · commit 481978e7c7f5 · 2021-09-30T12:31:03.000-04:00
If the gap between two consecutive annotation timestamps is greater
than 2**31 - 1 ticks, it must be represented as two or more SKIP
pseudo-annotations.  Handle this correctly in field2bytes() (to
actually generate the correct byte sequences) and in
Annotation.check_field() (to permit the application to specify such a
gap.)

(Previously, if there was a gap of exactly 2**31 ticks, this would not
be caught by check_field, and field2bytes would incorrectly generate a
SKIP of -2**31 instead.)
diff --git a/wfdb/io/annotation.py b/wfdb/io/annotation.py
@@ -466,8 +466,6 @@ def check_field(self, field):
                 raise ValueError("The 'sample' field must only contain non-negative integers")
             if min(sampdiffs) < 0 :
                 raise ValueError("The 'sample' field must contain monotonically increasing sample numbers")
-            if max(sampdiffs) > 2147483648:
-                raise ValueError('WFDB annotation files cannot store sample differences greater than 2**31')
 
         elif field == 'label_store':
             if min(item) < 1 or max(item) > 49:
@@ -1370,19 +1368,19 @@ def field2bytes(field, value):
         # sample difference
         sd = value[0]
 
-        # Add SKIP element if value is too large for single byte
-        if sd>1023:
-            # 8 bytes in total:
-            # - [0, 59>>2] indicates SKIP
-            # - Next 4 gives sample difference
-            # - Final 2 give 0 and sym
-            data_bytes = [0, 236, (sd&16711680)>>16, (sd&4278190080)>>24, sd&255, (sd&65280)>>8, 0, 4*typecode]
-        # Just need samp and sym
-        else:
-            # - First byte stores low 8 bits of samp
-            # - Second byte stores high 2 bits of samp
-            #   and sym
-            data_bytes = [sd & 255, ((sd & 768) >> 8) + 4*typecode]
+        data_bytes = []
+        # Add SKIP elements if value is too large
+        while sd > 0x7fffffff:
+            data_bytes += [0, 59 << 2, 0xff, 0x7f, 0xff, 0xff]
+            sd -= 0x7fffffff
+        if sd > 1023:
+            data_bytes += [0, 59 << 2,
+                           (sd >> 16) & 255,
+                           (sd >> 24) & 255,
+                           (sd >> 0) & 255,
+                           (sd >> 8) & 255]
+            sd = 0
+        data_bytes += [sd & 255, ((sd & 768) >> 8) + 4 * typecode]
 
     elif field == 'num':
         # First byte stores num
