offset bug fix

legokichi · May 5, 2017 · 4246094 · 4246094
1 parent bf0c1d3
commit 4246094
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lib/EBMLReader.js b/lib/EBMLReader.js
@@ -100,7 +100,7 @@ var EBMLReader = (function (_super) {
             if (this.segmentOffset != 0) {
                 console.warn("Multiple segments detected!");
             }
-            this.segmentOffset = elm.tagEnd + 1;
+            this.segmentOffset = elm.dataStart;
             this.emit("segment_offset", this.segmentOffset);
         }
         else if (elm.type === "b" && elm.name === "SimpleBlock") {

diff --git a/lib/tools.js b/lib/tools.js
@@ -92,7 +92,6 @@ function putRefinedMetaData(segmentOffset, metadata, clusterPtrs, duration, cueI
         throw new Error("metadata does not have size");
     } // metadata が 不定サイズ
     var metadataSize = lastmetadata.dataEnd; // 書き換える前の metadata のサイズ
-    var encorder = new EBMLEncoder_1.default();
     // 一旦 seekhead を作って自身のサイズを調べる
     var refinedMetadata = refineMetadata(-segmentOffset);
     var refinedMetadataSize = encodedSizeOfEbml(refinedMetadata);
@@ -117,6 +116,7 @@ function putRefinedMetaData(segmentOffset, metadata, clusterPtrs, duration, cueI
     throw new Error("unable to refine metadata, stable size could not be found in " + i + " iterations!");
     // Given a list of EBMLElementBuffers, returns their encoded size in bytes
     function encodedSizeOfEbml(refinedMetaData) {
+        var encorder = new EBMLEncoder_1.default();
         return refinedMetaData.reduce(function (lst, elm) { return lst.concat(encorder.encode([elm])); }, []).reduce(function (o, buf) { return o + buf.byteLength; }, 0);
     }
     function refineMetadata(sizeDiff) {

diff --git a/src/EBMLReader.ts b/src/EBMLReader.ts
@@ -117,7 +117,7 @@ export default class EBMLReader extends EventEmitter {
       if(this.segmentOffset != 0) {
         console.warn("Multiple segments detected!");
       }
-      this.segmentOffset = elm.tagEnd + 1;
+      this.segmentOffset = elm.dataStart;
       this.emit("segment_offset", this.segmentOffset);
     }else if(elm.type === "b" && elm.name === "SimpleBlock"){
       const {timecode, trackNumber, frames} = tools.ebmlBlock(elm.data);

diff --git a/src/tools.ts b/src/tools.ts
@@ -91,7 +91,6 @@ export function putRefinedMetaData(
   if(lastmetadata == null){ throw new Error("metadata not found"); }
   if(lastmetadata.dataEnd < 0){ throw new Error("metadata does not have size"); } // metadata が 不定サイズ
   const metadataSize = lastmetadata.dataEnd; // 書き換える前の metadata のサイズ
-  const encorder = new Encoder();
   // 一旦 seekhead を作って自身のサイズを調べる
   let refinedMetadata = refineMetadata(-segmentOffset);
   let refinedMetadataSize = encodedSizeOfEbml(refinedMetadata);
@@ -117,6 +116,7 @@ export function putRefinedMetaData(
 
   // Given a list of EBMLElementBuffers, returns their encoded size in bytes
   function encodedSizeOfEbml(refinedMetaData: EBML.EBMLElementBuffer[]): number {
+    const encorder = new Encoder();
     return refinedMetaData.reduce<ArrayBuffer[]>((lst, elm)=> lst.concat(encorder.encode([elm])), []).reduce((o, buf)=> o + buf.byteLength, 0);
   }