Merge branch 'development' of https://github.com/Dash-Industry-Forum/dash.js into development

Conflicts:
	app/main.js

Author: Nathan Weber

app/js/streaming/MediaPlayer.js

@@ -75,11 +75,12 @@ MediaPlayer = function (aContext) {
             this.debug.log("Playback initiated!");
             streamController = system.getObject("streamController");
             streamController.setVideoModel(this.videoModel);
+            streamController.setAutoPlay(autoPlay);
             streamController.load(source);
         },
 
         doAutoPlay = function () {
-            if (autoPlay && isReady()) {
+            if (isReady()) {
                 play.call(this);
             }
         };
@@ -166,10 +167,6 @@ MediaPlayer = function (aContext) {
 
             element = view;
 
-            // Set the video to autoplay.
-            // We'll tell it when to go.
-            element.autoplay = true;
-
             model = new MediaPlayer.models.VideoModel(element);
             this.videoModel.setElement(element);
 

app/js/streaming/Stream.js

@@ -582,12 +582,6 @@ MediaPlayer.dependencies.Stream = function () {
                     self.debug.log("Start initializing playback.");
                     return initializePlayback.call(self);
                 }
-            ).then(
-                function (/*done*/) {
-                    self.debug.log("Playback initialized!");
-                    play.call(self);
-                    return load.promise;
-                }
             ).then(
                 function () {
                     self.debug.log("element loaded!");
@@ -599,6 +593,10 @@ MediaPlayer.dependencies.Stream = function () {
                     }
                     initPlayback.call(self);
 
+                    if (autoPlay) {
+                        self.debug.log("Playback initialized!");
+                        play.call(self);
+                    }
                 }
             );
         },

app/js/streaming/StreamController.js

@@ -1,14 +1,14 @@
 /*
  * The copyright in this software is being made available under the BSD License, included below. This software may be subject to other third party and contributor rights, including patent rights, and no such rights are granted under this license.
- * 
+ *
  * Copyright (c) 2013, Digital Primates
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
  * •  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
  * •  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
  * •  Neither the name of the Digital Primates nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  MediaPlayer.dependencies.StreamController = function () {
@@ -24,6 +24,7 @@
         //TODO set correct value for threshold
         STREAM_BUFFER_END_THRESHOLD = 4,
         STREAM_END_THRESHOLD = 3,
+        autoPlay = true,
         deferredSwitch= null,
 
         play = function () {
@@ -43,7 +44,7 @@
          *
          * @param fromVideoModel Currently used video data
          * @param toVideoModel New video data to be displayed
-         * 
+         *
          * TODO - move method to appropriate place - VideoModelExtensions??
          */
         switchVideoModel = function (fromVideoModel, toVideoModel) {
@@ -88,7 +89,7 @@
         },
 
         /*
-         * Called when more data is buffered. 
+         * Called when more data is buffered.
          * Used to determine the time current stream is almost buffered and we can start buffering of the next stream.
          * TODO move to ???Extensions class
          */
@@ -230,11 +231,11 @@
         },
 
         setAutoPlay: function (value) {
-            activeStream.setAutoPlay(value);
+            autoPlay = value;
         },
 
         getAutoPlay: function () {
-            return activeStream.getAutoPlay();
+            return autoPlay;
         },
 
         getVideoModel: function () {
@@ -253,11 +254,12 @@
             self.manifestLoader.load(url).then(
                 function(manifest) {
                     self.manifestExt.getPeriodCount(manifest).then(
-                        function(lenght) {
-                            for (var i = 0; i < lenght; i++) {
+                        function(length) {
+                            for (var i = 0; i < length; i++) {
                                 stream = self.system.getObject("stream");
                                 stream.setVideoModel(i === 0 ? self.videoModel : createVideoModel.call(self));
                                 stream.initProtection();
+                                stream.setAutoPlay(autoPlay);
                                 stream.load(manifest, i);
                                 streams.push(stream);
                             }
@@ -292,4 +294,4 @@
 
 MediaPlayer.dependencies.StreamController.prototype = {
     constructor: MediaPlayer.dependencies.StreamController
-};
+};

app/main.js

@@ -94,8 +94,8 @@ app.directive('chart', function() {
 
 app.controller('DashController', function($scope, Sources, Notes, Contributors, PlayerLibraries, ShowcaseLibraries) {
     var player,
-        video = document.querySelector(".dash-video-player video"),
-        context = new Dash.di.DashContext(),
+        video,
+        context,
         videoSeries = [],
         audioSeries = [],
         maxGraphPoints = 50,
@@ -312,14 +312,16 @@ app.controller('DashController', function($scope, Sources, Notes, Contributors,
     //
     ////////////////////////////////////////
 
+    video = document.querySelector(".dash-video-player video");
+    context = new Dash.di.DashContext();
     player = new MediaPlayer(context);
     $scope.version = player.getVersion();
 
     player.startup();
     player.addEventListener("error", onError.bind(this));
 
-    player.autoPlay = true;
     player.attachView(video);
+    player.setAutoPlay(true);
 
     ////////////////////////////////////////
     //

baseline.html

@@ -42,15 +42,16 @@
                 url = vars.url;
             }
 
+            video = document.querySelector(".dash-video-player video");
             context = new Dash.di.DashContext();
             player = new MediaPlayer(context);
-            player.startup();
 
-            player.attachSource(url);
+            player.startup();
 
-            video = document.querySelector(".dash-video-player video"),
-            player.autoPlay = true;
             player.attachView(video);
+            player.setAutoPlay(false);
+
+            player.attachSource(url);
         }
     </script>