Decoder.clearSequenceHeader & options.onSocketMessage

build.sh

@@ -34,6 +34,7 @@ emcc \
 		'_mpeg1_decoder_set_index',
 		'_mpeg1_decoder_did_write',
 		'_mpeg1_decoder_has_sequence_header',
+		'_mpeg1_decoder_clear_sequence_header',
 		'_mpeg1_decoder_get_frame_rate',
 		'_mpeg1_decoder_get_coded_size',
 		'_mpeg1_decoder_get_width',

src/decoder.js

@@ -105,6 +105,9 @@ BaseDecoder.prototype.getCurrentTime = function() {
 	return this.decodedTime;
 };
 
+BaseDecoder.prototype.clearSequenceHeader = function() {
+};
+
 return BaseDecoder;
 
 })();

src/mpeg1-wasm.js

@@ -4,6 +4,8 @@ var MPEG1WASM = function(options) {
 	JSMpeg.Decoder.Base.call(this, options);
 
 	this.onDecodeCallback = options.onVideoDecode;
+	this.onDecodeSequenceHeaderCallback = options.onVideoDecodeSequenceHeader;
+
 	this.module = options.wasmModule;
 
 	this.bufferSize = options.videoBufferSize || 512*1024;
@@ -91,6 +93,18 @@ MPEG1WASM.prototype.loadSequnceHeader = function() {
 	if (this.decodeFirstFrame) {
 		this.decode();
 	}
+
+	if (this.onDecodeSequenceHeaderCallback) {
+		this.onDecodeSequenceHeaderCallback(this);
+	}
+};
+
+MPEG1WASM.prototype.clearSequenceHeader = function() {
+    if (!this.decoder) {
+		return false
+    }
+	this.hasSequenceHeader = false;
+	this.functions._mpeg1_decoder_clear_sequence_header(this.decoder);
 };
 
 MPEG1WASM.prototype.decode = function() {

src/mpeg1.js

@@ -7,7 +7,8 @@ var MPEG1 = function(options) {
 	JSMpeg.Decoder.Base.call(this, options);
 
 	this.onDecodeCallback = options.onVideoDecode;
-
+	this.onDecodeSequenceHeaderCallback = options.onVideoDecodeSequenceHeader;
+
 	var bufferSize = options.videoBufferSize || 512*1024;
 	var bufferMode = options.streaming
 		? JSMpeg.BitBuffer.MODE.EVICT
@@ -114,7 +115,14 @@ MPEG1.prototype.decodeSequenceHeader = function() {
 	}
 
 	this.hasSequenceHeader = true;
-};
+	if (this.onDecodeSequenceHeaderCallback) {
+		this.onDecodeSequenceHeaderCallback(this);
+	}
+ };
+
+MPEG1.prototype.clearSequenceHeader = function() {
+	this.hasSequenceHeader = false;
+}
 
 MPEG1.prototype.initBuffers = function() {
 	this.intraQuantMatrix = MPEG1.DEFAULT_INTRA_QUANT_MATRIX;

src/player.js

@@ -43,6 +43,10 @@ var Player = function(url, options) {
 
 		this.demuxer.connect(JSMpeg.Demuxer.TS.STREAM.VIDEO_1, this.video);
 		this.video.connect(this.renderer);
+
+		if (options.streaming) {
+			this.source.video = this.video;
+		}
 	}
 
 	if (options.audio !== false && JSMpeg.AudioOutput.WebAudio.IsSupported()) {

src/wasm/mpeg1.c

@@ -822,6 +822,21 @@ int mpeg1_decoder_has_sequence_header(mpeg1_decoder_t *self) {
 	return self->has_sequence_header;
 }
 
+void mpeg1_decoder_clear_sequence_header(mpeg1_decoder_t *self) {
+	if (self->has_sequence_header) {
+		free(self->planes_current.y);
+		free(self->planes_current.cr);
+		free(self->planes_current.cb);
+
+		free(self->planes_forward.y);
+		free(self->planes_forward.cr);
+		free(self->planes_forward.cb);
+
+		self->has_sequence_header = false;
+	}
+
+}
+
 float mpeg1_decoder_get_frame_rate(mpeg1_decoder_t *self) {
 	return self->frame_rate;
 }

src/wasm/mpeg1.h

@@ -15,6 +15,7 @@ void mpeg1_decoder_set_index(mpeg1_decoder_t *self, unsigned int index);
 void mpeg1_decoder_did_write(mpeg1_decoder_t *self, unsigned int byte_size);
 
 int mpeg1_decoder_has_sequence_header(mpeg1_decoder_t *self);
+void mpeg1_decoder_clear_sequence_header(mpeg1_decoder_t *self);
 float mpeg1_decoder_get_frame_rate(mpeg1_decoder_t *self);
 int mpeg1_decoder_get_coded_size(mpeg1_decoder_t *self);
 int mpeg1_decoder_get_width(mpeg1_decoder_t *self);

src/webgl.js

@@ -87,6 +87,7 @@ WebGLRenderer.prototype.resize = function(width, height) {
 	this.canvas.width = this.width;
 	this.canvas.height = this.height;
 
+	this.hasTextureData = {};
 	this.gl.useProgram(this.program);
 
 	var codedWidth = ((this.width + 15) >> 4) << 4;

src/websocket.js

@@ -5,10 +5,11 @@ var WSSource = function(url, options) {
 	this.options = options;
 	this.socket = null;
 	this.streaming = true;
-
+	
 	this.callbacks = {connect: [], data: []};
 	this.destination = null;
-
+	this.video = null;
+
 	this.reconnectInterval = options.reconnectInterval !== undefined
 		? options.reconnectInterval
 		: 5;
@@ -72,8 +73,15 @@ WSSource.prototype.onMessage = function(ev) {
 		this.onEstablishedCallback(this);
 	}
 
+	var data;
+	if (this.options.onSocketMessage) {
+		data = this.options.onSocketMessage(this, ev);
+	} else {
+		data = new Uint8Array(ev.data);
+	}
+
 	if (this.destination) {
-		this.destination.write(ev.data);
+		this.destination.write(data);
 	}
 };