From d7b4d24ba6fb23302de139a122229ff69446ff30 Mon Sep 17 00:00:00 2001
From: Jeff Cunat <jeanfrancois.cunat@orange.com>
Date: Mon, 20 Apr 2020 17:25:45 +0200
Subject: [PATCH] MediaPlayer.setInitialMediaSettingsFor compatible with
 fragmentedText media type

---
 samples/captioning/multi-track-captions.html |  6 +++
 samples/dash-if-reference-player/app/main.js |  9 ++++-
 samples/dash-if-reference-player/index.html  |  4 +-
 src/streaming/MediaPlayer.js                 |  8 ++--
 src/streaming/controllers/MediaController.js |  1 +
 src/streaming/text/TextController.js         | 32 ++++++++++------
 test/unit/mocks/MediaControllerMock.js       |  7 ++++
 test/unit/streaming.MediaPlayer.js           |  7 ++++
 test/unit/streaming.text.TextController.js   | 39 ++++++++++++++++++--
 9 files changed, 92 insertions(+), 21 deletions(-)

diff --git a/samples/captioning/multi-track-captions.html b/samples/captioning/multi-track-captions.html
index c559eb959e..96207d47b3 100644
--- a/samples/captioning/multi-track-captions.html
+++ b/samples/captioning/multi-track-captions.html
@@ -28,6 +28,12 @@
 
             player = dashjs.MediaPlayer().create();
             player.initialize(videoElement, url, true);
+            /* player.setInitialMediaSettingsFor('fragmentedText', { 
+                lang: 'eng',
+                role: 'caption'
+            });
+            */
+            // player.setTextDefaultLanguage('swe');
             player.attachTTMLRenderingDiv(TTMLRenderingDiv);
             controlbar = new ControlBar(player); // Checkout ControlBar.js for more info on how to target/add text tracks to UI
             controlbar.initialize();
diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 6a5c784455..325efa8fa2 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -619,7 +619,14 @@ app.controller('DashController', function ($scope, sources, contributors, dashif
             });
         }
         if ($scope.initialSettings.text) {
-            $scope.player.setTextDefaultLanguage($scope.initialSettings.text);
+            if ($scope.initialSettings.textRole) {
+                $scope.player.setInitialMediaSettingsFor('fragmentedText', {
+                    role: $scope.initialSettings.textRole,
+                    lang: $scope.initialSettings.text
+                });
+            } else {
+                $scope.player.setTextDefaultLanguage($scope.initialSettings.text);
+            }
         }
         $scope.player.setTextDefaultEnabled($scope.initialSettings.textEnabled);
         $scope.player.enableForcedTextStreaming($scope.initialSettings.forceTextStreaming);
diff --git a/samples/dash-if-reference-player/index.html b/samples/dash-if-reference-player/index.html
index 40f5d56e18..9c5521de2e 100644
--- a/samples/dash-if-reference-player/index.html
+++ b/samples/dash-if-reference-player/index.html
@@ -239,8 +239,10 @@
                     <label class="options-label">Audio:</label>
                     <input type="text" class="form-control" placeholder="audio initial lang, e.g. 'en'" ng-model="initialSettings.audio">
                     <label class="options-label">Video:</label>
-                    <input type="text" class="form-control" placeholder="initial role, e.g. 'alternate'" ng-model="initialSettings.video">        <label class="options-label">Text:</label>
+                    <input type="text" class="form-control" placeholder="initial role, e.g. 'alternate'" ng-model="initialSettings.video">
+                    <label class="options-label">Text:</label>
                     <input type="text" class="form-control" placeholder="text initial lang, e.g. 'en'" ng-model="initialSettings.text">
+                    <input type="text" class="form-control" placeholder="text initial role, e.g. 'caption'" ng-model="initialSettings.textRole">
                     <label class="topcoat-checkbox" data-toggle="tooltip" data-placement="right"
                            title="Enable subtitle on loading text">
                         <input type="checkbox" id="enableTextAtLoading" ng-model="initialSettings.textEnabled">
diff --git a/src/streaming/MediaPlayer.js b/src/streaming/MediaPlayer.js
index e7740c7b63..5dce89829e 100644
--- a/src/streaming/MediaPlayer.js
+++ b/src/streaming/MediaPlayer.js
@@ -1370,7 +1370,6 @@ function MediaPlayer() {
         if (textController === undefined) {
             textController = TextController(context).getInstance();
         }
-
         textController.setTextDefaultLanguage(lang);
     }
 
