add support for IABSequence in core constraints checker

Netflix · Apr 29, 2019 · 2bccf89 · 2bccf89
1 parent eb34194
commit 2bccf89
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 57 deletions.
diff --git a/generated/org/smpte_ra/ns/_2067_201/_2019/ObjectFactory.java b/generated/org/smpte_ra/ns/_2067_201/_2019/ObjectFactory.java
diff --git a/src/main/java/com/netflix/imflibrary/st0377/HeaderPartition.java b/src/main/java/com/netflix/imflibrary/st0377/HeaderPartition.java
@@ -1308,6 +1308,7 @@ public enum EssenceTypeEnum {
         CommentaryEssence(Composition.SequenceTypeEnum.CommentarySequence),
         KaraokeEssence(Composition.SequenceTypeEnum.CommentarySequence),
         AncillaryDataEssence(Composition.SequenceTypeEnum.AncillaryDataSequence),
+        IABEssence(Composition.SequenceTypeEnum.IABSequence),
         UnsupportedEssence(Composition.SequenceTypeEnum.UnsupportedSequence);
 
         private final Composition.SequenceTypeEnum sequenceType;
@@ -1369,6 +1370,8 @@ private static String getEssenceTypeString(Composition.SequenceTypeEnum sequence
                     return "KaraokeEssence";
                 case AncillaryDataSequence:
                     return "AncillaryDataEssence";
+                case IABSequence:
+                    return "IABEssence";
                 case UnsupportedSequence:
                 default:
                     return "UnsupportedEssence";

diff --git a/src/main/java/com/netflix/imflibrary/st2067_2/Composition.java b/src/main/java/com/netflix/imflibrary/st2067_2/Composition.java
@@ -187,6 +187,7 @@ public static enum SequenceTypeEnum {
         CommentarySequence("CommentarySequence"),
         KaraokeSequence("KaraokeSequence"),
         AncillaryDataSequence("AncillaryDataSequence"),
+        IABSequence("IABSequence"),
         UnsupportedSequence("UnsupportedSequence");
 
         private final String name;
@@ -221,6 +222,8 @@ public static SequenceTypeEnum getSequenceTypeEnum(String name) {
                     return KaraokeSequence;
                 case "AncillaryDataSequence":
                     return AncillaryDataSequence;
+                case "IABSequence":
+                    return IABSequence;
                 case "UnsupportedSequence":
                 default:
                     return UnsupportedSequence;

diff --git a/src/main/java/com/netflix/imflibrary/st2067_2/IMFCoreConstraintsChecker.java b/src/main/java/com/netflix/imflibrary/st2067_2/IMFCoreConstraintsChecker.java
@@ -100,7 +100,8 @@ public static List checkVirtualTracks(IMFCompositionPlaylistType compositionPlay
             if (!(virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.MainImageSequence)
                     || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.MainAudioSequence)
                     || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.MarkerSequence)
-                    || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.SubtitlesSequence))) {
+                    || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.SubtitlesSequence)
+                    || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.IABSequence))) {
                 imfErrorLogger.addError(IMFErrorLogger.IMFErrors.ErrorCodes.IMF_CPL_ERROR, IMFErrorLogger.IMFErrors.ErrorLevels.WARNING,
                         String.format("CPL has a Sequence of type %s which is not fully supported sequence type in Photon",
                                 virtualTrack.getSequenceTypeEnum().toString()));
@@ -126,7 +127,8 @@ else if(virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.M
 
             if((virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.MainImageSequence)
                     || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.MainAudioSequence)
-                    || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.SubtitlesSequence))
+                    || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.SubtitlesSequence)
+                    || virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.IABSequence))
                     && compositionPlaylistType.getEssenceDescriptorList() != null
                     && compositionPlaylistType.getEssenceDescriptorList().size() > 0)
             {
@@ -153,7 +155,8 @@ else if(virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.M
                             if (virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.MainImageSequence) ||
                                     virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.SubtitlesSequence)) {
                                 essenceDescriptorField = "SampleRate";
-                            } else if (virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.MainAudioSequence)) {
+                            } else if (virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.MainAudioSequence) ||
+                                        virtualTrack.getSequenceTypeEnum().equals(Composition.SequenceTypeEnum.IABSequence)) {
                                 essenceDescriptorField = "SampleRate";
                                 otherEssenceDescriptorField = "AudioSampleRate";
                             }