Cache WASM Module once instantiated; fix #301

src/player.js

@@ -28,7 +28,7 @@ var Player = function(url, options) {
 	this.source.connect(this.demuxer);
 
 	if (!options.disableWebAssembly && JSMpeg.WASMModule.IsSupported()) {
-		this.wasmModule = new JSMpeg.WASMModule();
+		this.wasmModule = JSMpeg.WASMModule.GetModule();
 		options.wasmModule = this.wasmModule;
 	}
 
@@ -73,7 +73,10 @@ var Player = function(url, options) {
 	// loading the source. Otherwise the decoders won't know what to do with 
 	// the source data.
 	if (this.wasmModule) {
-		if (JSMpeg.WASM_BINARY_INLINED) {
+		if (this.wasmModule.ready) {
+			this.startLoading();
+		}
+		else if (JSMpeg.WASM_BINARY_INLINED) {
 			var wasm = JSMpeg.Base64ToArrayBuffer(JSMpeg.WASM_BINARY_INLINED);
 			this.wasmModule.loadFromBuffer(wasm, this.startLoading.bind(this));
 		}

src/wasm-module.js

@@ -4,6 +4,7 @@ var WASM = function() {
 	this.stackSize = 5 * 1024 * 1024; // emscripten default
 	this.pageSize = 64 * 1024; // wasm page size
 	this.onInitCallback = null;
+	this.ready = false;
 };
 
 WASM.prototype.write = function(buffer) {
@@ -44,6 +45,7 @@ WASM.prototype.loadFromBuffer = function(buffer, callback) {
 			this.instance.exports.__post_instantiate();
 		}
 		this.createHeapViews();
+		this.ready = true;
 		callback && callback(this);
 	}.bind(this))
 };
@@ -144,6 +146,11 @@ WASM.IsSupported = function() {
 	return (!!window.WebAssembly);
 };
 
+WASM.GetModule = function() {
+	WASM.CACHED_MODULE = WASM.CACHED_MODULE || new WASM();
+	return WASM.CACHED_MODULE;
+};
+
 return WASM;
 
 })();

src/wasm/buffer.c

@@ -19,6 +19,7 @@ void bit_buffer_evict(bit_buffer_t *self, unsigned int bytes_needed);
 
 bit_buffer_t *bit_buffer_create(unsigned int initial_byte_capacity, bit_buffer_mode_t mode) {
 	bit_buffer_t *self = malloc(sizeof(bit_buffer_t));
+	memset(self, 0, sizeof(bit_buffer_t));
 	self->mode = mode;
 	self->bytes = malloc(initial_byte_capacity);
 	self->byte_capacity = initial_byte_capacity;

src/wasm/mp2.c

@@ -233,6 +233,7 @@ int decode_frame(mp2_decoder_t *self);
 
 mp2_decoder_t *mp2_decoder_create(unsigned int buffer_size, bit_buffer_mode_t buffer_mode) {
 	mp2_decoder_t *self = malloc(sizeof(mp2_decoder_t));
+	memset(self, 0, sizeof(mp2_decoder_t));
 	self->bits = bit_buffer_create(buffer_size, buffer_mode);
 
 	self->sample_rate = 44100;

src/wasm/mpeg1.c

@@ -776,6 +776,7 @@ int read_huffman(bit_buffer_t *bits, const int *code_table);
 
 mpeg1_decoder_t *mpeg1_decoder_create(unsigned int buffer_size, bit_buffer_mode_t buffer_mode) {
 	mpeg1_decoder_t *self = malloc(sizeof(mpeg1_decoder_t));
+	memset(self, 0, sizeof(mpeg1_decoder_t));
 	self->bits = bit_buffer_create(buffer_size, buffer_mode);
 	return self;
 }