Merge pull request #48 from cycjimmy/update-from-origin-jsmpeg

Update from origin jsmpeg

src/lib/mpeg1-wasm.js

@@ -76,11 +76,11 @@ export default class MPEG1WASM extends BaseDecoder {
       !this.hasSequenceHeader &&
       this.functions._mpeg1_decoder_has_sequence_header(this.decoder)
     ) {
-      this.loadSequnceHeader();
+      this.loadSequenceHeader();
     }
   }
 
-  loadSequnceHeader() {
+  loadSequenceHeader() {
     this.hasSequenceHeader = true;
     this.frameRate = this.functions._mpeg1_decoder_get_frame_rate(this.decoder);
     this.codedSize = this.functions._mpeg1_decoder_get_coded_size(this.decoder);

src/lib/wasm-module.js

@@ -4,25 +4,53 @@ export default class WASM {
   constructor() {
     this.stackSize = 5 * 1024 * 1024; // emscripten default
     this.pageSize = 64 * 1024; // wasm page size
-    this.onInitCallback = null;
+    this.onInitCallbacks = [];
     this.ready = false;
+    this.loadingFromFileStarted = false;
+    this.loadingFromBufferStarted = false;
   }
 
   write(buffer) {
-    this.loadFromBuffer(buffer, this.onInitCallback);
+    this.loadFromBuffer(buffer);
   }
 
   loadFromFile(url, callback) {
+    if (callback) {
+      this.onInitCallbacks.push(callback);
+    }
+
+    // Make sure this WASM Module is only instantiated once. If loadFromFile()
+    // was already called, bail out here. On instantiation all pending
+    // onInitCallbacks will be called.
+    if (this.loadingFromFileStarted) {
+      return;
+    }
+    this.loadingFromFileStarted = true;
+
     this.onInitCallback = callback;
     const ajax = new AjaxSource(url, {});
     ajax.connect(this);
     ajax.start();
   }
 
   loadFromBuffer(buffer, callback) {
+    if (callback) {
+      this.onInitCallbacks.push(callback);
+    }
+
+    // Make sure this WASM Module is only instantiated once. If loadFromBuffer()
+    // was already called, bail out here. On instantiation all pending
+    // onInitCallbacks will be called.
+    if (this.loadingFromBufferStarted) {
+      return;
+    }
+    this.loadingFromBufferStarted = true;
+
     this.moduleInfo = this.readDylinkSection(buffer);
     if (!this.moduleInfo) {
-      this.callback && this.callback(null);
+      for (let i = 0; i < this.onInitCallbacks.length; i++) {
+        this.onInitCallbacks[i](null);
+      }
       return;
     }
 
@@ -47,7 +75,9 @@ export default class WASM {
       }
       this.createHeapViews();
       this.ready = true;
-      callback && callback(this);
+      for (let i = 0; i < this.onInitCallbacks.length; i++) {
+        this.onInitCallbacks[i](this);
+      }
     });
   }
 

src/lib/webgl.js

@@ -4,6 +4,7 @@ class WebGLRenderer {
     this.width = this.canvas.width;
     this.height = this.canvas.height;
     this.enabled = true;
+    this.contextLost = false;
 
     this.hasTextureData = {};
 
@@ -24,6 +25,19 @@ class WebGLRenderer {
       throw new Error('Failed to get WebGL Context');
     }
 
+    this.canvas.addEventListener('webglcontextlost', this.handleContextLost.bind(this), false);
+    this.canvas.addEventListener(
+      'webglcontextrestored',
+      this.handleContextRestored.bind(this),
+      false
+    );
+
+    this.initGL();
+  }
+
+  initGL() {
+    this.hasTextureData = {};
+
     const { gl } = this;
     let vertexAttr = null;
 
@@ -60,7 +74,22 @@ class WebGLRenderer {
     this.shouldCreateUnclampedViews = !this.allowsClampedTextureData();
   }
 
+  handleContextLost(ev) {
+    ev.preventDefault();
+    this.contextLost = true;
+  }
+
+  handleContextRestored() {
+    this.initGL();
+    this.contextLost = false;
+  }
+
   destroy() {
+    if (this.contextLost) {
+      // Nothing to do here
+      return;
+    }
+
     const { gl } = this;
 
     this.deleteTexture(gl.TEXTURE0, this.textureY);
@@ -76,6 +105,7 @@ class WebGLRenderer {
 
     gl.getExtension('WEBGL_lose_context').loseContext();
     this.canvas.remove();
+    this.contextLost = true;
   }
 
   resize(width, height) {