properly close

Author: aeinstein

dist/webrtmp.js

@@ -20,7 +20,6 @@
 import {TransmuxingEvents} from "../utils/utils";
 import EventEmitter from "../utils/event_emitter";
 import MP4Remuxer from "../formats/mp4-remuxer";
-import MediaInfo from "../formats/media-info";
 import Browser from "../utils/browser";
 import Log from "../utils/logger";
 
@@ -32,39 +31,21 @@ class Transmuxer {
 
         this._config = config;
 
-        this._currentSegmentIndex = 0;
-
-        this._mediaInfo = null;
-        this._ioctl = null;
-
         this._pendingSeekTime = null;
         this._pendingResolveSeekPoint = null;
 
-        this._statisticsReporter = null;
-
         this._remuxer = new MP4Remuxer(this._config);
         this._remuxer.onInitSegment = this._onRemuxerInitSegmentArrival.bind(this);
         this._remuxer.onMediaSegment = this._onRemuxerMediaSegmentArrival.bind(this);
     }
 
     destroy() {
-        this._mediaInfo = null;
-        this._mediaDataSource = null;
-
-        if (this._statisticsReporter) {
-            this._disableStatisticsReporter();
-        }
-        if (this._ioctl) {
-            this._ioctl.destroy();
-            this._ioctl = null;
-        }
-
         if (this._remuxer) {
             this._remuxer.destroy();
             this._remuxer = null;
         }
 
-        this._emitter.removeAllListeners();
+        this._emitter.removeAllListener();
         this._emitter = null;
     }
 
