Merge pull request #13 from nickft/10-jpeg-snack-the-composition-id-n…

…o-of-composition-check-is-not-included-in-the-jpeg-snack-description-box Add exception during creation of Snack files
nickft · Jan 8, 2024 · e7a8b49 · e7a8b49
2 parents fca60e3 + 2f30c44
commit e7a8b49
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/jpegsnack/src/main/java/org/mipams/jpegsnack/entities/ObjectMetadataBox.java b/jpegsnack/src/main/java/org/mipams/jpegsnack/entities/ObjectMetadataBox.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.mipams.jpegsnack.util.JpegSnackException;
 import org.mipams.jumbf.entities.BmffBox;
 import org.mipams.jumbf.util.CoreUtils;
 import org.mipams.jumbf.util.MipamsException;

diff --git a/...ack/src/main/java/org/mipams/jpegsnack/services/boxes/JpegSnackDescriptionBoxService.java b/...ack/src/main/java/org/mipams/jpegsnack/services/boxes/JpegSnackDescriptionBoxService.java
@@ -107,8 +107,13 @@ protected void writeBmffPayloadToJumbfFile(JpegSnackDescriptionBox jsdb, OutputS
         }
 
         for (Composition composition : jsdb.getCompositions()) {
-            if (noOfCompositionExists) {
-                CoreUtils.writeIntAsSingleByteToOutputStream(composition.getId(), os);
+            if (composition.getId() != null) {
+                if (noOfCompositionExists) {
+                    CoreUtils.writeIntAsSingleByteToOutputStream(composition.getId(), os);
+                } else {
+                    throw new JpegSnackException(
+                            "The composition id value shall be absent when the number of compositions field is not present");
+                }
             }
             CoreUtils.writeIntAsSingleByteToOutputStream(composition.getNoOfObjects(), os);
             if (composition.getNoOfObjects() != composition.getObjectIds().size()) {

diff --git a/jpegsnack/src/main/java/org/mipams/jpegsnack/services/boxes/ObjectMetadataBoxService.java b/jpegsnack/src/main/java/org/mipams/jpegsnack/services/boxes/ObjectMetadataBoxService.java
@@ -2,7 +2,6 @@
 
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.ByteBuffer;
 
 import org.mipams.jpegsnack.entities.ObjectMetadataBox;
 import org.mipams.jumbf.entities.ParseMetadata;