Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts: # src/org/mangui/hls/demux/TSDemuxer.as # src/org/mangui/hls/playlist/Manifest.as # src/org/mangui/hls/stream/HLSNetStream.as
mangui · Jul 5, 2016 · 5d4ccc9 · 5d4ccc9
2 parents a2ae0ba + c6ddd75
commit 5d4ccc9
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -248,8 +248,9 @@ After a successful build you will find fresh binaries in the `bin/debug` and `bi
 |<img src="http://press.dailymotion.com/fr/wp-content/uploads/sites/4/2010/06/LOGO-PRESS-BLOG.png" width="80">   |[Dailymotion](http://www.dailymotion.com)|
 |<img src="https://flowplayer.org/media/img/logo-blue.png" width="160">  |[FlowPlayer](http://www.flowplayer.org/)|
 |<img src="https://cloud.githubusercontent.com/assets/244265/12556435/dfaceb48-c353-11e5-971b-2c4429725469.png" width="160">  |[globo.com](https://www.globo.com)|
-|<img src="http://tidal.com/images/tidal-large-black.c8af31d9.png" width="160">  |[Tidal](https://listen.tidal.com/)|
 |<img src="https://cloud.githubusercontent.com/assets/244265/12556385/999aa884-c353-11e5-9102-79df54384498.png" width="160">  |[The New York Times](https://www.nytimes.com)|
+|<img src="https://www.radiantmediaplayer.com/images/radiantmediaplayer-new-logo-640.jpg" width="160">  |[Radiant Media Player](https://www.radiantmediaplayer.com/)|
+|<img src="http://tidal.com/images/tidal-large-black.c8af31d9.png" width="160">  |[Tidal](https://listen.tidal.com/)|
 |<img src="https://www.ubicast.eu/static/website/img/header/logo_ubicast.svg" width="160">  |[Ubicast](https://www.ubicast.eu)|
 
 ## Donation

diff --git a/bin/debug/flashls.swc b/bin/debug/flashls.swc
diff --git a/bin/debug/flashlsChromeless.swf b/bin/debug/flashlsChromeless.swf
diff --git a/bin/debug/flashlsFlowPlayer.swf b/bin/debug/flashlsFlowPlayer.swf
diff --git a/bin/debug/flashlsOSMF.swc b/bin/debug/flashlsOSMF.swc
diff --git a/bin/debug/flashlsOSMF.swf b/bin/debug/flashlsOSMF.swf
diff --git a/bin/release/flashls.swc b/bin/release/flashls.swc
diff --git a/bin/release/flashlsChromeless.swf b/bin/release/flashlsChromeless.swf
diff --git a/bin/release/flashlsFlowPlayer.swf b/bin/release/flashlsFlowPlayer.swf
diff --git a/bin/release/flashlsOSMF.swc b/bin/release/flashlsOSMF.swc
diff --git a/bin/release/flashlsOSMF.swf b/bin/release/flashlsOSMF.swf
diff --git a/build/build_chromeless.sh b/build/build_chromeless.sh
@@ -7,21 +7,32 @@ fi
 OPT_DEBUG="-use-network=false \
     -optimize=true \
     -debug=true \
+    -library-path+=../lib/blooddy_crypto.swc \
     -define=CONFIG::LOGGING,true \
     -define=CONFIG::FLASH_11_1,true"
 
 OPT_RELEASE="-use-network=false \
     -optimize=true \
     -debug=false \
+    -library-path+=../lib/blooddy_crypto.swc \
     -define=CONFIG::LOGGING,false \
     -define=CONFIG::FLASH_11_1,true"
 
+echo "Compiling bin/release/flashlsChromeless.swf"
+$FLEXPATH/bin/mxmlc ../src/org/mangui/chromeless/ChromelessPlayer.as \
+    -source-path ../src \
+    -o ../bin/release/flashlsChromeless.swf \
+    $OPT_RELEASE \
+    -target-player="11.1" \
+    -default-size 480 270 \
+    -default-background-color=0x000000
+./add-opt-in.py ../bin/release/flashlsChromeless.swf
+
 echo "Compiling bin/debug/flashlsChromeless.swf"
 $FLEXPATH/bin/mxmlc ../src/org/mangui/chromeless/ChromelessPlayer.as \
     -source-path ../src \
     -o ../bin/debug/flashlsChromeless.swf \
     $OPT_DEBUG \
-    -library-path+=../lib/blooddy_crypto.swc \
     -target-player="11.1" \
     -default-size 480 270 \
     -default-background-color=0x000000

diff --git a/src/org/mangui/chromeless/ChromelessPlayer.as b/src/org/mangui/chromeless/ChromelessPlayer.as
@@ -251,6 +251,10 @@ package org.mangui.chromeless {
             _trigger("id3Updated", event.ID3Data);
         }
 
+        protected function _liveLoadingStalledHandler(event : HLSEvent) : void {
+            _trigger("liveLoadingStalled");
+        };
+
         /** Javascript getters. **/
         protected function _getCurrentLevel() : int {
             return _hls.currentLevel;
@@ -520,10 +524,11 @@ package org.mangui.chromeless {
             _hls.addEventListener(HLSEvent.FPS_DROP, _fpsDropHandler);
             _hls.addEventListener(HLSEvent.FPS_DROP_LEVEL_CAPPING, _fpsDropLevelCappingHandler);
             _hls.addEventListener(HLSEvent.FPS_DROP_SMOOTH_LEVEL_SWITCH, _fpsDropSmoothLevelSwitchHandler);
+            _hls.addEventListener(HLSEvent.LIVE_LOADING_STALLED, _liveLoadingStalledHandler);
 
             if (available && stage.stageVideos.length > 0) {
                 _stageVideo = stage.stageVideos[0];
-                _stageVideo.addEventListener(StageVideoEvent.RENDER_STATE, _onStageVideoStateChange)
+                _stageVideo.addEventListener(StageVideoEvent.RENDER_STATE, _onStageVideoStateChange);
                 _stageVideo.viewPort = new Rectangle(0, 0, stage.stageWidth, stage.stageHeight);
                 _stageVideo.attachNetStream(_hls.stream);
             } else {

diff --git a/src/org/mangui/hls/demux/TSDemuxer.as b/src/org/mangui/hls/demux/TSDemuxer.as
@@ -836,8 +836,8 @@ package org.mangui.hls.demux {
                     }
                     break;
                 case _pmtId:
-					CONFIG::LOGGING {
-	                    if (_pmtParsed == false || _unknownPIDFound == true) {
+                    CONFIG::LOGGING {
+                        if (_pmtParsed == false || _unknownPIDFound == true) {
                             if(_pmtParsed == false) {
                                 Log.debug("TS: PMT found");
                             } else {

diff --git a/src/org/mangui/hls/playlist/Manifest.as b/src/org/mangui/hls/playlist/Manifest.as
@@ -472,7 +472,7 @@ package org.mangui.hls.playlist {
                         break;
                     case RENDITION_STATE_READSIMPLEVALUE:
                         if (c == ",") {
-                            variables[key] = value;
+                            variables[StringUtil.trim(key)] = value;
                             key = "";
                             value = "";
                             state = RENDITION_STATE_READKEY;
@@ -489,7 +489,7 @@ package org.mangui.hls.playlist {
                         break;
                     case STATE_READQUOTEDVALUE_END:
                         if (c == ",") {
-                            variables[key] = value;
+                            variables[StringUtil.trim(key)] = value;
                             key = "";
                             value = "";
                             state = RENDITION_STATE_READKEY;
@@ -499,7 +499,7 @@ package org.mangui.hls.playlist {
             }
 
             if (key) {
-                variables[key] = value;
+                variables[StringUtil.trim(key)] = value;
             }
 
             return variables;

diff --git a/src/org/mangui/hls/stream/HLSNetStream.as b/src/org/mangui/hls/stream/HLSNetStream.as
@@ -159,7 +159,7 @@ package org.mangui.hls.stream {
             // Log.info("netstream/total:" + super.bufferLength + "/" + this.bufferLength);
 
             if (_seekState != HLSSeekStates.SEEKING) {
-                if (_playbackState == HLSPlayStates.PLAYING) {
+                if (_playbackState == HLSPlayStates.PLAYING || _playbackState == HLSPlayStates.PLAYING_BUFFERING) {
                   /* check if play head reached end of stream.
                         this happens when
                             playstate is PLAYING