@stremio/stremio-video 0.0.49 → 0.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.49",
+    "version": "0.0.51",
     "description": "Abstraction layer on top of different media players",
     "author": "Smart Code OOD",
     "main": "src/index.js",

package/src/HTMLVideo/HTMLVideo.js

@@ -189,7 +189,7 @@ function HTMLVideo(options) {
                         return Object.freeze({
                             id: 'EMBEDDED_' + String(index),
                             lang: track.language,
-                            label: track.label,
+                            label: track.label || null,
                             origin: 'EMBEDDED',
                             embedded: true
                         });

package/src/StremioVideo/selectVideoImplementation.js

@@ -2,6 +2,7 @@ var ChromecastSenderVideo = require('../ChromecastSenderVideo');
 var ShellVideo = require('../ShellVideo');
 var HTMLVideo = require('../HTMLVideo');
 var TizenVideo = require('../TizenVideo');
+var TitanVideo = require('../TitanVideo');
 var WebOsVideo = require('../WebOsVideo');
 var IFrameVideo = require('../IFrameVideo');
 var YouTubeVideo = require('../YouTubeVideo');
@@ -37,6 +38,9 @@ function selectVideoImplementation(commandArgs, options) {
         if (commandArgs.platform === 'webOS') {
             return withStreamingServer(withHTMLSubtitles(WebOsVideo));
         }
+        if (commandArgs.platform === 'Titan' || commandArgs.platform === 'NetTV') {
+            return withStreamingServer(withHTMLSubtitles(TitanVideo));
+        }
         return withStreamingServer(withHTMLSubtitles(HTMLVideo));
     }
 
@@ -47,6 +51,9 @@ function selectVideoImplementation(commandArgs, options) {
         if (commandArgs.platform === 'webOS') {
             return withVideoParams(withHTMLSubtitles(WebOsVideo));
         }
+        if (commandArgs.platform === 'Titan' || commandArgs.platform === 'NetTV') {
+            return withVideoParams(withHTMLSubtitles(TitanVideo));
+        }
         return withVideoParams(withHTMLSubtitles(HTMLVideo));
     }
 

package/src/TitanVideo/TitanVideo.js

@@ -0,0 +1,667 @@
+var EventEmitter = require('eventemitter3');
+var cloneDeep = require('lodash.clonedeep');
+var deepFreeze = require('deep-freeze');
+var Color = require('color');
+var ERROR = require('../error');
+
+function TitanVideo(options) {
+    options = options || {};
+
+    var containerElement = options.containerElement;
+    if (!(containerElement instanceof HTMLElement)) {
+        throw new Error('Container element required to be instance of HTMLElement');
+    }
+
+    var styleElement = document.createElement('style');
+    containerElement.appendChild(styleElement);
+    styleElement.sheet.insertRule('video::cue { font-size: 4vmin; color: rgb(255, 255, 255); background-color: rgba(0, 0, 0, 0); text-shadow: rgb(34, 34, 34) 1px 1px 0.1em; }');
+    var videoElement = document.createElement('video');
+    videoElement.style.width = '100%';
+    videoElement.style.height = '100%';
+    videoElement.style.backgroundColor = 'black';
+    videoElement.controls = false;
+    videoElement.playsInline = true;
+    videoElement.onerror = function() {
+        onVideoError();
+    };
+    videoElement.onended = function() {
+        onEnded();
+    };
+    videoElement.onpause = function() {
+        onPropChanged('paused');
+    };
+    videoElement.onplay = function() {
+        onPropChanged('paused');
+    };
+    videoElement.ontimeupdate = function() {
+        onPropChanged('time');
+        onPropChanged('buffered');
+    };
+    videoElement.ondurationchange = function() {
+        onPropChanged('duration');
+    };
+    videoElement.onwaiting = function() {
+        onPropChanged('buffering');
+        onPropChanged('buffered');
+    };
+    videoElement.onseeking = function() {
+        onPropChanged('time');
+        onPropChanged('buffering');
+        onPropChanged('buffered');
+    };
+    videoElement.onseeked = function() {
+        onPropChanged('time');
+        onPropChanged('buffering');
+        onPropChanged('buffered');
+    };
+    videoElement.onstalled = function() {
+        onPropChanged('buffering');
+        onPropChanged('buffered');
+    };
+    videoElement.onplaying = function() {
+        onPropChanged('time');
+        onPropChanged('buffering');
+        onPropChanged('buffered');
+    };
+    videoElement.oncanplay = function() {
+        onPropChanged('buffering');
+        onPropChanged('buffered');
+    };
+    videoElement.canplaythrough = function() {
+        onPropChanged('buffering');
+        onPropChanged('buffered');
+    };
+    videoElement.onloadedmetadata = function() {
+        onPropChanged('loaded');
+    };
+    videoElement.onloadeddata = function() {
+        onPropChanged('buffering');
+        onPropChanged('buffered');
+    };
+    videoElement.onvolumechange = function() {
+        onPropChanged('volume');
+        onPropChanged('muted');
+    };
+    videoElement.onratechange = function() {
+        onPropChanged('playbackSpeed');
+    };
+    videoElement.textTracks.onchange = function() {
+        onPropChanged('subtitlesTracks');
+        onPropChanged('selectedSubtitlesTrackId');
+        onCueChange();
+        Array.from(videoElement.textTracks).forEach(function(track) {
+            track.oncuechange = onCueChange;
+        });
+    };
+    containerElement.appendChild(videoElement);
+
+    var events = new EventEmitter();
+    var destroyed = false;
+    var stream = null;
+    var subtitlesOffset = 0;
+    var observedProps = {
+        stream: false,
+        loaded: false,
+        paused: false,
+        time: false,
+        duration: false,
+        buffering: false,
+        buffered: false,
+        subtitlesTracks: false,
+        selectedSubtitlesTrackId: false,
+        subtitlesOffset: false,
+        subtitlesSize: false,
+        subtitlesTextColor: false,
+        subtitlesBackgroundColor: false,
+        subtitlesOutlineColor: false,
+        audioTracks: false,
+        selectedAudioTrackId: false,
+        volume: false,
+        muted: false,
+        playbackSpeed: false
+    };
+
+    function getProp(propName) {
+        switch (propName) {
+            case 'stream': {
+                return stream;
+            }
+            case 'loaded': {
+                if (stream === null) {
+                    return null;
+                }
+
+                return videoElement.readyState >= videoElement.HAVE_METADATA;
+            }
+            case 'paused': {
+                if (stream === null) {
+                    return null;
+                }
+
+                return !!videoElement.paused;
+            }
+            case 'time': {
+                if (stream === null || videoElement.currentTime === null || !isFinite(videoElement.currentTime)) {
+                    return null;
+                }
+
+                return Math.floor(videoElement.currentTime * 1000);
+            }
+            case 'duration': {
+                if (stream === null || videoElement.duration === null || !isFinite(videoElement.duration)) {
+                    return null;
+                }
+
+                return Math.floor(videoElement.duration * 1000);
+            }
+            case 'buffering': {
+                if (stream === null) {
+                    return null;
+                }
+
+                return videoElement.readyState < videoElement.HAVE_FUTURE_DATA;
+            }
+            case 'buffered': {
+                if (stream === null) {
+                    return null;
+                }
+
+                var time = videoElement.currentTime !== null && isFinite(videoElement.currentTime) ? videoElement.currentTime : 0;
+                for (var i = 0; i < videoElement.buffered.length; i++) {
+                    if (videoElement.buffered.start(i) <= time && time <= videoElement.buffered.end(i)) {
+                        return Math.floor(videoElement.buffered.end(i) * 1000);
+                    }
+                }
+
+                return Math.floor(time * 1000);
+            }
+            case 'subtitlesTracks': {
+                if (stream === null) {
+                    return [];
+                }
+
+                if (!videoElement.textTracks || !Array.from(videoElement.textTracks).length) {
+                    return [];
+                }
+
+                return Array.from(videoElement.textTracks)
+                    .filter(function(track) {
+                        return track.kind === 'subtitles';
+                    })
+                    .map(function(track, index) {
+                        return Object.freeze({
+                            id: 'EMBEDDED_' + String(index),
+                            lang: track.language,
+                            label: track.label || null,
+                            origin: 'EMBEDDED',
+                            embedded: true
+                        });
+                    });
+            }
+            case 'selectedSubtitlesTrackId': {
+                if (stream === null) {
+                    return null;
+                }
+
+                if (!videoElement.textTracks || !Array.from(videoElement.textTracks).length) {
+                    return null;
+                }
+
+                return Array.from(videoElement.textTracks)
+                    .reduce(function(result, track, index) {
+                        if (result === null && track.mode === 'showing') {
+                            return 'EMBEDDED_' + String(index);
+                        }
+
+                        return result;
+                    }, null);
+            }
+            case 'subtitlesOffset': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return subtitlesOffset;
+            }
+            case 'subtitlesSize': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return parseInt(styleElement.sheet.cssRules[0].style.fontSize, 10) * 25;
+            }
+            case 'subtitlesTextColor': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return styleElement.sheet.cssRules[0].style.color;
+            }
+            case 'subtitlesBackgroundColor': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return styleElement.sheet.cssRules[0].style.backgroundColor;
+            }
+            case 'subtitlesOutlineColor': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return styleElement.sheet.cssRules[0].style.textShadow.slice(0, styleElement.sheet.cssRules[0].style.textShadow.indexOf(')') + 1);
+            }
+            case 'audioTracks': {
+                if (stream === null) {
+                    return [];
+                }
+
+                if (!videoElement.audioTracks || !Array.from(videoElement.audioTracks).length) {
+                    return [];
+                }
+
+                return Array.from(videoElement.audioTracks)
+                    .map(function(track, index) {
+                        return Object.freeze({
+                            id: 'EMBEDDED_' + String(index),
+                            lang: track.language,
+                            label: track.label || null,
+                            origin: 'EMBEDDED',
+                            embedded: true
+                        });
+                    });
+            }
+            case 'selectedAudioTrackId': {
+
+                if (stream === null) {
+                    return null;
+                }
+
+                if (!videoElement.audioTracks || !Array.from(videoElement.audioTracks).length) {
+                    return null;
+                }
+
+                return Array.from(videoElement.audioTracks)
+                    .reduce(function(result, track, index) {
+                        if (result === null && track.enabled) {
+                            return 'EMBEDDED_' + String(index);
+                        }
+
+                        return result;
+                    }, null);
+            }
+            case 'volume': {
+                if (destroyed || videoElement.volume === null || !isFinite(videoElement.volume)) {
+                    return null;
+                }
+
+                return Math.floor(videoElement.volume * 100);
+            }
+            case 'muted': {
+                if (destroyed) {
+                    return null;
+                }
+
+                return !!videoElement.muted;
+            }
+            case 'playbackSpeed': {
+                if (destroyed || videoElement.playbackRate === null || !isFinite(videoElement.playbackRate)) {
+                    return null;
+                }
+
+                return videoElement.playbackRate;
+            }
+            default: {
+                return null;
+            }
+        }
+    }
+    function onCueChange() {
+        Array.from(videoElement.textTracks).forEach(function(track) {
+            Array.from(track.cues || []).forEach(function(cue) {
+                cue.snapToLines = false;
+                cue.line = 100 - subtitlesOffset;
+            });
+        });
+    }
+    function onVideoError() {
+        if (destroyed) {
+            return;
+        }
+
+        var error;
+        switch (videoElement.error.code) {
+            case 1: {
+                error = ERROR.HTML_VIDEO.MEDIA_ERR_ABORTED;
+                break;
+            }
+            case 2: {
+                error = ERROR.HTML_VIDEO.MEDIA_ERR_NETWORK;
+                break;
+            }
+            case 3: {
+                error = ERROR.HTML_VIDEO.MEDIA_ERR_DECODE;
+                break;
+            }
+            case 4: {
+                error = ERROR.HTML_VIDEO.MEDIA_ERR_SRC_NOT_SUPPORTED;
+                break;
+            }
+            default: {
+                error = ERROR.UNKNOWN_ERROR;
+            }
+        }
+        onError(Object.assign({}, error, {
+            critical: true,
+            error: videoElement.error
+        }));
+    }
+    function onError(error) {
+        events.emit('error', error);
+        if (error.critical) {
+            command('unload');
+        }
+    }
+    function onEnded() {
+        events.emit('ended');
+    }
+    function onPropChanged(propName) {
+        if (observedProps[propName]) {
+            events.emit('propChanged', propName, getProp(propName));
+        }
+    }
+    function observeProp(propName) {
+        if (observedProps.hasOwnProperty(propName)) {
+            events.emit('propValue', propName, getProp(propName));
+            observedProps[propName] = true;
+        }
+    }
+    function setProp(propName, propValue) {
+        switch (propName) {
+            case 'paused': {
+                if (stream !== null) {
+                    propValue ? videoElement.pause() : videoElement.play();
+                    onPropChanged('paused');
+                }
+
+                break;
+            }
+            case 'time': {
+                if (stream !== null && propValue !== null && isFinite(propValue)) {
+                    videoElement.currentTime = parseInt(propValue, 10) / 1000;
+                    onPropChanged('time');
+                }
+
+                break;
+            }
+            case 'selectedSubtitlesTrackId': {
+                if (stream !== null) {
+                    Array.from(videoElement.textTracks)
+                        .forEach(function(track, index) {
+                            track.mode = 'EMBEDDED_' + String(index) === propValue ? 'showing' : 'disabled';
+                        });
+                    var selectedSubtitlesTrack = getProp('subtitlesTracks')
+                        .find(function(track) {
+                            return track.id === propValue;
+                        });
+                    if (selectedSubtitlesTrack) {
+                        onPropChanged('selectedSubtitlesTrackId');
+                        events.emit('subtitlesTrackLoaded', selectedSubtitlesTrack);
+                    }
+                }
+
+                break;
+            }
+            case 'subtitlesOffset': {
+                if (propValue !== null && isFinite(propValue)) {
+                    subtitlesOffset = Math.max(0, Math.min(100, parseInt(propValue, 10)));
+                    onCueChange();
+                    onPropChanged('subtitlesOffset');
+                }
+
+                break;
+            }
+            case 'subtitlesSize': {
+                if (propValue !== null && isFinite(propValue)) {
+                    styleElement.sheet.cssRules[0].style.fontSize = Math.floor(Math.max(0, parseInt(propValue, 10)) / 25) + 'vmin';
+                    onPropChanged('subtitlesSize');
+                }
+
+                break;
+            }
+            case 'subtitlesTextColor': {
+                if (typeof propValue === 'string') {
+                    try {
+                        styleElement.sheet.cssRules[0].style.color = Color(propValue).rgb().string();
+                    } catch (error) {
+                        // eslint-disable-next-line no-console
+                        console.error('TitanVideo', error);
+                    }
+
+                    onPropChanged('subtitlesTextColor');
+                }
+
+                break;
+            }
+            case 'subtitlesBackgroundColor': {
+                if (typeof propValue === 'string') {
+                    try {
+                        styleElement.sheet.cssRules[0].style.backgroundColor = Color(propValue).rgb().string();
+                    } catch (error) {
+                        // eslint-disable-next-line no-console
+                        console.error('TitanVideo', error);
+                    }
+
+                    onPropChanged('subtitlesBackgroundColor');
+                }
+
+                break;
+            }
+            case 'subtitlesOutlineColor': {
+                if (typeof propValue === 'string') {
+                    try {
+                        styleElement.sheet.cssRules[0].style.textShadow = Color(propValue).rgb().string() + ' 1px 1px 0.1em';
+                    } catch (error) {
+                        // eslint-disable-next-line no-console
+                        console.error('TitanVideo', error);
+                    }
+
+                    onPropChanged('subtitlesOutlineColor');
+                }
+
+                break;
+            }
+            case 'selectedAudioTrackId': {
+                if (stream !== null) {
+                    for (var index = 0; index < videoElement.audioTracks.length; index++) {
+                        videoElement.audioTracks[index].enabled = !!('EMBEDDED_' + String(index) === propValue);
+                    }
+                }
+
+                var selectedAudioTrack = getProp('audioTracks')
+                    .find(function(track) {
+                        return track.id === propValue;
+                    });
+
+                if (selectedAudioTrack) {
+                    onPropChanged('selectedAudioTrackId');
+                    events.emit('audioTrackLoaded', selectedAudioTrack);
+                }
+
+                break;
+            }
+            case 'volume': {
+                if (propValue !== null && isFinite(propValue)) {
+                    videoElement.muted = false;
+                    videoElement.volume = Math.max(0, Math.min(100, parseInt(propValue, 10))) / 100;
+                    onPropChanged('muted');
+                    onPropChanged('volume');
+                }
+
+                break;
+            }
+            case 'muted': {
+                videoElement.muted = !!propValue;
+                onPropChanged('muted');
+                break;
+            }
+            case 'playbackSpeed': {
+                if (propValue !== null && isFinite(propValue)) {
+                    videoElement.playbackRate = parseFloat(propValue);
+                    onPropChanged('playbackSpeed');
+                }
+
+                break;
+            }
+        }
+    }
+    function command(commandName, commandArgs) {
+        switch (commandName) {
+            case 'load': {
+                command('unload');
+                if (commandArgs && commandArgs.stream && typeof commandArgs.stream.url === 'string') {
+                    stream = commandArgs.stream;
+                    onPropChanged('stream');
+                    onPropChanged('loaded');
+                    videoElement.autoplay = typeof commandArgs.autoplay === 'boolean' ? commandArgs.autoplay : true;
+                    videoElement.currentTime = commandArgs.time !== null && isFinite(commandArgs.time) ? parseInt(commandArgs.time, 10) / 1000 : 0;
+                    onPropChanged('paused');
+                    onPropChanged('time');
+                    onPropChanged('duration');
+                    onPropChanged('buffering');
+                    onPropChanged('buffered');
+                    if (videoElement.textTracks) {
+                        videoElement.textTracks.onaddtrack = function() {
+                            videoElement.textTracks.onaddtrack = null;
+                            setTimeout(function() {
+                                onPropChanged('subtitlesTracks');
+                                onPropChanged('selectedSubtitlesTrackId');
+                            });
+                        };
+                    }
+                    if (videoElement.audioTracks) {
+                        videoElement.audioTracks.onaddtrack = function() {
+                            videoElement.audioTracks.onaddtrack = null;
+                            setTimeout(function() {
+                                onPropChanged('audioTracks');
+                                onPropChanged('selectedAudioTrackId');
+                            });
+                        };
+                    }
+                    videoElement.src = stream.url;
+                } else {
+                    onError(Object.assign({}, ERROR.UNSUPPORTED_STREAM, {
+                        critical: true,
+                        stream: commandArgs ? commandArgs.stream : null
+                    }));
+                }
+                break;
+            }
+            case 'unload': {
+                stream = null;
+                Array.from(videoElement.textTracks).forEach(function(track) {
+                    track.oncuechange = null;
+                });
+                videoElement.removeAttribute('src');
+                videoElement.load();
+                videoElement.currentTime = 0;
+                onPropChanged('stream');
+                onPropChanged('loaded');
+                onPropChanged('paused');
+                onPropChanged('time');
+                onPropChanged('duration');
+                onPropChanged('buffering');
+                onPropChanged('buffered');
+                onPropChanged('subtitlesTracks');
+                onPropChanged('selectedSubtitlesTrackId');
+                onPropChanged('audioTracks');
+                onPropChanged('selectedAudioTrackId');
+                break;
+            }
+            case 'destroy': {
+                command('unload');
+                destroyed = true;
+                onPropChanged('subtitlesOffset');
+                onPropChanged('subtitlesSize');
+                onPropChanged('subtitlesTextColor');
+                onPropChanged('subtitlesBackgroundColor');
+                onPropChanged('subtitlesOutlineColor');
+                onPropChanged('volume');
+                onPropChanged('muted');
+                onPropChanged('playbackSpeed');
+                events.removeAllListeners();
+                videoElement.onerror = null;
+                videoElement.onended = null;
+                videoElement.onpause = null;
+                videoElement.onplay = null;
+                videoElement.ontimeupdate = null;
+                videoElement.ondurationchange = null;
+                videoElement.onwaiting = null;
+                videoElement.onseeking = null;
+                videoElement.onseeked = null;
+                videoElement.onstalled = null;
+                videoElement.onplaying = null;
+                videoElement.oncanplay = null;
+                videoElement.canplaythrough = null;
+                videoElement.onloadeddata = null;
+                videoElement.onvolumechange = null;
+                videoElement.onratechange = null;
+                videoElement.textTracks.onchange = null;
+                containerElement.removeChild(videoElement);
+                containerElement.removeChild(styleElement);
+                break;
+            }
+        }
+    }
+
+    this.on = function(eventName, listener) {
+        if (destroyed) {
+            throw new Error('Video is destroyed');
+        }
+
+        events.on(eventName, listener);
+    };
+    this.dispatch = function(action) {
+        if (destroyed) {
+            throw new Error('Video is destroyed');
+        }
+
+        if (action) {
+            action = deepFreeze(cloneDeep(action));
+            switch (action.type) {
+                case 'observeProp': {
+                    observeProp(action.propName);
+                    return;
+                }
+                case 'setProp': {
+                    setProp(action.propName, action.propValue);
+                    return;
+                }
+                case 'command': {
+                    command(action.commandName, action.commandArgs);
+                    return;
+                }
+            }
+        }
+
+        throw new Error('Invalid action dispatched: ' + JSON.stringify(action));
+    };
+}
+
+TitanVideo.canPlayStream = function(stream) {
+    if (!stream) {
+        return Promise.resolve(false);
+    }
+
+    return Promise.resolve(true);
+};
+
+TitanVideo.manifest = {
+    name: 'TitanVideo',
+    external: false,
+    props: ['stream', 'loaded', 'paused', 'time', 'duration', 'buffering', 'buffered', 'audioTracks', 'selectedAudioTrackId', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'subtitlesOffset', 'subtitlesSize', 'subtitlesTextColor', 'subtitlesBackgroundColor', 'subtitlesOutlineColor', 'volume', 'muted', 'playbackSpeed'],
+    commands: ['load', 'unload', 'destroy'],
+    events: ['propValue', 'propChanged', 'ended', 'error', 'subtitlesTrackLoaded', 'audioTrackLoaded']
+};
+
+module.exports = TitanVideo;

