Support the signaling of Jumbf Box size using XLBox even if the size …

…is less than 2^32 bytes (LBox)
nickft · Oct 29, 2023 · 014b8d5 · 014b8d5
1 parent 8370c74
commit 014b8d5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/jumbf/src/main/java/org/mipams/jumbf/entities/BmffBox.java b/jumbf/src/main/java/org/mipams/jumbf/entities/BmffBox.java
@@ -58,7 +58,7 @@ private void updateBmffHeadersBasedOnBox() throws MipamsException {
 
         long size = calculateSizeFromBox();
 
-        if (isXBoxRequiredBasedOnSize(size)) {
+        if (shouldEnableXlBox(size)) {
             setLBox(1);
             setXlBox(size);
         } else {
@@ -69,13 +69,17 @@ private void updateBmffHeadersBasedOnBox() throws MipamsException {
     public long calculateSizeFromBox() throws MipamsException {
         long sum = Long.valueOf(getLBoxSize() + getTBoxSize()) + calculatePayloadSize();
 
-        if (isXBoxRequiredBasedOnSize(sum)) {
+        if (shouldEnableXlBox(sum)) {
             sum += getXBoxSize();
         }
 
         return sum;
     }
 
+    private boolean shouldEnableXlBox(long size) {
+        return getLBox() == 1 || isXBoxRequiredBasedOnSize(size);
+    }
+
     private boolean isXBoxRequiredBasedOnSize(long size) {
         return CoreUtils.numberOfHexCharsToRepresentLong(size) > getLBoxSize() * 2;
     }

diff --git a/jumbf/src/test/java/org/mipams/jumbf/services/BmffBoxServiceTests.java b/jumbf/src/test/java/org/mipams/jumbf/services/BmffBoxServiceTests.java
@@ -91,6 +91,18 @@ void testParsingLBox() throws IOException {
         }
     }
 
+    @Test
+    void testUpdatingBmffHeadersWhenEnablingXlBoxOnSmallBox() throws MipamsException {
+        JsonBox jsonBox = new JsonBox();
+        jsonBox.setLBox(1);
+        jsonBox.setContent("test".getBytes());
+        jsonBox.updateFieldsBasedOnExistingData();
+
+        long expectedSize = CoreUtils.INT_BYTE_SIZE * 2 + CoreUtils.LONG_BYTE_SIZE + jsonBox.getContent().length;
+
+        assertEquals(expectedSize, jsonBox.getXlBox());
+    }
+
     @Test
     void testUpdatingBmffHeadersOfLongBox() throws MipamsException {
         MockLongBox mockBox = new MockLongBox();