change parseContainer to initContainer as it only initializes it

sannies · sannies · commit 7edb35e67c97 · 2014-07-28T18:17:37.000+02:00
Added ainf v1 support
diff --git a/examples/src/main/java/com/googlecode/mp4parser/ModifyBoxExample.java b/examples/src/main/java/com/googlecode/mp4parser/ModifyBoxExample.java
@@ -2,7 +2,7 @@
 
 import com.coremedia.iso.BoxReplacer;
 import com.coremedia.iso.boxes.Box;
-import com.googlecode.mp4parser.boxes.ultraviolet.BaseLocationBox;
+import com.googlecode.mp4parser.boxes.dece.BaseLocationBox;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/isoparser/src/main/java/com/coremedia/iso/IsoFile.java b/isoparser/src/main/java/com/coremedia/iso/IsoFile.java
@@ -61,7 +61,7 @@ public IsoFile(DataSource dataSource) throws IOException {
     }
 
     public IsoFile(DataSource dataSource, BoxParser boxParser) throws IOException {
-        parseContainer(dataSource, dataSource.size(), boxParser);
+        initContainer(dataSource, dataSource.size(), boxParser);
     }
 
     public String toString() {
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/DataReferenceBox.java b/isoparser/src/main/java/com/coremedia/iso/boxes/DataReferenceBox.java
@@ -76,7 +76,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         version = IsoTypeReader.readUInt8(versionFlagNumOfChildBoxes);
         flags = IsoTypeReader.readUInt24(versionFlagNumOfChildBoxes);
         // number of child boxes is not required - ignore
-        parseContainer(dataSource, contentSize - 8, boxParser);
+        initContainer(dataSource, contentSize - 8, boxParser);
     }
 
 
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/ItemProtectionBox.java b/isoparser/src/main/java/com/coremedia/iso/boxes/ItemProtectionBox.java
@@ -79,7 +79,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         version = IsoTypeReader.readUInt8(versionFlagNumOfChildBoxes);
         flags = IsoTypeReader.readUInt24(versionFlagNumOfChildBoxes);
         // number of child boxes is not required
-        parseContainer(dataSource, contentSize - 6, boxParser);
+        initContainer(dataSource, contentSize - 6, boxParser);
     }
 
     @Override
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/MetaBox.java b/isoparser/src/main/java/com/coremedia/iso/boxes/MetaBox.java
@@ -79,7 +79,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         ByteBuffer bb = ByteBuffer.allocate(4);
         dataSource.read(bb);
         parseVersionAndFlags((ByteBuffer) bb.rewind());
-        parseContainer(dataSource, contentSize - 4, boxParser);
+        initContainer(dataSource, contentSize - 4, boxParser);
     }
 
     @Override
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/SampleDescriptionBox.java b/isoparser/src/main/java/com/coremedia/iso/boxes/SampleDescriptionBox.java
@@ -86,7 +86,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         version = IsoTypeReader.readUInt8(versionFlagNumOfChildBoxes);
         flags = IsoTypeReader.readUInt24(versionFlagNumOfChildBoxes);
         // number of child boxes is not required
-        parseContainer(dataSource, contentSize - 8, boxParser);
+        initContainer(dataSource, contentSize - 8, boxParser);
     }
 
     @Override
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/AudioSampleEntry.java b/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/AudioSampleEntry.java
@@ -275,10 +275,10 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
                 }
             });
         } else {
-            parseContainer(dataSource,
+            initContainer(dataSource,
                     contentSize - 28
-                        - (soundVersion == 1 ? 16 : 0)
-                        - (soundVersion == 2 ? 36 : 0), boxParser);
+                            - (soundVersion == 1 ? 16 : 0)
+                            - (soundVersion == 2 ? 36 : 0), boxParser);
         }
     }
 
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/MpegSampleEntry.java b/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/MpegSampleEntry.java
@@ -26,7 +26,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         dataSource.read(bb);
         bb.position(6);// ignore 6 reserved bytes;
         dataReferenceIndex = IsoTypeReader.readUInt16(bb);
-        parseContainer(dataSource, contentSize - 8, boxParser);
+        initContainer(dataSource, contentSize - 8, boxParser);
     }
 
     @Override
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/SubtitleSampleEntry.java b/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/SubtitleSampleEntry.java
@@ -52,7 +52,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         imageMimeType = IsoTypeReader.readString((ByteBuffer) content.rewind());
         dataSource.position(start + namespace.length() + schemaLocation.length() + imageMimeType.length() + 3);
 
