Merge pull request #451 from dtyszka/samsung_streaming_2014

Change HLS VOD player plugin to support different player for VOD and different player for LIVE, work around 25 fps to 50 fps and vice versa playback failure on Samsung X14 LS
bbc · Jun 20, 2017 · a51643f · a51643f
2 parents 3b2da81 + 4cf9aac
commit a51643f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/static/script-tests/tests/devices/mediaplayer/samsung_streaming.js b/static/script-tests/tests/devices/mediaplayer/samsung_streaming.js
@@ -265,7 +265,7 @@
             assert(playerPlugin.Open.notCalled);
             assert(playerPlugin._methods.InitPlayer.notCalled);
             this._mediaPlayer.setSource(MediaPlayer.TYPE.VIDEO, 'testURL', 'application/vnd.apple.mpegurl');
-            assert(playerPlugin.Open.calledWith('Player', '1.010', 'Player'));
+            assert(playerPlugin.Open.calledWith('StreamingPlayer', '1.0', 'StreamingPlayer'));
             assert(playerPlugin.Open.calledOnce);
             assert(playerPlugin._methods.InitPlayer.calledWith('testURL|COMPONENT=HLS'));
             assert(playerPlugin._methods.InitPlayer.calledOnce);
@@ -282,7 +282,7 @@
             assert(playerPlugin.Open.notCalled);
             assert(playerPlugin._methods.InitPlayer.notCalled);
             this._mediaPlayer.setSource(MediaPlayer.TYPE.VIDEO, 'testURL', 'application/vnd.apple.mpegurl');
-            assert(playerPlugin.Open.calledWith('Player', '1.010', 'Player'));
+            assert(playerPlugin.Open.calledWith('StreamingPlayer', '1.0', 'StreamingPlayer'));
             assert(playerPlugin.Open.calledOnce);
             assert(playerPlugin._methods.InitPlayer.calledWith('testURL|COMPONENT=HLS'));
             assert(playerPlugin._methods.InitPlayer.calledOnce);

diff --git a/static/script/devices/mediaplayer/samsung_streaming.js b/static/script/devices/mediaplayer/samsung_streaming.js
@@ -82,12 +82,11 @@ require.def(
                     this._toStopped();
 
                     if (this._isHlsMimeType()) {
+                        this._openStreamingPlayerPlugin();
                         if (this._isLiveMedia()) {
                             this._source += '|HLSSLIDING|COMPONENT=HLS';
-                            this._openStreamingPlayerPlugin();
                         } else {
                             this._source += '|COMPONENT=HLS';
-                            this._openPlayerPlugin();
                         }
                     } else {
                         this._openPlayerPlugin();