Merge pull request Dash-Industry-Forum#55 from senthil-codr/autoplay_fix

Autoplay bug fix

Author: nweber

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);
             }
         };
@@ -179,10 +180,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

@@ -581,12 +581,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!");
@@ -598,6 +592,10 @@ MediaPlayer.dependencies.Stream = function () {
                     }
                     initPlayback.call(self);
 
+                    if (autoPlay) {
+                        self.debug.log("Playback initialized!");
+                        play.call(self);
+                    }
                 }
             );
         },
@@ -802,4 +800,4 @@ MediaPlayer.dependencies.Stream = function () {
 
 MediaPlayer.dependencies.Stream.prototype = {
     constructor: MediaPlayer.dependencies.Stream
-};
+};

app/js/streaming/StreamController.js

@@ -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 () {
@@ -230,11 +231,11 @@
         },
 
         setAutoPlay: function (value) {
-            activeStream.setAutoPlay(value);
+            autoPlay = value;
         },
 
         getAutoPlay: function () {
-            return activeStream.getAutoPlay();
+            return autoPlay;
         },
 
         getVideoModel: function () {
@@ -258,6 +259,7 @@
                                 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);
                             }

app/main.js

@@ -1108,7 +1108,7 @@ $(document).ready(function() {
     player.addEventListener("log", onLogMessage.bind(this));
     player.addEventListener("error", onError.bind(this));
 
-    player.autoPlay = true;
+    player.setAutoPlay(true);
     player.attachView(video);
 
     if (specifiedMpd !== null) {

baseline.html

@@ -35,7 +35,7 @@
             player.attachSource(url);
 
             video = document.querySelector(".dash-video-player video"),
-            player.autoPlay = true;
+            player.setAutoPlay(true);
             player.attachView(video);
         }
     </script>