Merge pull request #201 from flowplayer/bug/191

Fix buffer bar flickering issue. (#191)
flowplayer · Jan 29, 2014 · aadcdc7 · aadcdc7
2 parents a8e6418 + 4068f1a
commit aadcdc7
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 199 deletions.
diff --git a/core/test/bwcheck-smil.html b/core/test/bwcheck-smil.html
@@ -9,7 +9,7 @@
 		Flash embedding and provides the Flowplayer API.
 	-->
     <!--<script type="text/javascript" src="flowplayer-3.0.5.min.js"></script>-->
-    <script src="../flowplayer-3.2.6.min.js"></script>
+    <script src="../src/javascript/flowplayer.js/flowplayer-3.2.11.min.js"></script>
 
 	<!-- some minimal styling, can be removed -->
 	<!--<link rel="stylesheet" type="text/css" href="style.css">-->
@@ -28,74 +28,44 @@
 
 		<!-- this will install flowplayer inside previous A- tag. -->
 <script>
-    flowplayer("player", "../build/flowplayer.swf",
+    flowplayer("player", "http://flash.cdn.201f.flowplayer.me.s3.amazonaws.com/swf/flowplayer-3.2.19-dev.swf",
     {
-        log: { level: 'debug', filter: 'org.flowplayer.bwcheck.*' },
+        log: { level: 'debug', filter: 'org.flowplayer.controls.scrubber.ScrubberSlider' },
 
-
-        // The playlist is loaded from the RSS file
+        debug: true,
         clip: {
-            url: "bitrates.smil.xml",
+            provider: "rtmp",
+            scaling: "fit",
             autoPlay: false,
-            provider: 'rtmp',
-
-            // use smil and bwcheck when resolving the clip URL
-            urlResolvers: [ 'smil', 'bwcheck' ]
+            urlResolvers: ["smil", "bwcheck"],
+            url: "http://flowplayer.blacktrash.org/test/live-smil.smil"
         },
-
         plugins: {
-
-            // the SMIL plugin reads in and parses the SMIL, and provides
-            // the bitrates info to the bw detection plugin
-            smil: {
-                url: 'flowplayer.smil.swf'
+            controls: {autoHide: false},
+//            content: {url: "flowplayer.content.swf", height: 100},
+            smil: {url: "flowplayer.smil-3.2.9.swf"},
+            rtmp: {
+                url: "flowplayer.rtmp-3.2.13.swf",
+                netConnectionUrl: "rtmp://50.7.180.18/vod"
             },
-
-            // bandwidth check plugin
             bwcheck: {
-                url: 'flowplayer.bwcheck.swf',
-
-                // HDDN uses Wowza servers
-                serverType: 'wowza',
-
-                // we use dynamic switching, the appropriate bitrate is switched on the fly
+                url: "flowplayer.bwcheck-3.2.13.swf",
+                netConnectionUrl: "rtmp://50.7.180.18/vod",
+                serverType: "wowza",
                 dynamic: true,
+                //dynamicBuffer: true,
+                //qos: {waitDurationAfterDownSwitch: 1000},
 
-                hdIcon: true,
-
-//                  netConnectionUrl: 'rtmp://vod01.netdna.com/play',
-
-                // show the selected file in the content box. This is not used in real installations.
-                onStreamSwitchBegin: function (newItem, currentItem) {
-                   $f().getPlugin('content').setHtml("Will switch to: " + newItem.streamName +
-                    " from " + currentItem.streamName);
+/*                onStreamSwitchBegin: function (newItem, currentItem) {
+                    this.getPlayer().getPlugin("content").setHtml("will switch from: " + currentItem.streamName + "<br />to: " + newItem.streamName);
                 },
                 onStreamSwitch: function (newItem) {
-                   $f().getPlugin('content').setHtml("Switched to: " + newItem.streamName);
-                }
-            },
-
-            // RTMP streaming plugin
-            rtmp: {
-                url: 'flowplayer.rtmp.swf',
-                netConnectionUrl: 'rtmp://vod01.netdna.com/play'
-            },
+                    this.getPlayer().getPlugin("content").setHtml("switched to: " + newItem.streamName);
+                },
+                onStreamSwitchFailed: function (info) {
+                    this.getPlayer().getPlugin("content").setHtml(info);
 
-            // a content box so that we can see the selected bitrate. This is not normally
-            // used in real installations.
-            content: {
-                url: 'flowplayer.content.swf',
-                top: 0, left: 0, width: 400, height: 150,
-                backgroundColor: 'transparent', backgroundGradient: 'none', border: 0,
-                textDecoration: 'outline',
-                style: {
-                    body: {
-                        fontSize: 14,
-                        fontFamily: 'Arial',
-                        textAlign: 'center',
-                        color: '#ffffff'
-                    }
-                }
+                }*/
             }
         }
     });

diff --git a/core/test/jscontrols.html b/core/test/jscontrols.html
@@ -1,8 +1,8 @@
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <!--<script type="text/javascript" src="flowplayer-3.0.5.min.js"></script>-->
-    <script src="../flowplayer-3.2.6.min.js"></script>
-    <script src="../../jsplugins/controls/trunk/flowplayer.controls.js"></script>
+    <script src="../../../flash-build/dist/flowplayer-3.2.13.min.js"></script>
+    <script src="../../../flash-build/dist/flowplayer.controls-3.2.11.min.js"></script>
 
 
 	<!-- page title -->
@@ -143,7 +143,7 @@
 <div id="controls" class="hulu"></div>
 
 <script>
-    flowplayer("player", "../build/flowplayer.swf",
+    flowplayer("player", "../../../flash-build/build/flowplayer-3.2.18.swf",
     {
         log: { level: 'debug', filter: 'org.flowplayer.bwcheck.*' },
 

diff --git a/core/test/simple.html b/core/test/simple.html
@@ -18,7 +18,7 @@
                      id="player">
                 </a>
 <script>
-    flowplayer("player", "../../../flash-build/build/flowplayer-3.2.17-dev.swf",
+    flowplayer("player", "../../../flash-build/build/flowplayer-3.2.18.swf",
     {
         log: { level: 'debug', filter: 'org.flowplayer.controls.scrubber.ScrubberSlider'},
 

diff --git a/plugins/controls/README.txt b/plugins/controls/README.txt
@@ -1,5 +1,9 @@
 Version history:
 
+3.2.17
+------
+- #191 fix for buffer bar flickering problem with RTMP
+
 3.2.16 (Nov 2013)
 -----------------
 - #58 fix alignment issue with tooltips. first obtain the global coordinates of the parent to use for configuring the

diff --git a/plugins/controls/build.properties b/plugins/controls/build.properties
@@ -1,2 +1,2 @@
-version=3.2.16
+version=3.2.17-dev
 devkit-dir=../../lib/devkit