Merge pull request #738 from canalplus/misc/dont-download-video-on-au…

…dio-elt

source-buffers: Do not create a video SourceBuffer on an audio element

src/core/buffers/orchestrator/buffer_orchestrator.ts

@@ -50,7 +50,6 @@ import ABRManager from "../../abr";
 import { SegmentFetcherCreator } from "../../fetchers";
 import SourceBuffersStore, {
   BufferGarbageCollector,
-  getBufferTypes,
   IBufferType,
   ITextTrackSourceBufferOptions,
   QueuedSourceBuffer,
@@ -160,7 +159,7 @@ export default function BufferOrchestrator(
       return null;
     }, null));
 
-  const bufferTypes = getBufferTypes();
+  const bufferTypes = sourceBuffersStore.getBufferTypes();
 
   // Every PeriodBuffers for every possible types
   const buffersArray = bufferTypes.map((bufferType) => {

src/core/source_buffers/index.ts

@@ -22,7 +22,6 @@ import QueuedSourceBuffer, {
   IPushedChunkData,
 } from "./queued_source_buffer";
 import SourceBuffersStore, {
-  getBufferTypes,
   ISourceBufferOptions,
   ITextTrackSourceBufferOptions,
 } from "./source_buffers_store";
@@ -37,5 +36,4 @@ export {
   ISourceBufferOptions,
   ITextTrackSourceBufferOptions,
   QueuedSourceBuffer,
-  getBufferTypes,
 };

src/core/source_buffers/source_buffers_store.ts

@@ -41,24 +41,6 @@ const POSSIBLE_BUFFER_TYPES : IBufferType[] = [ "audio",
                                                 "text",
                                                 "image" ];
 
-/**
- * Get all currently available buffer types.
- * /!\ This list can evolve at runtime depending on feature switching.
- * @returns {Array.<string>}
- */
-export function getBufferTypes() : IBufferType[] {
-  const bufferTypes : IBufferType[] = ["audio", "video"];
-  if (features.nativeTextTracksBuffer != null ||
-      features.htmlTextTracksBuffer != null
-  ) {
-    bufferTypes.push("text");
-  }
-  if (features.imageBuffer != null) {
-    bufferTypes.push("image");
-  }
-  return bufferTypes;
-}
-
 // Options available for a "text" SourceBuffer
 export type ITextTrackSourceBufferOptions = { textTrackMode? : "native";
                                               hideNativeSubtitle? : boolean; } |
@@ -162,6 +144,34 @@ export default class SourceBuffersStore {
     this._onNativeSourceBufferAddedOrDisabled = [];
   }
 
+  /**
+   * Get all currently available buffer types.
+   * /!\ This list can evolve at runtime depending on feature switching.
+   * @returns {Array.<string>}
+   */
+  public getBufferTypes() : IBufferType[] {
+    const bufferTypes : IBufferType[] = this.getNativeBufferTypes();
+    if (features.nativeTextTracksBuffer != null ||
+        features.htmlTextTracksBuffer != null
+    ) {
+      bufferTypes.push("text");
+    }
+    if (features.imageBuffer != null) {
+      bufferTypes.push("image");
+    }
+    return bufferTypes;
+  }
+
+  /**
+   * Get all "native" buffer types that should be created before beginning to
+   * push contents.
+   * @returns {Array.<string>}
+   */
+  public getNativeBufferTypes() : IBufferType[] {
+    return this._mediaElement.nodeName === "AUDIO" ? ["audio"] :
+                                                     ["video", "audio"];
+  }
+
   /**
    * Returns the current "status" of the buffer in the SourceBuffer.
    *
@@ -226,7 +236,7 @@ export default class SourceBuffersStore {
   /**
    * Explicitely disable the SourceBuffer for a given buffer type.
    * A call to this function is needed at least for unused native buffer types
-   * ("audio" and "video"), to be able to emit through
+   * (usually "audio" and "video"), to be able to emit through
    * `waitForUsableSourceBuffers` when conditions are met.
    * @param {string}
    */
@@ -370,13 +380,20 @@ export default class SourceBuffersStore {
    * created native SourceBuffers.
    */
   private _areNativeSourceBuffersUsable() {
-    if (this._initializedSourceBuffers.audio === undefined ||
-        this._initializedSourceBuffers.video === undefined)
+    const nativeBufferTypes = this.getNativeBufferTypes();
+
+    if (nativeBufferTypes.some(sbType =>
+          this._initializedSourceBuffers[sbType] === undefined))
     {
+      // one is not yet initialized/disabled
       return false;
     }
-    if (this._initializedSourceBuffers.video === null) {
-      return this._initializedSourceBuffers.audio !== null;
+
+    if (nativeBufferTypes.every(sbType =>
+          this._initializedSourceBuffers[sbType] === null))
+    {
+      // they all are disabled: we can't play the content
+      return false;
     }
     return true;
   }