add elementary stream type enum

dailymotion · Jan 11, 2018 · 3cdffb8 · 3cdffb8
1 parent ed89ce5
commit 3cdffb8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/src/controller/audio-stream-controller.js b/src/controller/audio-stream-controller.js
@@ -13,6 +13,7 @@ import {logger} from '../utils/logger';
 import { findFragWithCC } from '../utils/discontinuities';
 import TaskLoop from '../task-loop';
 import {FragmentState} from '../helper/fragment-tracker';
+import Fragment from '../loader/fragment';
 
 const State = {
   STOPPED : 'STOPPED',
@@ -645,7 +646,7 @@ class AudioStreamController extends TaskLoop {
         data.endDTS = data.startDTS + fragCurrent.duration;
       }
 
-      fragCurrent.addElementaryStream(data.type);
+      fragCurrent.addElementaryStream(Fragment.ElementaryStreamTypes.AUDIO);
 
       logger.log(`parsed ${data.type},PTS:[${data.startPTS.toFixed(3)},${data.endPTS.toFixed(3)}],DTS:[${data.startDTS.toFixed(3)}/${data.endDTS.toFixed(3)}],nb:${data.nb}`);
       LevelHelper.updateFragPTSDTS(track.details,fragCurrent,data.startPTS,data.endPTS);

diff --git a/src/controller/stream-controller.js b/src/controller/stream-controller.js
@@ -7,6 +7,7 @@ import BufferHelper from '../helper/buffer-helper';
 import Demuxer from '../demux/demuxer';
 import Event from '../events';
 import {FragmentState} from '../helper/fragment-tracker';
+import Fragment from '../loader/fragment';
 import * as LevelHelper from '../helper/level-helper';
 import TimeRanges from '../utils/timeRanges';
 import {ErrorTypes, ErrorDetails} from '../errors';
@@ -1090,7 +1091,13 @@ class StreamController extends TaskLoop {
         data.endDTS = data.startDTS + fragCurrent.duration;
       }
 
-      frag.addElementaryStream(data.type);
+      if(data.hasAudio === true) {
+        frag.addElementaryStream(Fragment.ElementaryStreamTypes.AUDIO);
+      }
+
+      if(data.hasVideo === true) {
+        frag.addElementaryStream(Fragment.ElementaryStreamTypes.VIDEO);
+      }
 
       logger.log(`Parsed ${data.type},PTS:[${data.startPTS.toFixed(3)},${data.endPTS.toFixed(3)}],DTS:[${data.startDTS.toFixed(3)}/${data.endDTS.toFixed(3)}],nb:${data.nb},dropped:${data.dropped || 0}`);
 

diff --git a/src/loader/fragment.js b/src/loader/fragment.js
@@ -11,9 +11,23 @@ export default class Fragment {
     this._decryptdata = null;
     this.tagList = [];
 
-    // Holds the type of data this fragment contains(eg. video/audio)
-    // Set is used because the elements should not repeat
-    this._elementaryStreams = new Set();
+    // Holds the types of data this fragment supports
+    this._elementaryStreams = {
+      [Fragment.ElementaryStreamTypes.AUDIO] : false,
+      [Fragment.ElementaryStreamTypes.VIDEO] : false
+    };
+  }
+
+  /**
+   * `type` property for this._elementaryStreams
+   *
+   * @enum
+   */
+  static get ElementaryStreamTypes() {
+    return {
+      AUDIO: 'audio',
+      VIDEO: 'video'
+    };
   }
 
   get url() {
@@ -77,11 +91,11 @@ export default class Fragment {
    * @param {ElementaryStreamType}
    */
   addElementaryStream(type) {
-    this._elementaryStreams.add(type);
+    this._elementaryStreams[type] = true;
   }
 
   hasElementaryStream(type) {
-    return this._elementaryStreams.has(type) === true;
+    return this._elementaryStreams[type] === true;
   }
 
   /**

diff --git a/src/remux/mp4-remuxer.js b/src/remux/mp4-remuxer.js
@@ -416,6 +416,8 @@ class MP4Remuxer {
       startDTS: firstDTS / timeScale,
       endDTS: this.nextAvcDts / timeScale,
       type: 'video',
+      hasAudio: false,
+      hasVideo: true,
       nb: outputSamples.length,
       dropped : dropped
     };
@@ -674,6 +676,8 @@ class MP4Remuxer {
         startDTS: start,
         endDTS: end,
         type: 'audio',
+        hasAudio: true,
+        hasVideo: false,
         nb: nbSamples
       };
       this.observer.trigger(Event.FRAG_PARSING_DATA, audioData);

diff --git a/src/remux/passthrough-remuxer.js b/src/remux/passthrough-remuxer.js
@@ -31,6 +31,8 @@ class PassThroughRemuxer {
       startPTS: timeOffset,
       startDTS: timeOffset,
       type: streamType,
+      hasAudio: !!audioTrack,
+      hasVideo: !!videoTrack,
       nb: 1,
       dropped : 0
     });