App 2Extended : add HLG support

src/main/java/com/netflix/imflibrary/Colorimetry.java

@@ -22,6 +22,7 @@ public enum Colorimetry {
     Color6(ColorPrimaries.P3D65,      TransferCharacteristic.SMPTEST2084,       CodingEquation.None),
     Color7(ColorPrimaries.ITU2020,    TransferCharacteristic.SMPTEST2084,       CodingEquation.ITU2020NCL),
     Color_App5_AP0(ColorPrimaries.ACES,    TransferCharacteristic.Linear,       CodingEquation.None),
+    Color8(ColorPrimaries.ITU2020,    TransferCharacteristic.ITU2020HLG,        CodingEquation.ITU2020NCL),
     Unknown(ColorPrimaries.Unknown,   TransferCharacteristic.Unknown,           CodingEquation.Unknown);
 
 
@@ -87,6 +88,7 @@ public static enum TransferCharacteristic {
         ITU2020(UL.fromULAsURNStringToUL("urn:smpte:ul:06.0E.2B.34.04.01.01.0E.04.01.01.01.01.09.00.00")),
         SMPTEST2084(UL.fromULAsURNStringToUL("urn:smpte:ul:06.0E.2B.34.04.01.01.0D.04.01.01.01.01.0A.00.00")),
         Linear(UL.fromULAsURNStringToUL("urn:smpte:ul:06.0e.2b.34.04.01.01.06.04.01.01.01.01.06.00.00")),
+        ITU2020HLG(UL.fromULAsURNStringToUL("urn:smpte:ul:06.0E.2B.34.04.01.01.0D.04.01.01.01.01.0B.00.00")),
         Unknown(null);
 
         private final UL transferCharacteristicUL;

src/main/java/com/netflix/imflibrary/st2067_2/AbstractApplicationComposition.java

@@ -646,7 +646,7 @@ Map<UUID, DOMNodeObjectModel> getEssenceDescriptorListMap(Set<String> ignoreSet)
      *
      * @return a HashMap mapping the UUID to its corresponding EssenceDescriptor in the Composition
      */
-    Map<UUID, DOMNodeObjectModel> getEssenceDescriptorListMap() {
+    protected Map<UUID, DOMNodeObjectModel> getEssenceDescriptorListMap() {
         return getEssenceDescriptorListMap(new HashSet<>());
     }
 

src/main/java/com/netflix/imflibrary/st2067_2/Application2ExtendedComposition.java

@@ -40,6 +40,7 @@ public class Application2ExtendedComposition extends AbstractApplicationComposit
         put(Colorimetry.Color5, new HashSet<Integer>(){{ add(10); add(12); }});
         put(Colorimetry.Color6, new HashSet<Integer>(){{ add(10); add(12); add(16);}});
         put(Colorimetry.Color7, new HashSet<Integer>(){{ add(10); add(12); add(16); }});
+        put(Colorimetry.Color8, new HashSet<Integer>(){{ add(10); add(12); }});
     }});
     public static final Set<Integer>bitDepthsSupported = Collections.unmodifiableSet(new HashSet<Integer>() {{
         add(8); add(10); add(12); add(16); }});

src/main/java/com/netflix/imflibrary/st2067_2/ApplicationCompositionFactory.java

@@ -20,10 +20,10 @@
 
 import com.netflix.imflibrary.IMFErrorLogger;
 import com.netflix.imflibrary.exceptions.IMFException;
+import com.netflix.imflibrary.tsp_2121.ApplicationTsp2121Composition;
 import com.netflix.imflibrary.utils.FileByteRangeProvider;
 import com.netflix.imflibrary.utils.ResourceByteRangeProvider;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -50,10 +50,15 @@ public class ApplicationCompositionFactory {
         add("http://www.smpte-ra.org/ns/2067-50/2017");
     }});
 
+    private static final Set<String> namespacesApplicationTsp2121Composition = Collections.unmodifiableSet(new HashSet<String>() {{
+        add("http://www.digitalproductionpartnership.co.uk/schema/imf/TSP2121-1/2018");
+    }});
+
     public enum ApplicationCompositionType {
         APPLICATION_2_COMPOSITION_TYPE(Application2Composition.class,          namespacesApplication2Composition),
         APPLICATION_2E_COMPOSITION_TYPE(Application2ExtendedComposition.class, namespacesApplication2EComposition),
         APPLICATION_5_COMPOSITION_TYPE(Application5Composition.class,          namespacesApplication5Composition),
+        APPLICATION_TSP_2121_COMPOSITION_TYPE(ApplicationTsp2121Composition.class, namespacesApplicationTsp2121Composition),
         APPLICATION_UNSUPPORTED_COMPOSITION_TYPE(ApplicationUnsupportedComposition.class, Collections.unmodifiableSet(new HashSet<>()));
         private Set<String> nameSpaceSet;
         private Class<?> clazz;

src/main/java/com/netflix/imflibrary/st2067_2/CompositionImageEssenceDescriptorModel.java

@@ -29,7 +29,7 @@
 /**
  * Created by svenkatrav on 11/2/16.
  */
-public final class CompositionImageEssenceDescriptorModel {
+public class CompositionImageEssenceDescriptorModel {
     private final UUID imageEssencedescriptorID;
     private final DOMNodeObjectModel imageEssencedescriptorDOMNode;
     private final RegXMLLibDictionary regXMLLibDictionary;
@@ -199,6 +199,18 @@ public CompositionImageEssenceDescriptorModel(@Nonnull UUID imageEssencedescript
         return imageEssencedescriptorID;
     }
 
+    protected @Nonnull IMFErrorLogger getImfErrorLogger() {
+        return imfErrorLogger;
+    }
+
+    protected @Nonnull DOMNodeObjectModel getImageEssenceDescriptorDOMNode() {
+        return imageEssencedescriptorDOMNode;
+    }
+
+    protected @Nonnull RegXMLLibDictionary getRegXMLLibDictionary() {
+        return regXMLLibDictionary;
+    }
+
     public @Nonnull FrameLayoutType getFrameLayoutType() {
         return frameLayoutType;
     }
@@ -380,7 +392,7 @@ public TransferCharacteristic getTransferCharacteristic() {
         return paletteLayout;
     }
 
-    private @Nonnull Integer parsePixelBitDepth(@Nonnull ColorModel colorModel) {
+    protected @Nonnull Integer parsePixelBitDepth(@Nonnull ColorModel colorModel) {
         Integer refPixelBitDepth = null;
         DOMNodeObjectModel subDescriptors = imageEssencedescriptorDOMNode.getDOMNode(regXMLLibDictionary.getSymbolNameFromURN(subdescriptorsUL));
         if (subDescriptors == null) {

src/main/java/com/netflix/imflibrary/st2067_2/IMFCompositionPlaylistType.java

@@ -54,7 +54,7 @@
  * A class that models an IMF Composition Playlist structure.
  */
 @Immutable
-final class IMFCompositionPlaylistType {
+public final class IMFCompositionPlaylistType {
     private final UUID id;
     private final Composition.EditRate editRate;
     private final String annotation;