@@ -85,62 +66,7 @@ class Transmuxer {
     }
 
     stop() {
-        this._internalAbort();
-    }
-
-    _internalAbort() {
-        if (this._ioctl) {
-            this._ioctl.destroy();
-            this._ioctl = null;
-        }
-    }
-
-    _searchSegmentIndexContains(milliseconds) {
-        let segments = this._mediaDataSource.segments;
-        let idx = segments.length - 1;
-
-        for (let i = 0; i < segments.length; i++) {
-            if (milliseconds < segments[i].timestampBase) {
-                idx = i - 1;
-                break;
-            }
-        }
-        return idx;
-    }
-
-    _onMediaInfo(mediaInfo) {
-        if (this._mediaInfo == null) {
-            // Store first segment's mediainfo as global mediaInfo
-            this._mediaInfo = Object.assign({}, mediaInfo);
-            this._mediaInfo.keyframesIndex = null;
-            this._mediaInfo.segments = [];
-            //this._mediaInfo.segmentCount = this._mediaDataSource.segments.length;
-            Object.setPrototypeOf(this._mediaInfo, MediaInfo.prototype);
-        }
-
-        let segmentInfo = Object.assign({}, mediaInfo);
-        Object.setPrototypeOf(segmentInfo, MediaInfo.prototype);
-        this._mediaInfo.segments[this._currentSegmentIndex] = segmentInfo;
-
-        // notify mediaInfo update
-        this._reportSegmentMediaInfo(this._currentSegmentIndex);
-
-        /*
-        if (this._pendingSeekTime != null) {
-            Promise.resolve().then(() => {
-                let target = this._pendingSeekTime;
-                this._pendingSeekTime = null;
-                this.seek(target);
-            });
-        }*/
-    }
-
-    _onMetaDataArrived(metadata) {
-        this._emitter.emit(TransmuxingEvents.METADATA_ARRIVED, metadata);
-    }
-
-    _onScriptDataArrived(data) {
-        this._emitter.emit(TransmuxingEvents.SCRIPTDATA_ARRIVED, data);
+       // this._internalAbort();
     }
 
     _onRemuxerInitSegmentArrival(type, initSegment) {

dist/webrtmp.js.map

@@ -19,7 +19,7 @@
  */
 
 
-import {WebRTMP} from "./webrtmp";
+import { WebRTMP } from "./webrtmp";
 
 export { WebRTMP } from "./webrtmp";
 

dist/webrtmp.worker.js

@@ -133,6 +133,7 @@ class RTMPMediaMessageHandler{
     }
 
     destroy() {
+        this._transmuxer.destroy();
         this._mediaInfo = null;
         this._metadata = null;
         this._audioMetadata = null;

dist/webrtmp.worker.js.map

@@ -73,6 +73,12 @@ class RTMPMessageHandler {
         }
     }
 
+    destroy(){
+        this.media_handler.destroy();
+        this.media_handler = null;
+        this.chunk_parser = null
+    }
+
     /**
      *
      * @param {Uint8Array} data

src/flv/transmuxer.js

@@ -23,6 +23,7 @@ import Log from "../utils/logger";
 class EventEmitter{
 	ListenerList = [];
 	TAG = "EventEmitter";
+	waiters = [];
 
 	constructor() {
 	}
@@ -31,18 +32,35 @@ class EventEmitter{
 	 *
 	 * @param {String} event
 	 * @param {Function} listener
+	 * @param {boolean} modal
 	 */
-	addEventListener(event, listener){
+	addEventListener(event, listener, modal = false){
+		Log.d(this.TAG, "addEventListener: " + event);
+
+		for(let i = 0; i < this.ListenerList.length;i++){
+			let entry = this.ListenerList[i];
+			if(entry[0] === event) {
+				if (modal || entry[1] === listener) {
+					Log.w(this.TAG, "Listener already registered, overriding");
+					return;
+				}
+			}
+		}
 		this.ListenerList.push([event, listener]);
 	}
 
+	waitForEvent(event, callback){
+		this.waiters.push([event, callback]);
+	}
+
 	/**
 	 *
 	 * @param {String} event
 	 * @param {Function} listener
+	 * @param {boolean} modal
 	 */
-	addListener(event, listener){
-		this.ListenerList.push([event, listener]);
+	addListener(event, listener, modal){
+		this.addEventListener(event, listener, modal);
 	}
 
 
@@ -51,21 +69,41 @@ class EventEmitter{
 	 * @param {String} event
 	 * @param {Function} listener
 	 */
-	removeListener(event, listener){
+	removeEventListener(event, listener){
+		Log.d(this.TAG, "removeEventListener: " + event);
+
 		for(let i = 0; i < this.ListenerList.length;i++){
 			let entry = this.ListenerList[i];
-			if(entry[0] == event && entry[1] == listener){
+			if(entry[0] === event && entry[1] === listener){
 				this.ListenerList.splice(i,1);
 				return;
 			}
 		}
 	}
 
+	removeListener(event, listener){
+		this.removeEventListener(event, listener);
+	}
+
 	/**
 	 * Remove all listener
 	 */
-	removeAllListeners(){
-		this.ListenerList = [];
+	removeAllEventListener(event){
+		Log.d(this.TAG, "removeAllEventListener: ", event);
+		if(event) {
+			for(let i = 0; i < this.ListenerList.length;i++) {
+				let entry = this.ListenerList[i];
+				if(entry[0] === event){
+					this.ListenerList.splice(i,1);
+					i--;
+				}
+			}
+		} else
+			this.ListenerList = [];
+	}
+
+	removeAllListener(event){
+		this.removeAllEventListener(event);
 	}
 
 	/**
@@ -75,6 +113,18 @@ class EventEmitter{
 	 */
 	emit(event, ...data){
 		Log.t(this.TAG, "emit EVENT: " + event, ...data);
+
+		for(let i = 0; i < this.waiters.length;i++){
+			let entry = this.waiters[i];
+
+			if(entry[0] === event){
+				Log.d(this.TAG, "hit waiting event: " + event);
+				entry[1].call(this, ...data);
+				this.waiters.splice(i,1);
+				i--;
+			}
+		}
+
 		for(let i = 0; i < this.ListenerList.length;i++){
 			let entry = this.ListenerList[i];
 			if(entry[0] === event){

src/index.js

@@ -82,7 +82,7 @@ class MSEController {
 			this.detachMediaElement();
 		}
 		this.e = null;
-		this._emitter.removeAllListeners();
+		this._emitter.removeAllListener();
 		this._emitter = null;
 	}
 
@@ -95,6 +95,7 @@ class MSEController {
 	}
 
 	attachMediaElement(mediaElement) {
+		Log.i(this.TAG, "attach");
 		if (this._mediaSource) {
 			throw new IllegalStateException('MediaSource has been attached to an HTMLMediaElement!');
 		}
@@ -109,8 +110,20 @@ class MSEController {
 	}
 
 	detachMediaElement() {
+		Log.i(this.TAG, "detach");
+
 		if (this._mediaSource) {
 			let ms = this._mediaSource;
+
+			if (ms.readyState === 'open') {
+				try {
+					ms.endOfStream();
+				} catch (error) {
+					Log.e(this.TAG, error.message);
+				}
+			}
+
+
 			for (let type in this._sourceBuffers) {
 				// pending segments should be discard
 				let ps = this._pendingSegments[type];
@@ -122,9 +135,11 @@ class MSEController {
 				// remove all sourcebuffers
 				let sb = this._sourceBuffers[type];
 				if (sb) {
+					Log.i(this.TAG, "try to remove sourcebuffer: " + type);
 					if (ms.readyState !== 'closed') {
 						// ms edge can throw an error: Unexpected call to method or property access
 						try {
+							Log.i(this.TAG, "removing sourcebuffer: " + type);
 							ms.removeSourceBuffer(sb);
 						} catch (error) {
 							Log.e(this.TAG, error.message);
@@ -136,27 +151,33 @@ class MSEController {
 					this._sourceBuffers[type] = null;
 				}
 			}
-			if (ms.readyState === 'open') {
-				try {
-					ms.endOfStream();
-				} catch (error) {
-					Log.e(this.TAG, error.message);
-				}
-			}
+
+
+
+			// proprerly remove sourcebuffers
+			/*
+			for(let mimeType in this._sourceBuffers) {
+				this._mediaSource.removeSourceBuffer(this._sourceBuffers[mimeType]);
+			}*/
+
 			ms.removeEventListener('sourceopen', this.e.onSourceOpen);
 			ms.removeEventListener('sourceended', this.e.onSourceEnded);
 			ms.removeEventListener('sourceclose', this.e.onSourceClose);
 			this._pendingSourceBufferInit = [];
 			this._isBufferFull = false;
 			this._idrList.clear();
 			this._mediaSource = null;
+
+		} else {
+			Log.w(this.TAG, "no mediasource attached");
 		}
 
 		if (this._mediaElement) {
 			this._mediaElement.src = '';
 			this._mediaElement.removeAttribute('src');
 			this._mediaElement = null;
 		}
+
 		if (this._mediaSourceObjectURL) {
 			window.URL.revokeObjectURL(this._mediaSourceObjectURL);
 			this._mediaSourceObjectURL = null;