-        parseContainer(dataSource, contentSize - (header.remaining() + namespace.length() + schemaLocation.length() + imageMimeType.length() + 3), boxParser);
+        initContainer(dataSource, contentSize - (header.remaining() + namespace.length() + schemaLocation.length() + imageMimeType.length() + 3), boxParser);
     }
 
     @Override
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/TextSampleEntry.java b/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/TextSampleEntry.java
@@ -87,7 +87,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
 
         styleRecord = new StyleRecord();
         styleRecord.parse(content);
-        parseContainer(dataSource, contentSize - 38, boxParser);
+        initContainer(dataSource, contentSize - 38, boxParser);
     }
 
     @Override
diff --git a/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/VisualSampleEntry.java b/isoparser/src/main/java/com/coremedia/iso/boxes/sampleentry/VisualSampleEntry.java
@@ -181,7 +181,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         tmp = IsoTypeReader.readUInt16(content);
         assert 0xFFFF == tmp;
 
-        parseContainer(dataSource, contentSize - 78, boxParser);
+        initContainer(dataSource, contentSize - 78, boxParser);
 
     }
 
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/AbstractContainerBox.java b/isoparser/src/main/java/com/googlecode/mp4parser/AbstractContainerBox.java
@@ -79,7 +79,7 @@ protected ByteBuffer getHeader() {
     public void parse(DataSource dataSource, ByteBuffer header, long contentSize, BoxParser boxParser) throws IOException {
         this.offset = dataSource.position() - header.remaining();
         this.largeBox = header.remaining() == 16; // sometime people use large boxes without requiring them
-        parseContainer(dataSource, contentSize, boxParser);
+        initContainer(dataSource, contentSize, boxParser);
     }
 
 
@@ -88,7 +88,7 @@ public void getBox(WritableByteChannel writableByteChannel) throws IOException {
         writeContainer(writableByteChannel);
     }
 
-    public void parseContainer(DataSource dataSource, long containerSize, BoxParser boxParser) throws IOException {
+    public void initContainer(DataSource dataSource, long containerSize, BoxParser boxParser) throws IOException {
         this.dataSource = dataSource;
         this.parsePosition = dataSource.position();
         this.startPosition =  parsePosition - (((largeBox || (containerSize + 8) >= (1L << 32)) ? 16 : 8));
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/BasicContainer.java b/isoparser/src/main/java/com/googlecode/mp4parser/BasicContainer.java
@@ -133,7 +133,7 @@ public void addBox(Box b) {
         boxes.add(b);
     }
 
-    public void parseContainer(DataSource dataSource, long containerSize, BoxParser boxParser) throws IOException {
+    public void initContainer(DataSource dataSource, long containerSize, BoxParser boxParser) throws IOException {
 
         this.dataSource = dataSource;
         this.parsePosition = this.startPosition = dataSource.position();
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/FullContainerBox.java b/isoparser/src/main/java/com/googlecode/mp4parser/FullContainerBox.java
@@ -24,6 +24,7 @@
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.channels.WritableByteChannel;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -68,6 +69,11 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         super.parse(dataSource, header, contentSize, boxParser);
     }
 
+    @Override
+    public void getBox(WritableByteChannel writableByteChannel) throws IOException {
+        super.getBox(writableByteChannel);
+    }
+
     public String toString() {
         return this.getClass().getSimpleName() + "[childBoxes]";
     }
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/Mp4TrackImpl.java
@@ -20,8 +20,6 @@
 import com.coremedia.iso.boxes.fragment.*;
 import com.coremedia.iso.boxes.mdat.SampleList;
 import com.googlecode.mp4parser.BasicContainer;
-import com.googlecode.mp4parser.boxes.cenc.CencSampleAuxiliaryDataFormat;
-import com.googlecode.mp4parser.boxes.ultraviolet.SampleEncryptionBox;
 import com.googlecode.mp4parser.util.Path;
 
 import java.io.IOException;
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/builder/DefaultMp4Builder.java
@@ -26,7 +26,7 @@
 import com.googlecode.mp4parser.authoring.Track;
 import com.googlecode.mp4parser.authoring.tracks.CencEncyprtedTrack;
 import com.googlecode.mp4parser.boxes.cenc.CencSampleAuxiliaryDataFormat;
-import com.googlecode.mp4parser.boxes.ultraviolet.SampleEncryptionBox;
+import com.googlecode.mp4parser.boxes.dece.SampleEncryptionBox;
 import com.googlecode.mp4parser.util.Path;
 
 import java.io.IOException;
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/authoring/builder/FragmentedMp4Builder.java b/isoparser/src/main/java/com/googlecode/mp4parser/authoring/builder/FragmentedMp4Builder.java
@@ -28,7 +28,7 @@
 import com.googlecode.mp4parser.authoring.tracks.CencEncyprtedTrack;
 import com.googlecode.mp4parser.boxes.basemediaformat.TrackEncryptionBox;
 import com.googlecode.mp4parser.boxes.cenc.CencSampleAuxiliaryDataFormat;
-import com.googlecode.mp4parser.boxes.ultraviolet.SampleEncryptionBox;
+import com.googlecode.mp4parser.boxes.dece.SampleEncryptionBox;
 import com.googlecode.mp4parser.util.Path;
 
 import java.io.IOException;
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/boxes/DTSSpecificBox.java b/isoparser/src/main/java/com/googlecode/mp4parser/boxes/DTSSpecificBox.java
@@ -3,6 +3,7 @@
 import com.coremedia.iso.IsoTypeReader;
 import com.coremedia.iso.IsoTypeWriter;
 import com.googlecode.mp4parser.AbstractBox;
+import com.googlecode.mp4parser.annotations.DoNotParseDetail;
 import com.googlecode.mp4parser.boxes.mp4.objectdescriptors.BitReaderBuffer;
 import com.googlecode.mp4parser.boxes.mp4.objectdescriptors.BitWriterBuffer;
 
@@ -212,4 +213,113 @@ public int getReservedBoxPresent() {
     public void setReservedBoxPresent(int reservedBoxPresent) {
         this.reservedBoxPresent = reservedBoxPresent;
     }
+
+    @DoNotParseDetail
+    public int[] getDashAudioChannelConfiguration() {
+        final int channelLayout = this.getChannelLayout();
+        int numChannels = 0;
+        int dwChannelMask = 0;
+        if ((channelLayout & 0x0001) == 0x0001) {
+            //0001h Center in front of listener 1
+            numChannels += 1;
+            dwChannelMask |= 0x00000004; //SPEAKER_FRONT_CENTER
+        }
+        if ((channelLayout & 0x0002) == 0x0002) {
+            //0002h Left/Right in front 2
+            numChannels += 2;
+            dwChannelMask |= 0x00000001; //SPEAKER_FRONT_LEFT
+            dwChannelMask |= 0x00000002; //SPEAKER_FRONT_RIGHT
+        }
+        if ((channelLayout & 0x0004) == 0x0004) {
+            //0004h Left/Right surround on side in rear 2
+            numChannels += 2;
+            //* if Lss, Rss exist, then this position is equivalent to Lsr, Rsr respectively
+            dwChannelMask |= 0x00000010; //SPEAKER_BACK_LEFT
+            dwChannelMask |= 0x00000020; //SPEAKER_BACK_RIGHT
+        }
+        if ((channelLayout & 0x0008) == 0x0008) {
+            //0008h Low frequency effects subwoofer 1
+            numChannels += 1;
+            dwChannelMask |= 0x00000008; //SPEAKER_LOW_FREQUENCY
+        }
+        if ((channelLayout & 0x0010) == 0x0010) {
+            //0010h Center surround in rear 1
+            numChannels += 1;
+            dwChannelMask |= 0x00000100; //SPEAKER_BACK_CENTER
+        }
+        if ((channelLayout & 0x0020) == 0x0020) {
+            //0020h Left/Right height in front 2
+            numChannels += 2;
+            dwChannelMask |= 0x00001000; //SPEAKER_TOP_FRONT_LEFT
+            dwChannelMask |= 0x00004000; //SPEAKER_TOP_FRONT_RIGHT
+        }
+        if ((channelLayout & 0x0040) == 0x0040) {
+            //0040h Left/Right surround in rear 2
+            numChannels += 2;
+            dwChannelMask |= 0x00000010; //SPEAKER_BACK_LEFT
+            dwChannelMask |= 0x00000020; //SPEAKER_BACK_RIGHT
+        }
+        if ((channelLayout & 0x0080) == 0x0080) {
+            //0080h Center Height in front 1
+            numChannels += 1;
+            dwChannelMask |= 0x00002000; //SPEAKER_TOP_FRONT_CENTER
+        }
+        if ((channelLayout & 0x0100) == 0x0100) {
+            //0100h Over the listener’s head 1
+            numChannels += 1;
+            dwChannelMask |= 0x00000800; //SPEAKER_TOP_CENTER
+        }
+        if ((channelLayout & 0x0200) == 0x0200) {
+            //0200h Between left/right and center in front 2
+            numChannels += 2;
+            dwChannelMask |= 0x00000040; //SPEAKER_FRONT_LEFT_OF_CENTER
+            dwChannelMask |= 0x00000080; //SPEAKER_FRONT_RIGHT_OF_CENTER
+        }
+        if ((channelLayout & 0x0400) == 0x0400) {
+            //0400h Left/Right on side in front 2
+            numChannels += 2;
+            dwChannelMask |= 0x00000200; //SPEAKER_SIDE_LEFT
+            dwChannelMask |= 0x00000400; //SPEAKER_SIDE_RIGHT
+        }
+        if ((channelLayout & 0x0800) == 0x0800) {
+            //0800h Left/Right surround on side 2
+            numChannels += 2;
+            //* if Lss, Rss exist, then this position is equivalent to Lsr, Rsr respectively
+            dwChannelMask |= 0x00000010; //SPEAKER_BACK_LEFT
+            dwChannelMask |= 0x00000020; //SPEAKER_BACK_RIGHT
+        }
+        if ((channelLayout & 0x1000) == 0x1000) {
+            //1000h Second low frequency effects subwoofer 1
+            numChannels += 1;
+            dwChannelMask |= 0x00000008; //SPEAKER_LOW_FREQUENCY
+        }
+        if ((channelLayout & 0x2000) == 0x2000) {
+            //2000h Left/Right height on side 2
+            numChannels += 2;
+            dwChannelMask |= 0x00000010; //SPEAKER_BACK_LEFT
+            dwChannelMask |= 0x00000020; //SPEAKER_BACK_RIGHT
+        }
+        if ((channelLayout & 0x4000) == 0x4000) {
+            //4000h Center height in rear 1
+            numChannels += 1;
+            dwChannelMask |= 0x00010000; //SPEAKER_TOP_BACK_CENTER
+        }
+        if ((channelLayout & 0x8000) == 0x8000) {
+            //8000h Left/Right height in rear 2
+            numChannels += 2;
+            dwChannelMask |= 0x00008000; //SPEAKER_TOP_BACK_LEFT
+            dwChannelMask |= 0x00020000; //SPEAKER_TOP_BACK_RIGHT
+        }
+        if ((channelLayout & 0x10000) == 0x10000) {
+            //10000h Center below in front
+            numChannels += 1;
+        }
+        if ((channelLayout & 0x20000) == 0x20000) {
+            //20000h Left/Right below in front
+            numChannels += 2;
+        }
+        return new int[]{numChannels, dwChannelMask};
+    }
+
+
 }
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/boxes/adobe/ActionMessageFormat0SampleEntryBox.java b/isoparser/src/main/java/com/googlecode/mp4parser/boxes/adobe/ActionMessageFormat0SampleEntryBox.java
@@ -27,7 +27,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         dataSource.read(bb);
         bb.position(6);// ignore 6 reserved bytes;
         dataReferenceIndex = IsoTypeReader.readUInt16(bb);
-        parseContainer(dataSource, contentSize - 8, boxParser);
+        initContainer(dataSource, contentSize - 8, boxParser);
     }
 
     @Override
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/boxes/apple/QuicktimeTextSampleEntry.java b/isoparser/src/main/java/com/googlecode/mp4parser/boxes/apple/QuicktimeTextSampleEntry.java
@@ -91,7 +91,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo
         } else {
             fontName = null;
         }
-        // parseContainer(); there are no child boxes!?
+        // initContainer(); there are no child boxes!?
     }
 
     @Override
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/boxes/dece/AssetInformationBox.java b/isoparser/src/main/java/com/googlecode/mp4parser/boxes/dece/AssetInformationBox.java
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/boxes/dece/BaseLocationBox.java b/isoparser/src/main/java/com/googlecode/mp4parser/boxes/dece/BaseLocationBox.java
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/boxes/dece/SampleEncryptionBox.java b/isoparser/src/main/java/com/googlecode/mp4parser/boxes/dece/SampleEncryptionBox.java
diff --git a/isoparser/src/main/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBox.java b/isoparser/src/main/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBox.java
diff --git a/isoparser/src/main/resources/isoparser-default.properties b/isoparser/src/main/resources/isoparser-default.properties
diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxWriteReadBase.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/BoxWriteReadBase.java
diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBoxV0Test.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBoxV0Test.java
diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBoxV1Test.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/AssetInformationBoxV1Test.java
diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/BaseLocationBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/BaseLocationBoxTest.java
diff --git a/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/SampleEncryptionBoxTest.java b/isoparser/src/test/java/com/googlecode/mp4parser/boxes/ultraviolet/SampleEncryptionBoxTest.java

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public IsoFile(DataSource dataSource) throws IOException {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public IsoFile(DataSource dataSource, BoxParser boxParser) throws IOException {`
`64`		`- parseContainer(dataSource, dataSource.size(), boxParser);`
	`64`	`+ initContainer(dataSource, dataSource.size(), boxParser);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public String toString() {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo`
`76`	`76`	`version = IsoTypeReader.readUInt8(versionFlagNumOfChildBoxes);`
`77`	`77`	`flags = IsoTypeReader.readUInt24(versionFlagNumOfChildBoxes);`
`78`	`78`	`// number of child boxes is not required - ignore`
`79`		`- parseContainer(dataSource, contentSize - 8, boxParser);`
	`79`	`+ initContainer(dataSource, contentSize - 8, boxParser);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo`
`79`	`79`	`version = IsoTypeReader.readUInt8(versionFlagNumOfChildBoxes);`
`80`	`80`	`flags = IsoTypeReader.readUInt24(versionFlagNumOfChildBoxes);`
`81`	`81`	`// number of child boxes is not required`
`82`		`- parseContainer(dataSource, contentSize - 6, boxParser);`
	`82`	`+ initContainer(dataSource, contentSize - 6, boxParser);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo`
`86`	`86`	`version = IsoTypeReader.readUInt8(versionFlagNumOfChildBoxes);`
`87`	`87`	`flags = IsoTypeReader.readUInt24(versionFlagNumOfChildBoxes);`
`88`	`88`	`// number of child boxes is not required`
`89`		`- parseContainer(dataSource, contentSize - 8, boxParser);`
	`89`	`+ initContainer(dataSource, contentSize - 8, boxParser);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -275,10 +275,10 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo`
`275`	`275`	`}`
`276`	`276`	`});`
`277`	`277`	`} else {`
`278`		`- parseContainer(dataSource,`
	`278`	`+ initContainer(dataSource,`
`279`	`279`	`contentSize - 28`
`280`		`- - (soundVersion == 1 ? 16 : 0)`
`281`		`- - (soundVersion == 2 ? 36 : 0), boxParser);`
	`280`	`+ - (soundVersion == 1 ? 16 : 0)`
	`281`	`+ - (soundVersion == 2 ? 36 : 0), boxParser);`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo`
`26`	`26`	`dataSource.read(bb);`
`27`	`27`	`bb.position(6);// ignore 6 reserved bytes;`
`28`	`28`	`dataReferenceIndex = IsoTypeReader.readUInt16(bb);`
`29`		`- parseContainer(dataSource, contentSize - 8, boxParser);`
	`29`	`+ initContainer(dataSource, contentSize - 8, boxParser);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo`
`52`	`52`	`imageMimeType = IsoTypeReader.readString((ByteBuffer) content.rewind());`
`53`	`53`	`dataSource.position(start + namespace.length() + schemaLocation.length() + imageMimeType.length() + 3);`
`54`	`54`
`55`		`- parseContainer(dataSource, contentSize - (header.remaining() + namespace.length() + schemaLocation.length() + imageMimeType.length() + 3), boxParser);`
	`55`	`+ initContainer(dataSource, contentSize - (header.remaining() + namespace.length() + schemaLocation.length() + imageMimeType.length() + 3), boxParser);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public void parse(DataSource dataSource, ByteBuffer header, long contentSize, Bo`
`87`	`87`
`88`	`88`	`styleRecord = new StyleRecord();`
`89`	`89`	`styleRecord.parse(content);`
`90`		`- parseContainer(dataSource, contentSize - 38, boxParser);`
	`90`	`+ initContainer(dataSource, contentSize - 38, boxParser);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`