MetaDataArrived: Refine bilibili#309

veaba · May 4, 2018 · 88e9bf8 · 88e9bf8
1 parent 97eac6e
commit 88e9bf8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/d.ts/flv.d.ts b/d.ts/flv.d.ts
@@ -184,6 +184,7 @@ declare namespace FlvJs {
         LOADING_COMPLETE: string,
         RECOVERED_EARLY_EOF: string,
         MEDIA_INFO: string,
+        METADATA_ARRIVED: string,
         STATISTICS_INFO: string
     }
 

diff --git a/src/core/transmuxer.js b/src/core/transmuxer.js
@@ -60,7 +60,7 @@ class Transmuxer {
             ctl.on(TransmuxingEvents.LOADING_COMPLETE, this._onLoadingComplete.bind(this));
             ctl.on(TransmuxingEvents.RECOVERED_EARLY_EOF, this._onRecoveredEarlyEof.bind(this));
             ctl.on(TransmuxingEvents.MEDIA_INFO, this._onMediaInfo.bind(this));
-            ctl.on(TransmuxingEvents.METADATA_ARRIVED, this._onMetadataArrived.bind(this));
+            ctl.on(TransmuxingEvents.METADATA_ARRIVED, this._onMetaDataArrived.bind(this));
             ctl.on(TransmuxingEvents.STATISTICS_INFO, this._onStatisticsInfo.bind(this));
             ctl.on(TransmuxingEvents.RECOMMEND_SEEKPOINT, this._onRecommendSeekpoint.bind(this));
         }
@@ -165,7 +165,7 @@ class Transmuxer {
         });
     }
 
-    _onMetadataArrived(metadata) {
+    _onMetaDataArrived(metadata) {
         Promise.resolve().then(() => {
             this._emitter.emit(TransmuxingEvents.METADATA_ARRIVED, metadata);
         });

diff --git a/src/core/transmuxing-controller.js b/src/core/transmuxing-controller.js
@@ -265,7 +265,7 @@ class TransmuxingController {
 
             this._demuxer.onError = this._onDemuxException.bind(this);
             this._demuxer.onMediaInfo = this._onMediaInfo.bind(this);
-            this._demuxer.onMetadataArrived = this._onMetadataArrived.bind(this);
+            this._demuxer.onMetaDataArrived = this._onMetaDataArrived.bind(this);
 
             this._remuxer.bindDataSource(this._demuxer
                          .bindDataSource(this._ioctl
@@ -315,7 +315,7 @@ class TransmuxingController {
         }
     }
 
-    _onMetadataArrived(metadata) {
+    _onMetaDataArrived(metadata) {
         this._emitter.emit(TransmuxingEvents.METADATA_ARRIVED, metadata);
     }
 

diff --git a/src/core/transmuxing-worker.js b/src/core/transmuxing-worker.js
@@ -54,7 +54,7 @@ let TransmuxingWorker = function (self) {
                 controller.on(TransmuxingEvents.LOADING_COMPLETE, onLoadingComplete.bind(this));
                 controller.on(TransmuxingEvents.RECOVERED_EARLY_EOF, onRecoveredEarlyEof.bind(this));
                 controller.on(TransmuxingEvents.MEDIA_INFO, onMediaInfo.bind(this));
-                controller.on(TransmuxingEvents.METADATA_ARRIVED, onMetadataArrived.bind(this));
+                controller.on(TransmuxingEvents.METADATA_ARRIVED, onMetaDataArrived.bind(this));
                 controller.on(TransmuxingEvents.STATISTICS_INFO, onStatisticsInfo.bind(this));
                 controller.on(TransmuxingEvents.RECOMMEND_SEEKPOINT, onRecommendSeekpoint.bind(this));
                 break;
@@ -138,7 +138,7 @@ let TransmuxingWorker = function (self) {
         self.postMessage(obj);
     }
 
-    function onMetadataArrived(metadata) {
+    function onMetaDataArrived(metadata) {
         let obj = {
             msg: TransmuxingEvents.METADATA_ARRIVED,
             data: metadata

diff --git a/src/demux/flv-demuxer.js b/src/demux/flv-demuxer.js
@@ -52,7 +52,7 @@ class FLVDemuxer {
 
         this._onError = null;
         this._onMediaInfo = null;
-        this._onMetadataArrived = null;
+        this._onMetaDataArrived = null;
         this._onTrackMetadata = null;
         this._onDataAvailable = null;
 
@@ -123,7 +123,7 @@ class FLVDemuxer {
 
         this._onError = null;
         this._onMediaInfo = null;
-        this._onMetadataArrived = null;
+        this._onMetaDataArrived = null;
         this._onTrackMetadata = null;
         this._onDataAvailable = null;
     }
@@ -177,12 +177,12 @@ class FLVDemuxer {
         this._onMediaInfo = callback;
     }
 
-    get onMetadataArrived() {
-        return this._onMetadataArrived;
+    get onMetaDataArrived() {
+        return this._onMetaDataArrived;
     }
 
-    set onMetadataArrived(callback) {
-        this._onMetadataArrived = callback;
+    set onMetaDataArrived(callback) {
+        this._onMetaDataArrived = callback;
     }
 
     // prototype: function(type: number, info: string): void
@@ -369,6 +369,10 @@ class FLVDemuxer {
             this._metadata = scriptData;
             let onMetaData = this._metadata.onMetaData;
 
+            if (this._onMetaDataArrived) {
+                this._onMetaDataArrived(Object.assign({}, onMetaData));
+            }
+
             if (typeof onMetaData.hasAudio === 'boolean') {  // hasAudio
                 if (this._hasAudioFlagOverrided === false) {
                     this._hasAudio = onMetaData.hasAudio;
@@ -424,9 +428,6 @@ class FLVDemuxer {
             this._dispatch = false;
             this._mediaInfo.metadata = onMetaData;
             Log.v(this.TAG, 'Parsed onMetaData');
-            if(this._onMetadataArrived) {
-                this._onMetadataArrived(Object.assign({}, onMetaData));
-            }
             if (this._mediaInfo.isComplete()) {
                 this._onMediaInfo(this._mediaInfo);
             }