Merge pull request #30 from Netflix/feature/IMFWorkflowRelatedMods

Added a method to return a SequenceTypeEnum for the Essence and an un…
Netflix · Mar 22, 2016 · ae26e1a · ae26e1a
2 parents 41241dc + cbf6447
commit ae26e1a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/main/java/com/netflix/imflibrary/reader_interfaces/MXFEssenceReader.java b/src/main/java/com/netflix/imflibrary/reader_interfaces/MXFEssenceReader.java
@@ -179,6 +179,23 @@ else if(headerPartition.hasWaveAudioEssenceDescriptor()){
         return result;
     }
 
+    /**
+     * A method that returns the EssenceType enumeration corresponding to this Essence
+     * @return a string representing either a MainImageSequence or a MainAudioSequence
+     * @throws IOException - any I/O related error will be exposed through an IOException
+     */
+    public CompositionPlaylist.SequenceTypeEnum getEssenceTypeEnum() throws IOException{
+        CompositionPlaylist.SequenceTypeEnum result = CompositionPlaylist.SequenceTypeEnum.Unknown;
+        HeaderPartition headerPartition = this.getHeaderPartitionIMF().getHeaderPartitionOP1A().getHeaderPartition();
+        if(headerPartition.hasCDCIPictureEssenceDescriptor() || headerPartition.hasRGBAPictureEssenceDescriptor()){
+            result = CompositionPlaylist.SequenceTypeEnum.MainImageSequence;
+        }
+        else if(headerPartition.hasWaveAudioEssenceDescriptor()){
+            result = CompositionPlaylist.SequenceTypeEnum.MainAudioSequence;
+        }
+        return result;
+    }
+
     /**
      * A method that returns the spoken language within this essence provided it is an Audio Essence
      * @return string representing a spoken language as defined in RFC-5646

diff --git a/src/main/java/com/netflix/imflibrary/st2067_2/CompositionPlaylist.java b/src/main/java/com/netflix/imflibrary/st2067_2/CompositionPlaylist.java
@@ -598,7 +598,8 @@ public static enum SequenceTypeEnum
         VisuallyImpairedTextSequence("VisuallyImpairedTextSequence"),
         CommentarySequence("CommentarySequence"),
         KaraokeSequence("KaraokeSequence"),
-        AncillaryDataSequence("AncillaryDataSequence");
+        AncillaryDataSequence("AncillaryDataSequence"),
+        Unknown("Unknown");
 
         private final String name;
 
@@ -607,7 +608,7 @@ private SequenceTypeEnum(String name)
             this.name = name;
         }
 
-        private static @Nullable SequenceTypeEnum getSequenceTypeEnum(String name)
+        private static SequenceTypeEnum getSequenceTypeEnum(String name)
         {
             switch (name)
             {
@@ -628,7 +629,7 @@ private SequenceTypeEnum(String name)
                 case "AncillaryDataSequence":
                     return AncillaryDataSequence;
                 default:
-                    return null;
+                    return Unknown;
             }
         }