Merge pull request #4 from osamu620/fix-SOP

Fix incorrect checking of SOP marker segment
osamu620 · Aug 17, 2020 · abe012d · abe012d
2 parents 6d15e41 + 9566bb7
commit abe012d
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/source/Tier2/read_packet.m b/source/Tier2/read_packet.m
@@ -13,10 +13,15 @@
 % if SOP present
 if codingStyle.is_use_SOP() == true
     WORD = hDsrc.get_word();
-    assert(WORD == x_FF91);
-    Lsop = hDsrc.get_word();
-    assert(Lsop == 4);
-    Nsop = hDsrc.get_word();
+    if WORD == x_FF91
+        Lsop = hDsrc.get_word();
+        assert(Lsop == 4);
+        Nsop = hDsrc.get_word();
+    else
+        % SOP may not be present even SPcod says SOP was used
+        hDsrc.pos = hDsrc.pos - 2; % rewind 2 bytes
+        % Nsop shall be incremented no matter SOP is present or not
+    end
 end
 
 %% read packet header