package/src/TitanVideo/index.js

@@ -0,0 +1,3 @@
+var TitanVideo = require('./TitanVideo');
+
+module.exports = TitanVideo;

package/src/TizenVideo/TizenVideo.js

@@ -244,18 +244,20 @@ function TizenVideo(options) {
                             extra = JSON.parse(textTrack.extra_info);
                         } catch(e) {}
                         var textTrackLang = typeof extra.track_lang === 'string' && extra.track_lang.length > 0 ? extra.track_lang.trim() : null;
+                        var textTrackLabel = null;
                         if (((tracksData || {}).subs || []).length) {
                             var extendedTrackData = tracksData.subs.find(function(el) {
                                 return (el || {}).id-1 === textTrack.index;
                             });
                             if (extendedTrackData) {
                                 textTrackLang = extendedTrackData.lang || 'eng';
+                                textTrackLabel = extendedTrackData.label || null;
                             }
                         }
                         textTracks.push({
                             id: textTrackId,
                             lang: textTrackLang,
-                            label: textTrackLang,
+                            label: textTrackLabel,
                             origin: 'EMBEDDED',
                             embedded: true,
                             mode: !disabledSubs && textTrackId === currentSubTrack ? 'showing' : 'disabled',
@@ -346,18 +348,20 @@ function TizenVideo(options) {
                             extra = JSON.parse(audioTrack.extra_info);
                         } catch(e) {}
                         var audioTrackLang = typeof extra.language === 'string' && extra.language.length > 0 ? extra.language : null;
+                        var audioTrackLabel = null;
                         if (((tracksData || {}).audio || []).length) {
                             var extendedTrackData = tracksData.audio.find(function(el) {
                                 return (el || {}).id-1 === audioTrack.index;
                             });
                             if (extendedTrackData) {
                                 audioTrackLang = extendedTrackData.lang || 'eng';
+                                audioTrackLabel = extendedTrackData.label || null;
                             }
                         }
                         audioTracks.push({
                             id: audioTrackId,
                             lang: audioTrackLang,
-                            label: audioTrackLang,
+                            label: audioTrackLabel,
                             origin: 'EMBEDDED',
                             embedded: true,
                             mode: audioTrackId === currentAudioTrack ? 'showing' : 'disabled',

package/src/WebOsVideo/WebOsVideo.js

@@ -370,7 +370,7 @@ function WebOsVideo(options) {
                         textTracks.push({
                             id: 'EMBEDDED_' + textTrackId,
                             lang: track.lang || 'eng',
-                            label: track.lang || 'eng',
+                            label: track.label || null,
                             origin: 'EMBEDDED',
                             embedded: true,
                             mode: textTrackId === currentSubTrack ? 'showing' : 'disabled',
@@ -392,7 +392,7 @@ function WebOsVideo(options) {
                         audioTracks.push({
                             id: 'EMBEDDED_' + audioTrackId,
                             lang: track.lang || 'eng',
-                            label: track.lang || 'eng',
+                            label: track.label || null,
                             origin: 'EMBEDDED',
                             embedded: true,
                             mode: audioTrackId === currentAudioTrack ? 'showing' : 'disabled',

package/src/supportsTranscoding.js

@@ -1,7 +1,7 @@
 var platform = require('./platform');
 
 function supportsTranscoding() {
-    if (['Tizen', 'webOS'].includes(platform.get()) || typeof window.qt !== 'undefined') {
+    if (['Tizen', 'webOS', 'Titan', 'NetTV'].includes(platform.get()) || typeof window.qt !== 'undefined') {
         return Promise.resolve(false);
     }
     return Promise.resolve(true);

package/src/withHTMLSubtitles/withHTMLSubtitles.js

@@ -225,40 +225,48 @@ function withHTMLSubtitles(Video) {
                     if (selectedTrack) {
                         selectedTrackId = selectedTrack.id;
                         delay = 0;
-                        fetch(selectedTrack.url)
-                            .then(function(resp) {
-                                if (resp.ok) {
-                                    return resp.text();
-                                }
-
-                                throw new Error(resp.status + ' (' + resp.statusText + ')');
-                            })
-                            .then(function(text) {
-                                return subtitlesConverter.convert(text);
-                            })
-                            .then(function(text) {
-                                return subtitlesParser.parse(text);
-                            })
-                            .then(function(result) {
-                                if (selectedTrackId !== selectedTrack.id) {
-                                    return;
-                                }
-
-                                cuesByTime = result;
-                                renderSubtitles();
-                                events.emit('extraSubtitlesTrackLoaded', selectedTrack);
-                            })
-                            .catch(function(error) {
-                                if (selectedTrackId !== selectedTrack.id) {
-                                    return;
-                                }
-
-                                onError(Object.assign({}, ERROR.WITH_HTML_SUBTITLES.LOAD_FAILED, {
-                                    error: error,
-                                    track: selectedTrack,
-                                    critical: false
-                                }));
-                            });
+                        function loadSubtitleFromUrl(url, isFallback) {
+                            fetch(url)
+                                .then(function(resp) {
+                                    if (resp.ok) {
+                                        return resp.text();
+                                    }
+
+                                    throw new Error(resp.status + ' (' + resp.statusText + ')');
+                                })
+                                .then(function(text) {
+                                    return subtitlesConverter.convert(text);
+                                })
+                                .then(function(text) {
+                                    return subtitlesParser.parse(text);
+                                })
+                                .then(function(result) {
+                                    if (selectedTrackId !== selectedTrack.id) {
+                                        return;
+                                    }
+
+                                    cuesByTime = result;
+                                    renderSubtitles();
+                                    events.emit('extraSubtitlesTrackLoaded', selectedTrack);
+                                })
+                                .catch(function(error) {
+                                    if (selectedTrackId !== selectedTrack.id) {
+                                        return;
+                                    }
+
+                                    if (!isFallback && typeof selectedTrack.fallbackUrl === 'string') {
+                                        loadSubtitleFromUrl(selectedTrack.fallbackUrl, true);
+                                        return;
+                                    }
+
+                                    onError(Object.assign({}, ERROR.WITH_HTML_SUBTITLES.LOAD_FAILED, {
+                                        error: error,
+                                        track: selectedTrack,
+                                        critical: false
+                                    }));
+                                });
+                        }
+                        loadSubtitleFromUrl(selectedTrack.url);
                     }
                     renderSubtitles();
                     onPropChanged('selectedExtraSubtitlesTrackId');

package/src/withStreamingServer/withStreamingServer.js

@@ -259,6 +259,8 @@ function withStreamingServer(Video) {
                                 commandArgs: Object.assign({}, commandArgs, {
                                     tracks: commandArgs.tracks.map(function(track) {
                                         return Object.assign({}, track, {
+                                            // fallback is used in case server conversion fails (if server is offline)
+                                            fallbackUrl: track.url,
                                             url: typeof track.url === 'string' ?
                                                 url.resolve(loadArgs.streamingServerURL, '/subtitles.vtt?' + new URLSearchParams([['from', track.url]]).toString())
                                                 :