Resolution of issue #20

dariol83 · Nov 16, 2023 · 5fed1d1 · 5fed1d1
1 parent ba2a894
commit 5fed1d1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...in/java/eu/dariolucia/ccsds/tmtc/datalink/channel/receiver/AosReceiverVirtualChannel.java b/...in/java/eu/dariolucia/ccsds/tmtc/datalink/channel/receiver/AosReceiverVirtualChannel.java
@@ -78,8 +78,12 @@ protected void extractBitstream(AosTransferFrame frame, boolean gapDetected, int
         if(frame.getBitstreamDataPointer() % 8 != 0) {
             ++bytesToRead;
         }
+        // If all bits are valid, override bytesToRead value
+        if(frame.isBitstreamAllValid()) {
+            bytesToRead = frame.getFrame().length - startIdx - (frame.isOcfPresent() ? 2 : 0) - (frame.isFecfPresent() ? 2 : 0);
+        }
         byte[] extracted = Arrays.copyOfRange(frame.getFrame(), startIdx, startIdx + bytesToRead);
-        notifyBitstreamExtracted(frame, extracted, frame.getBitstreamDataPointer(), missingBytes);
+        notifyBitstreamExtracted(frame, extracted, frame.isBitstreamAllValid() ? bytesToRead * 8 : frame.getBitstreamDataPointer(), missingBytes);
     }
 
     @Override