@@ -1696,11 +1695,14 @@ function MediaPlayer() {
      * @throws {@link module:MediaPlayer~MEDIA_PLAYER_NOT_INITIALIZED_ERROR MEDIA_PLAYER_NOT_INITIALIZED_ERROR} if called before initialize function
      * @instance
      */
-    function setQualityForSettingsFor(type, value) {
+    function setInitialMediaSettingsFor(type, value) {
         if (!mediaPlayerInitialized) {
             throw MEDIA_PLAYER_NOT_INITIALIZED_ERROR;
         }
         mediaController.setInitialSettings(type, value);
+        if (type === Constants.FRAGMENTED_TEXT) {
+            textController.setInitialSettings(value);
+        }
     }
 
     /**
@@ -2402,7 +2404,7 @@ function MediaPlayer() {
         getTracksFor: getTracksFor,
         getTracksForTypeFromManifest: getTracksForTypeFromManifest,
         getCurrentTrackFor: getCurrentTrackFor,
-        setInitialMediaSettingsFor: setQualityForSettingsFor,
+        setInitialMediaSettingsFor: setInitialMediaSettingsFor,
         getInitialMediaSettingsFor: getInitialMediaSettingsFor,
         setCurrentTrack: setCurrentTrack,
         getTrackSwitchModeFor: getTrackSwitchModeFor,
diff --git a/src/streaming/controllers/MediaController.js b/src/streaming/controllers/MediaController.js
index 4a7fc12b46..53eaa9e540 100644
--- a/src/streaming/controllers/MediaController.js
+++ b/src/streaming/controllers/MediaController.js
@@ -496,6 +496,7 @@ function MediaController() {
         getSelectionModeForInitialTrack: getSelectionModeForInitialTrack,
         isMultiTrackSupportedByType: isMultiTrackSupportedByType,
         isTracksEqual: isTracksEqual,
+        matchSettings: matchSettings,
         setConfig: setConfig,
         reset: reset
     };
diff --git a/src/streaming/text/TextController.js b/src/streaming/text/TextController.js
index 7fc094c81b..07d74bba39 100644
--- a/src/streaming/text/TextController.js
+++ b/src/streaming/text/TextController.js
@@ -54,7 +54,7 @@ function TextController() {
         vttParser,
         ttmlParser,
         eventBus,
-        defaultLanguage,
+        defaultSettings,
         lastEnabledIndex,
         textDefaultEnabled, // this is used for default settings (each time a file is loaded, we check value of this settings )
         allTracksAreDisabled, // this is used for one session (when a file has been loaded, we use this settings to enable/disable text)
@@ -63,7 +63,7 @@ function TextController() {
 
     function setup() {
 
-        defaultLanguage = '';
+        defaultSettings = {};
         lastEnabledIndex = -1;
         textDefaultEnabled = true;
         forceTextStreaming = false;
@@ -170,24 +170,31 @@ function TextController() {
 
     function setTextDefaultLanguage(lang) {
         checkParameterType(lang, 'string');
-        defaultLanguage = lang;
+        defaultSettings.lang = lang;
+    }
+
+    function setInitialSettings(settings) {
+        defaultSettings = settings;
     }
 
     function getTextDefaultLanguage() {
-        return defaultLanguage;
+        return defaultSettings.lang || '';
     }
 
     function onTextTracksAdded(e) {
         let tracks = e.tracks;
         let index = e.index;
 
-        tracks.some((item, idx) => {
-            if (item.lang === defaultLanguage) {
-                this.setTextTrack(idx);
-                index = idx;
-                return true;
-            }
-        });
+        if (defaultSettings) {
+            tracks.some((item, idx) => {
+                // matchSettings is compatible with setTextDefaultLanguage and setInitialSettings
+                if (mediaController.matchSettings(defaultSettings, item)) {
+                    this.setTextTrack(idx);
+                    index = idx;
+                    return true;
+                }
+            });
+        }
 
         if (!textDefaultEnabled) {
             // disable text at startup
@@ -249,7 +256,7 @@ function TextController() {
     }
 
     function setTextTrack(idx) {
-        //For external time text file,  the only action needed to change a track is marking the track mode to showing.
+        //For external time text file, the only action needed to change a track is marking the track mode to showing.
         // Fragmented text tracks need the additional step of calling TextController.setTextTrack();
         let config = textSourceBuffer.getConfig();
         let fragmentModel = config.fragmentModel;
@@ -342,6 +349,7 @@ function TextController() {
         setTextDefaultLanguage: setTextDefaultLanguage,
         setTextDefaultEnabled: setTextDefaultEnabled,
         getTextDefaultEnabled: getTextDefaultEnabled,
+        setInitialSettings: setInitialSettings,
         enableText: enableText,
         isTextEnabled: isTextEnabled,
         setTextTrack: setTextTrack,
diff --git a/test/unit/mocks/MediaControllerMock.js b/test/unit/mocks/MediaControllerMock.js
index 2aca7b2f97..9cc46d793c 100644
--- a/test/unit/mocks/MediaControllerMock.js
+++ b/test/unit/mocks/MediaControllerMock.js
@@ -104,6 +104,13 @@ class MediaControllerMock {
         return (mediaInfoForType.lang === 'deu');
     }
 
+    matchSettings(settings, track) {
+        const matchRole = !settings.role || !!track.roles.filter(function (item) {
+            return item === settings.role;
+        })[0];
+        return settings.lang === track.lang && matchRole;
+    }
+
     setConfig() {}
 
     reset() {
diff --git a/test/unit/streaming.MediaPlayer.js b/test/unit/streaming.MediaPlayer.js
index c702b55910..9353656f76 100644
--- a/test/unit/streaming.MediaPlayer.js
+++ b/test/unit/streaming.MediaPlayer.js
@@ -1040,6 +1040,13 @@ describe('MediaPlayer', function () {
 
                 initialSettings = player.getInitialMediaSettingsFor('audio');
                 expect(initialSettings).to.equal('settings');
+
+                player.setInitialMediaSettingsFor('fragmentedText', { lang: 'en', role: 'caption'});
+                initialSettings = player.getInitialMediaSettingsFor('fragmentedText');
+                expect(initialSettings).to.exist; ; // jshint ignore:line
+                expect(initialSettings.lang).to.equal('en');
+                expect(initialSettings.role).to.equal('caption');
+
             });
 
             it('should set current track', function () {
diff --git a/test/unit/streaming.text.TextController.js b/test/unit/streaming.text.TextController.js
index c2cc2a7101..b65e985b20 100644
--- a/test/unit/streaming.text.TextController.js
+++ b/test/unit/streaming.text.TextController.js
@@ -8,6 +8,8 @@ import Constants from '../../src/streaming/constants/Constants';
 
 import VideoModelMock from './mocks/VideoModelMock';
 import StreamControllerMock from './mocks/StreamControllerMock';
+import MediaControllerMock from './mocks/MediaControllerMock';
+
 
 const expect = require('chai').expect;
 const context = {};
@@ -19,6 +21,7 @@ describe('TextController', function () {
 
     let videoModelMock = new VideoModelMock();
     let streamControllerMock = new StreamControllerMock();
+    let mediaControllerMock = new MediaControllerMock();
     let textTracks;
     let textController;
 
@@ -49,7 +52,8 @@ describe('TextController', function () {
         textController = TextController(context).getInstance();
         textController.setConfig({
             videoModel: videoModelMock,
-            streamController: streamControllerMock
+            streamController: streamControllerMock,
+            mediaController: mediaControllerMock
         });
     });
 
@@ -208,17 +212,24 @@ describe('TextController', function () {
 
             textTracksQueue.push({
                 index: 0,
-                kind: 'subtitles',
+                roles: ['subtitles'],
                 label: 'sub_en',
                 lang: 'eng'
             });
 
             textTracksQueue.push({
                 index: 1,
-                kind: 'subtitles',
+                roles: ['subtitles'],
                 label: 'sub_fr',
                 lang: 'fr'
             });
+
+            textTracksQueue.push({
+                index: 2,
+                roles: ['captions'],
+                label: 'sub_fr_hoh',
+                lang: 'fr'
+            });
         });
 
         it('should send TEXT_TRACKS_ADDED event', function (done) {
@@ -242,7 +253,7 @@ describe('TextController', function () {
             eventBus.trigger(Events.TEXT_TRACKS_QUEUE_INITIALIZED, event);
         });
 
-        it('should choose langauge according to default language', function (done) {
+        it('should choose language according to default language', function (done) {
             // init test
             textController.setTextDefaultLanguage('fr');
 
@@ -282,6 +293,26 @@ describe('TextController', function () {
             // send event
             eventBus.trigger(Events.TEXT_TRACKS_QUEUE_INITIALIZED, event);
         });
+
+        it('should choose track according to default settings', function (done) {
+            // init test
+            textController.setInitialSettings({ lang: 'fr', role: 'captions' });
+
+            const event = {
+                index: initialIndex,
+                tracks: textTracksQueue
+            };
+            const onTracksAdded = function (e) {
+                expect(e.index).to.equal(2); // jshint ignore:line
+                expect(e.tracks.length).to.equal(textTracksQueue.length); // jshint ignore:line
+                eventBus.off(Events.TEXT_TRACKS_ADDED, onTracksAdded, this);
+                done();
+            };
+            eventBus.on(Events.TEXT_TRACKS_ADDED, onTracksAdded, this);
+
+            // send event
+            eventBus.trigger(Events.TEXT_TRACKS_QUEUE_INITIALIZED, event);
+        });
     });
 
 });