Merge pull request #72 from pchen66/dev

r6
pchen66 · Jun 2, 2017 · 157b63d · 157b63d
2 parents 205b0fa + 3582004
commit 157b63d
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 20 deletions.
diff --git a/build/panolens.js b/build/panolens.js
diff --git a/build/panolens.min.js b/build/panolens.min.js
diff --git a/example/index.html b/example/index.html
@@ -91,14 +91,8 @@
       viewer.enableControl( PANOLENS.Controls.DEVICEORIENTATION );
       viewer.enableEffect( PANOLENS.Modes.CARDBOARD );
 
-      /*viewer.enableControl( PANOLENS.Controls.ORBIT );
-      viewer.enableEffect( PANOLENS.Modes.NORMAL );
-
-      viewer.enableControl( PANOLENS.Controls.DEVICEORIENTATION );
-      viewer.enableEffect( PANOLENS.Modes.CARDBOARD );
-
       viewer.enableControl( PANOLENS.Controls.ORBIT );
-      viewer.enableEffect( PANOLENS.Modes.NORMAL );*/
+      viewer.enableEffect( PANOLENS.Modes.NORMAL );
 
     </script>
 

diff --git a/src/panorama/VideoPanorama.js b/src/panorama/VideoPanorama.js
@@ -71,10 +71,7 @@
 			this.videoElement.setAttribute( "webkit-playsinline", "" );
 		} 
 
-		this.videoElement.src =  src;
-		this.videoElement.load();
-
-		this.videoElement.onloadeddata = function(){
+		var onloadeddata = function(){
 
 			scope.setVideoTexture( scope.videoElement );
 
@@ -122,9 +119,34 @@
 				}
 
 			}
-
 		};
 
+		/**
+		 * Ready state of the audio/video element
+		 * 0 = HAVE_NOTHING - no information whether or not the audio/video is ready
+		 * 1 = HAVE_METADATA - metadata for the audio/video is ready
+		 * 2 = HAVE_CURRENT_DATA - data for the current playback position is available, but not enough data to play next frame/millisecond
+		 * 3 = HAVE_FUTURE_DATA - data for the current and at least the next frame is available
+		 * 4 = HAVE_ENOUGH_DATA - enough data available to start playing
+		 */
+		if ( this.videoElement.readyState > 2 ) {
+
+			onloadeddata();
+
+		} else {
+
+			if ( !this.videoElement.querySelectorAll('source').length || !this.videoElement.src ) {
+
+				this.videoElement.src =  src;
+
+			}
+
+			this.videoElement.load();
+		}
+
+		this.videoElement.onloadeddata = onloadeddata;
+
+
 		this.videoElement.ontimeupdate = function ( event ) {
 
 			/**