From da936f0d16db757f4ea942bb30eb8f2c0fa0f789 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Wed, 9 Jan 2019 11:58:42 +0700
Subject: [PATCH 01/30] #882523780845215 Improve autoplay behaviour

added muted
---
 modules/player/popcorn.player.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/player/popcorn.player.js b/modules/player/popcorn.player.js
index 895f66968..6f094c4aa 100644
--- a/modules/player/popcorn.player.js
+++ b/modules/player/popcorn.player.js
@@ -425,7 +425,7 @@
     node.appendChild( videoHTMLContainer );
     // IE9 doesn't like dynamic creation of source elements on <video>
     // so we do it in one shot via innerHTML.
-    videoHTML = '<video id="' +  videoID + '" preload=auto autobuffer webkit-playsinline playsinline>';
+    videoHTML = '<video id="' +  videoID + '" preload=auto muted autobuffer webkit-playsinline playsinline>';
     for ( i = 0, srcLength = src.length; i < srcLength; i++ ) {
       videoHTML += '<source src="' + src[ i ] + '">';
     }

From 8101faf5188f20fa9eca309a21b8d024824d9a70 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Mon, 14 Jan 2019 15:10:11 +0700
Subject: [PATCH 02/30] #882523780845215 Improve autoplay behaviour

updated Html elements
---
 modules/player/popcorn.player.js              | 22 +++++++++----------
 .../popcorn.HTMLAdaptiveMediaElement.js       | 11 ++++++----
 wrappers/html5/popcorn.HTMLMediaElement.js    | 12 +++++-----
 .../vrview/popcorn.HTMLVRViewVideoElement.js  | 10 ++++-----
 .../popcorn.HTMLYouTubeVideoElement.js        | 10 ++++-----
 5 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/modules/player/popcorn.player.js b/modules/player/popcorn.player.js
index 6f094c4aa..16609cc85 100644
--- a/modules/player/popcorn.player.js
+++ b/modules/player/popcorn.player.js
@@ -343,7 +343,7 @@
 
   // Popcorn.smart will attempt to find you a wrapper or player. If it can't do that,
   // it will default to using an HTML5 video in the target.
-  Popcorn.smart = function( target, src, options ) {
+  Popcorn.smart = function( target, src, popcornOptions, options ) {
     var node = typeof target === "string" ? Popcorn.dom.find( target ) : target,
         i, srci, j, media, mediaWrapper, popcorn, srcLength,
         // We leave HTMLVideoElement and HTMLAudioElement wrappers out
@@ -367,8 +367,8 @@
       for ( j = 0; j < wrappers.length; j++ ) {
         mediaWrapper = Popcorn[ wrappers[ j ] ];
         if ( mediaWrapper && mediaWrapper._canPlaySrc( srci ) === "probably" ) {
-          media = mediaWrapper( node );
-          popcorn = Popcorn( media, options );
+          media = mediaWrapper( node, options );
+          popcorn = Popcorn( media, popcornOptions );
           // Set src, but not until after we return the media so the caller
           // can get error events, if any.
           setTimeout( function() {
@@ -382,8 +382,8 @@
       for ( var key in Popcorn.player.registry ) {
         if ( Popcorn.player.registry.hasOwnProperty( key ) ) {
           if ( Popcorn.player.registry[ key ].canPlayType( node.nodeName, srci ) ) {
-            // Popcorn.smart( player, src, /* options */ )
-            return Popcorn[ key ]( node, srci, options );
+            // Popcorn.smart( player, src, /* popcornOptions */ )
+            return Popcorn[ key ]( node, srci, popcornOptions );
           }
         }
       }
@@ -392,7 +392,7 @@
     // If we don't have any players or wrappers that can handle this,
     // Default to using HTML5 video.  Similar to the HTMLVideoElement
     // wrapper, we put a video in the div passed to us via:
-    // Popcorn.smart( div, src, options )
+    // Popcorn.smart( div, src, popcornOptions )
     var videoHTML,
         videoElement,
         videoID = Popcorn.guid( "popcorn-video-" ),
@@ -419,22 +419,22 @@
 
         videoElement.src = decodeDiv.firstChild.nodeValue;
       }, 0 );
-      return Popcorn( '#' + videoID, options );
+      return Popcorn( '#' + videoID, popcornOptions );
     }
 
     node.appendChild( videoHTMLContainer );
     // IE9 doesn't like dynamic creation of source elements on <video>
     // so we do it in one shot via innerHTML.
-    videoHTML = '<video id="' +  videoID + '" preload=auto muted autobuffer webkit-playsinline playsinline>';
+    videoHTML = '<video id="' +  videoID + '" preload=auto autobuffer webkit-playsinline playsinline>';
     for ( i = 0, srcLength = src.length; i < srcLength; i++ ) {
       videoHTML += '<source src="' + src[ i ] + '">';
     }
     videoHTML += "</video>";
     videoHTMLContainer.innerHTML = videoHTML;
 
-    if ( options && options.events && options.events.error ) {
-      node.addEventListener( "error", options.events.error, false );
+    if ( popcornOptions && popcornOptions.events && popcornOptions.events.error ) {
+      node.addEventListener( "error", popcornOptions.events.error, false );
     }
-    return Popcorn( '#' + videoID, options );
+    return Popcorn( '#' + videoID, popcornOptions );
   };
 })( Popcorn );
diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 9226ff51d..2ea5d129e 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -68,12 +68,13 @@
     }
   }
 
-  function wrapMedia(id, mediaType) {
+  function wrapMedia(id, mediaType, options = {}) {
     var parent = typeof id === 'string' ? document.querySelector(id) : id,
       media = document.createElement(mediaType);
 
     var impl = {
-      autoplay: EMPTY_STRING,
+      autoplay: options.autoplay || EMPTY_STRING,
+      muted: options.muted || false,
     };
 
     media.dispatchEvent = function (name, data) {
@@ -92,6 +93,8 @@
 
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
+    media.setAttribute('autoplay', impl.autoplay);
+    media.setAttribute('muted', impl.muted);
 
     var source = document.createElement('source');
     media.appendChild(source);
@@ -201,8 +204,8 @@
     return media;
   }
 
-  Popcorn.HTMLAdaptiveMediaElement = function (id) {
-    return wrapMedia(id, 'video');
+  Popcorn.HTMLAdaptiveMediaElement = function (id, options) {
+    return wrapMedia(id, 'video', options);
   };
   Popcorn.HTMLAdaptiveMediaElement._canPlaySrc = canPlaySrc;
 
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 8ea4bd02b..278e0e3cc 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -63,12 +63,14 @@
     return "probably";
   }
 
-  function wrapMedia(id, mediaType) {
+  function wrapMedia(id, mediaType, options) {
     var parent = typeof id === "string" ? document.querySelector(id) : id,
       media = document.createElement(mediaType);
 
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
+    media.setAttribute('autoplay', options.autoplay || '');
+    media.setAttribute('muted', options.muted || false);
 
     var source = document.createElement('source');
     media.appendChild(source);
@@ -122,14 +124,14 @@
     return media;
   }
 
-  Popcorn.HTMLVideoElement = function (id) {
-    return wrapMedia(id, "video");
+  Popcorn.HTMLVideoElement = function (id, options) {
+    return wrapMedia(id, "video", options);
   };
   Popcorn.HTMLVideoElement._canPlaySrc = canPlayVideoSrc;
 
 
-  Popcorn.HTMLAudioElement = function (id) {
-    return wrapMedia(id, "audio");
+  Popcorn.HTMLAudioElement = function (id, options) {
+    return wrapMedia(id, "audio", options);
   };
   Popcorn.HTMLAudioElement._canPlaySrc = canPlayAudioSrc;
 
diff --git a/wrappers/vrview/popcorn.HTMLVRViewVideoElement.js b/wrappers/vrview/popcorn.HTMLVRViewVideoElement.js
index a695fa859..200ce2a22 100644
--- a/wrappers/vrview/popcorn.HTMLVRViewVideoElement.js
+++ b/wrappers/vrview/popcorn.HTMLVRViewVideoElement.js
@@ -65,7 +65,7 @@
     return false;
   }
 
-  function HTMLVRViewVideoElement(id) {
+  function HTMLVRViewVideoElement(id, options = {}) {
 
     if (!window.postMessage) {
       throw 'ERROR: HTMLVRViewVideoElement requires window.postMessage';
@@ -79,13 +79,13 @@
         networkState: self.NETWORK_EMPTY,
         readyState: self.HAVE_NOTHING,
         seeking: false,
-        autoplay: EMPTY_STRING,
+        autoplay: options.autoplay || EMPTY_STRING,
         preload: EMPTY_STRING,
         controls: false,
         loop: false,
         poster: EMPTY_STRING,
         volume: 1,
-        muted: false,
+        muted: options.muted || false,
         currentTime: 0,
         duration: NaN,
         ended: false,
@@ -610,8 +610,8 @@
     return self;
   }
 
-  Popcorn.HTMLVRViewVideoElement = function (id) {
-    return new HTMLVRViewVideoElement(id);
+  Popcorn.HTMLVRViewVideoElement = function (id, options) {
+    return new HTMLVRViewVideoElement(id, options);
   };
 
   // Helper for identifying URLs we know how to play.
diff --git a/wrappers/youtube/popcorn.HTMLYouTubeVideoElement.js b/wrappers/youtube/popcorn.HTMLYouTubeVideoElement.js
index f379cb17b..858a32778 100644
--- a/wrappers/youtube/popcorn.HTMLYouTubeVideoElement.js
+++ b/wrappers/youtube/popcorn.HTMLYouTubeVideoElement.js
@@ -58,7 +58,7 @@
     ytCallbacks.push( callback );
   }
 
-  function HTMLYouTubeVideoElement( id ) {
+  function HTMLYouTubeVideoElement( id, options = {} ) {
 
     // YouTube iframe API requires postMessage
     if( !window.postMessage ) {
@@ -74,13 +74,13 @@
         networkState: self.NETWORK_EMPTY,
         readyState: self.HAVE_NOTHING,
         seeking: false,
-        autoplay: EMPTY_STRING,
+        autoplay: options.autoplay || EMPTY_STRING,
         preload: EMPTY_STRING,
         controls: false,
         loop: false,
         poster: EMPTY_STRING,
         volume: 1,
-        muted: false,
+        muted: options.muted || false,
         currentTime: 0,
         duration: NaN,
         ended: false,
@@ -799,8 +799,8 @@
     return self;
   }
 
-  Popcorn.HTMLYouTubeVideoElement = function( id ) {
-    return new HTMLYouTubeVideoElement( id );
+  Popcorn.HTMLYouTubeVideoElement = function( id, options ) {
+    return new HTMLYouTubeVideoElement( id, options );
   };
 
   // Helper for identifying URLs we know how to play.

From cf0ef73d2676557d075abff6f537f74c60f22693 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Mon, 14 Jan 2019 15:30:35 +0700
Subject: [PATCH 03/30] #882523780845215 Improve autoplay behaviour

fixed options
---
 modules/player/popcorn.player.js           | 2 +-
 wrappers/html5/popcorn.HTMLMediaElement.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/player/popcorn.player.js b/modules/player/popcorn.player.js
index 16609cc85..208756caf 100644
--- a/modules/player/popcorn.player.js
+++ b/modules/player/popcorn.player.js
@@ -383,7 +383,7 @@
         if ( Popcorn.player.registry.hasOwnProperty( key ) ) {
           if ( Popcorn.player.registry[ key ].canPlayType( node.nodeName, srci ) ) {
             // Popcorn.smart( player, src, /* popcornOptions */ )
-            return Popcorn[ key ]( node, srci, popcornOptions );
+            return Popcorn[ key ]( node, srci, popcornOptions, options );
           }
         }
       }
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 278e0e3cc..9010afe06 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -63,7 +63,7 @@
     return "probably";
   }
 
-  function wrapMedia(id, mediaType, options) {
+  function wrapMedia(id, mediaType, options = {}) {
     var parent = typeof id === "string" ? document.querySelector(id) : id,
       media = document.createElement(mediaType);
 

From a95dadfaf0c33c726291e49646156ae0fe1ca3de Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Tue, 15 Jan 2019 12:32:57 +0700
Subject: [PATCH 04/30] #882523780845215 Improve autoplay behaviour

debug
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 2ea5d129e..b923a5709 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -94,7 +94,7 @@
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
     media.setAttribute('autoplay', impl.autoplay);
-    media.setAttribute('muted', impl.muted);
+    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);

From a276726f3c2b712f3648fc87cc668d457f4365a0 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Tue, 15 Jan 2019 12:51:10 +0700
Subject: [PATCH 05/30] #882523780845215 Improve autoplay behaviour

debug
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index b923a5709..51ad02c71 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -73,8 +73,8 @@
       media = document.createElement(mediaType);
 
     var impl = {
-      autoplay: options.autoplay || EMPTY_STRING,
-      muted: options.muted || false,
+      autoplay: 1,
+      muted: true,
     };
 
     media.dispatchEvent = function (name, data) {

From 24e155c1845e23998728af65cd40944fde4b76dc Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Tue, 15 Jan 2019 12:57:24 +0700
Subject: [PATCH 06/30] #882523780845215 Improve autoplay behaviour

debug
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 51ad02c71..8fa27ddce 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -74,7 +74,7 @@
 
     var impl = {
       autoplay: 1,
-      muted: true,
+      muted: 1,
     };
 
     media.dispatchEvent = function (name, data) {
@@ -94,7 +94,7 @@
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
     media.setAttribute('autoplay', impl.autoplay);
-    media.muted = true;
+    media.setAttribute('muted', impl.muted);
 
     var source = document.createElement('source');
     media.appendChild(source);

From 7f351bb6549d88902fe71bf7236d969791e62fa4 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Tue, 15 Jan 2019 13:04:58 +0700
Subject: [PATCH 07/30] #882523780845215 Improve autoplay behaviour

debug
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 8fa27ddce..4e5e196c5 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -74,7 +74,7 @@
 
     var impl = {
       autoplay: 1,
-      muted: 1,
+      muted: true,
     };
 
     media.dispatchEvent = function (name, data) {

From b42fd7f7a178d495ac67a5ec80256e245db8a395 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Tue, 15 Jan 2019 15:32:05 +0700
Subject: [PATCH 08/30] #882523780845215 Improve autoplay behaviour

debug
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 9010afe06..247b25ecc 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -69,8 +69,8 @@
 
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
-    media.setAttribute('autoplay', options.autoplay || '');
-    media.setAttribute('muted', options.muted || false);
+    media.setAttribute('autoplay', '1');
+    media.setAttribute('muted', true);
 
     var source = document.createElement('source');
     media.appendChild(source);

From 7c836eea44967687e6514297de9715dccc57010a Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Tue, 15 Jan 2019 15:42:59 +0700
Subject: [PATCH 09/30] #882523780845215 Improve autoplay behaviour

debug muted = true;
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 247b25ecc..d771401b7 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -72,6 +72,8 @@
     media.setAttribute('autoplay', '1');
     media.setAttribute('muted', true);
 
+    media.muted = true;
+
     var source = document.createElement('source');
     media.appendChild(source);
 

From 0cfa6d985d8d920e7550e4d84771e524f938c7fc Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 10:20:10 +0700
Subject: [PATCH 10/30] #882523780845215 Improve autoplay behaviour

removed autoplay
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index d771401b7..0131572ee 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -67,12 +67,10 @@
     var parent = typeof id === "string" ? document.querySelector(id) : id,
       media = document.createElement(mediaType);
 
-    media.setAttribute('playsinline', '');
-    media.setAttribute('webkit-playsinline', '');
-    media.setAttribute('autoplay', '1');
     media.setAttribute('muted', true);
-
     media.muted = true;
+    media.setAttribute('playsinline', '');
+    media.setAttribute('webkit-playsinline', '');
 
     var source = document.createElement('source');
     media.appendChild(source);

From 0fafe7b249e6ce128da1ade7f3a255fdbf232449 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 10:42:14 +0700
Subject: [PATCH 11/30] #882523780845215 Improve autoplay behaviour

added catch
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 0131572ee..17ce0075e 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -89,7 +89,9 @@
     media._play = media.play;
     media._pause = media.pause;
     media.play = function () {
-      media._play();
+      media._play().catch(err => {
+        console.error(error.message);
+      });
     };
     media.pause = function () {
       media._pause();

From baf05af3203743805d30ee55e2a2d5b33c4a8393 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 10:56:00 +0700
Subject: [PATCH 12/30] #882523780845215 Improve autoplay behaviour

try/catch
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 17ce0075e..7fa276f03 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -89,9 +89,11 @@
     media._play = media.play;
     media._pause = media.pause;
     media.play = function () {
-      media._play().catch(err => {
-        console.error(error.message);
-      });
+      try {
+        media._play();
+      } catch( e ) {
+        console.error(e.message);
+      }
     };
     media.pause = function () {
       media._pause();

From fb69e16eeaac0be6ef14d2d76a8f4d6bb41ba906 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 11:01:03 +0700
Subject: [PATCH 13/30] #882523780845215 Improve autoplay behaviour

error => err
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 7fa276f03..fe1ab92d3 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -89,11 +89,9 @@
     media._play = media.play;
     media._pause = media.pause;
     media.play = function () {
-      try {
-        media._play();
-      } catch( e ) {
-        console.error(e.message);
-      }
+      media._play().catch(err => {
+        console.error(err.message);
+      });
     };
     media.pause = function () {
       media._pause();

From 1e695b9a7ec47203864777323ede6eb976face0d Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 11:25:41 +0700
Subject: [PATCH 14/30] #882523780845215 Improve autoplay behaviour

true => 'muted'
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index fe1ab92d3..65b741353 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -67,8 +67,7 @@
     var parent = typeof id === "string" ? document.querySelector(id) : id,
       media = document.createElement(mediaType);
 
-    media.setAttribute('muted', true);
-    media.muted = true;
+    media.setAttribute('muted', 'muted');
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
 

From 20764ca63a4935166e8399ade78260a6e47da8c1 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 12:12:16 +0700
Subject: [PATCH 15/30] #882523780845215 Improve autoplay behaviour

updated NullElement
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 4 ++--
 wrappers/html5/popcorn.HTMLMediaElement.js            | 2 +-
 wrappers/null/popcorn.HTMLNullVideoElement.js         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 4e5e196c5..e7f20c693 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -73,7 +73,7 @@
       media = document.createElement(mediaType);
 
     var impl = {
-      autoplay: 1,
+      autoplay: EMPTY_STRING,
       muted: true,
     };
 
@@ -104,7 +104,7 @@
     [
       'seeked', 'timeupdate', 'progress', 'play',
       'pause', 'seeking', 'waiting', 'playing',
-      'error', 'volumechange', 'loadedmetadata'
+      'error', 'volumechange', 'loadedmetadata', 'mute', 'unmute'
     ].forEach(function (event) {
       media.addEventListener(event, function() {
         media.dispatchEvent(event);
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 65b741353..f3fbfd7aa 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -67,7 +67,7 @@
     var parent = typeof id === "string" ? document.querySelector(id) : id,
       media = document.createElement(mediaType);
 
-    media.setAttribute('muted', 'muted');
+    media.setAttribute('muted', true);
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
 
diff --git a/wrappers/null/popcorn.HTMLNullVideoElement.js b/wrappers/null/popcorn.HTMLNullVideoElement.js
index d19ee678b..3adec4d9d 100644
--- a/wrappers/null/popcorn.HTMLNullVideoElement.js
+++ b/wrappers/null/popcorn.HTMLNullVideoElement.js
@@ -72,7 +72,7 @@
 
   };
 
-  function HTMLNullVideoElement( id ) {
+  function HTMLNullVideoElement( id, options = {} ) {
 
     var self = new Popcorn._MediaElementProto(),
       parent = typeof id === "string" ? document.querySelector( id ) : id,
@@ -89,7 +89,7 @@
         loop: false,
         poster: EMPTY_STRING,
         volume: 1,
-        muted: false,
+        muted: true,
         width: parent.width|0   ? parent.width  : self._util.MIN_WIDTH,
         height: parent.height|0 ? parent.height : self._util.MIN_HEIGHT,
         seeking: false,

From 294d5588f69e4c16074c7a84d9022b820b5b9f81 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 12:59:09 +0700
Subject: [PATCH 16/30] #882523780845215 Improve autoplay behaviour

all true
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 2 +-
 wrappers/html5/popcorn.HTMLMediaElement.js            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index e7f20c693..d2124b9ed 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -73,7 +73,7 @@
       media = document.createElement(mediaType);
 
     var impl = {
-      autoplay: EMPTY_STRING,
+      autoplay: 1,
       muted: true,
     };
 
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index f3fbfd7aa..e9d5ca55a 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -68,6 +68,7 @@
       media = document.createElement(mediaType);
 
     media.setAttribute('muted', true);
+    media.setAttribute('autoplay', '1');
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
 

From 28518cc8e8375a7ad9b103828affec5d6fe4b7d6 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 13:24:20 +0700
Subject: [PATCH 17/30] #882523780845215 Improve autoplay behaviour

removed autoplay
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 5 ++---
 wrappers/html5/popcorn.HTMLMediaElement.js            | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index d2124b9ed..1ea0ecf69 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -73,8 +73,8 @@
       media = document.createElement(mediaType);
 
     var impl = {
-      autoplay: 1,
-      muted: true,
+      autoplay: EMPTY_STRING,
+      muted: options.muted,
     };
 
     media.dispatchEvent = function (name, data) {
@@ -93,7 +93,6 @@
 
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
-    media.setAttribute('autoplay', impl.autoplay);
     media.setAttribute('muted', impl.muted);
 
     var source = document.createElement('source');
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index e9d5ca55a..f3fbfd7aa 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -68,7 +68,6 @@
       media = document.createElement(mediaType);
 
     media.setAttribute('muted', true);
-    media.setAttribute('autoplay', '1');
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
 

From 7c3f2803a6a859fa0adc8560c409eb0e5e6c2935 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 15:51:18 +0700
Subject: [PATCH 18/30] #882523780845215 Improve autoplay behaviour

all muted === true
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 1ea0ecf69..9ccf12d5e 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -93,7 +93,7 @@
 
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
-    media.setAttribute('muted', impl.muted);
+    media.setAttribute('muted', true);
 
     var source = document.createElement('source');
     media.appendChild(source);

From fe73a2eb190d68014bd8a7515a836c26525539ba Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 16:00:01 +0700
Subject: [PATCH 19/30] #882523780845215 Improve autoplay behaviour

all muted === true
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 9ccf12d5e..ca4b59f0c 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -94,6 +94,7 @@
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
     media.setAttribute('muted', true);
+    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);

From 315b57d66e499c9cf06694d5d22e07c6482dd080 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 16:06:18 +0700
Subject: [PATCH 20/30] #882523780845215 Improve autoplay behaviour

all muted === true
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index f3fbfd7aa..d760e489d 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -70,6 +70,7 @@
     media.setAttribute('muted', true);
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
+    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);

From 77213d1c6ce4afdeb9b3eacd8ef3558cea02d93f Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 16:07:15 +0700
Subject: [PATCH 21/30] #882523780845215 Improve autoplay behaviour

mute()
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 2 +-
 wrappers/html5/popcorn.HTMLMediaElement.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index ca4b59f0c..dbb5c9ce1 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -94,7 +94,7 @@
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
     media.setAttribute('muted', true);
-    media.muted = true;
+    media.mute(true);
 
     var source = document.createElement('source');
     media.appendChild(source);
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index d760e489d..dc80655ab 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -70,7 +70,7 @@
     media.setAttribute('muted', true);
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
-    media.muted = true;
+    media.mute(true);
 
     var source = document.createElement('source');
     media.appendChild(source);

From 3a5f9339c8fe181cd06124e847dc025942ab477f Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 16:13:32 +0700
Subject: [PATCH 22/30] #882523780845215 Improve autoplay behaviour

removed mute
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 2 +-
 wrappers/html5/popcorn.HTMLMediaElement.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index dbb5c9ce1..ca4b59f0c 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -94,7 +94,7 @@
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
     media.setAttribute('muted', true);
-    media.mute(true);
+    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index dc80655ab..d760e489d 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -70,7 +70,7 @@
     media.setAttribute('muted', true);
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
-    media.mute(true);
+    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);

From c04b04763d386451b8047e9d2121593e1a139d4e Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 18:07:42 +0700
Subject: [PATCH 23/30] #882523780845215 Improve autoplay behaviour

updated pause
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 1 +
 wrappers/html5/popcorn.HTMLMediaElement.js            | 1 +
 wrappers/null/popcorn.HTMLNullVideoElement.js         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index ca4b59f0c..40f3d4e68 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -94,6 +94,7 @@
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
     media.setAttribute('muted', true);
+    media.setAttribute('autoplay', true);
     media.muted = true;
 
     var source = document.createElement('source');
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index d760e489d..0981702c0 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -70,6 +70,7 @@
     media.setAttribute('muted', true);
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
+    media.setAttribute('autoplay', true);
     media.muted = true;
 
     var source = document.createElement('source');
diff --git a/wrappers/null/popcorn.HTMLNullVideoElement.js b/wrappers/null/popcorn.HTMLNullVideoElement.js
index 3adec4d9d..d62a24efb 100644
--- a/wrappers/null/popcorn.HTMLNullVideoElement.js
+++ b/wrappers/null/popcorn.HTMLNullVideoElement.js
@@ -94,7 +94,7 @@
         height: parent.height|0 ? parent.height : self._util.MIN_HEIGHT,
         seeking: false,
         ended: false,
-        paused: 1, // 1 vs. true to differentiate first time access
+        paused: 0, // 1 vs. true to differentiate first time access
         error: null
       },
       playerReadyCallbacks = [],

From d03514293ac484dd06b537fd3af6f07418f323e2 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Thu, 17 Jan 2019 18:31:15 +0700
Subject: [PATCH 24/30] #882523780845215 Improve autoplay behaviour

updated nullVideoElement
---
 wrappers/null/popcorn.HTMLNullVideoElement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrappers/null/popcorn.HTMLNullVideoElement.js b/wrappers/null/popcorn.HTMLNullVideoElement.js
index d62a24efb..5aa24895e 100644
--- a/wrappers/null/popcorn.HTMLNullVideoElement.js
+++ b/wrappers/null/popcorn.HTMLNullVideoElement.js
@@ -83,7 +83,7 @@
         src: EMPTY_STRING,
         networkState: self.NETWORK_EMPTY,
         readyState: self.HAVE_NOTHING,
-        autoplay: EMPTY_STRING,
+        autoplay: 1,
         preload: EMPTY_STRING,
         controls: EMPTY_STRING,
         loop: false,

From c27262185fa0abf12fdd76dbb84556eb73263525 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Mon, 21 Jan 2019 10:47:10 +0700
Subject: [PATCH 25/30] #882523780845215 Improve autoplay behaviour

added muted = true;
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 0981702c0..67b5a9804 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -90,6 +90,9 @@
     media._play = media.play;
     media._pause = media.pause;
     media.play = function () {
+      if (!media.muted) {
+        media.muted = true;
+      }
       media._play().catch(err => {
         console.error(err.message);
       });

From 4c65edd5dee89e7377dc9774c65cae162230552d Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Mon, 21 Jan 2019 11:05:12 +0700
Subject: [PATCH 26/30] #882523780845215 Improve autoplay behaviour

removed muted
---
 wrappers/html5/popcorn.HTMLMediaElement.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 67b5a9804..0981702c0 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -90,9 +90,6 @@
     media._play = media.play;
     media._pause = media.pause;
     media.play = function () {
-      if (!media.muted) {
-        media.muted = true;
-      }
       media._play().catch(err => {
         console.error(err.message);
       });

From a83cd68d8a9bb278f47896b37febaf8311b4f1b3 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Mon, 21 Jan 2019 11:40:54 +0700
Subject: [PATCH 27/30] #882523780845215 Improve autoplay behaviour

updated player
---
 modules/player/popcorn.player.js                      | 4 +++-
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 3 ---
 wrappers/html5/popcorn.HTMLMediaElement.js            | 3 ---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/player/popcorn.player.js b/modules/player/popcorn.player.js
index 208756caf..d3fdeaa88 100644
--- a/modules/player/popcorn.player.js
+++ b/modules/player/popcorn.player.js
@@ -410,6 +410,8 @@
       // setting playsinline to play it on mobiles correctly
       videoElement.setAttribute('playsinline', '');
       videoElement.setAttribute('webkit-playsinline', '');
+      videoElement.setAttribute('autoplay', 'true');
+      videoElement.setAttribute('muted', 'true');
       videoElement.id = videoID;
       node.appendChild( videoElement );
       setTimeout( function() {
@@ -425,7 +427,7 @@
     node.appendChild( videoHTMLContainer );
     // IE9 doesn't like dynamic creation of source elements on <video>
     // so we do it in one shot via innerHTML.
-    videoHTML = '<video id="' +  videoID + '" preload=auto autobuffer webkit-playsinline playsinline>';
+    videoHTML = '<video id="' +  videoID + '" preload=auto autobuffer muted autoplay webkit-playsinline playsinline>';
     for ( i = 0, srcLength = src.length; i < srcLength; i++ ) {
       videoHTML += '<source src="' + src[ i ] + '">';
     }
diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 40f3d4e68..378db8eef 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -93,9 +93,6 @@
 
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
-    media.setAttribute('muted', true);
-    media.setAttribute('autoplay', true);
-    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 0981702c0..f7ade6f87 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -67,11 +67,8 @@
     var parent = typeof id === "string" ? document.querySelector(id) : id,
       media = document.createElement(mediaType);
 
-    media.setAttribute('muted', true);
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
-    media.setAttribute('autoplay', true);
-    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);

From 82cf6b1f5663b8f2014b80eb6995e5dabfc51313 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Mon, 21 Jan 2019 12:09:24 +0700
Subject: [PATCH 28/30] #882523780845215 Improve autoplay behaviour

returned changes
---
 modules/player/popcorn.player.js                      | 4 +---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 3 +++
 wrappers/html5/popcorn.HTMLMediaElement.js            | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/player/popcorn.player.js b/modules/player/popcorn.player.js
index d3fdeaa88..208756caf 100644
--- a/modules/player/popcorn.player.js
+++ b/modules/player/popcorn.player.js
@@ -410,8 +410,6 @@
       // setting playsinline to play it on mobiles correctly
       videoElement.setAttribute('playsinline', '');
       videoElement.setAttribute('webkit-playsinline', '');
-      videoElement.setAttribute('autoplay', 'true');
-      videoElement.setAttribute('muted', 'true');
       videoElement.id = videoID;
       node.appendChild( videoElement );
       setTimeout( function() {
@@ -427,7 +425,7 @@
     node.appendChild( videoHTMLContainer );
     // IE9 doesn't like dynamic creation of source elements on <video>
     // so we do it in one shot via innerHTML.
-    videoHTML = '<video id="' +  videoID + '" preload=auto autobuffer muted autoplay webkit-playsinline playsinline>';
+    videoHTML = '<video id="' +  videoID + '" preload=auto autobuffer webkit-playsinline playsinline>';
     for ( i = 0, srcLength = src.length; i < srcLength; i++ ) {
       videoHTML += '<source src="' + src[ i ] + '">';
     }
diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 378db8eef..40f3d4e68 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -93,6 +93,9 @@
 
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
+    media.setAttribute('muted', true);
+    media.setAttribute('autoplay', true);
+    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index f7ade6f87..0981702c0 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -67,8 +67,11 @@
     var parent = typeof id === "string" ? document.querySelector(id) : id,
       media = document.createElement(mediaType);
 
+    media.setAttribute('muted', true);
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
+    media.setAttribute('autoplay', true);
+    media.muted = true;
 
     var source = document.createElement('source');
     media.appendChild(source);

From bf57fc386457ebd5c90a2ca957e7fa799d474dc2 Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Mon, 21 Jan 2019 13:36:05 +0700
Subject: [PATCH 29/30] #882523780845215 Improve autoplay behaviour

returned paused
---
 wrappers/null/popcorn.HTMLNullVideoElement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrappers/null/popcorn.HTMLNullVideoElement.js b/wrappers/null/popcorn.HTMLNullVideoElement.js
index 5aa24895e..8dce1da8a 100644
--- a/wrappers/null/popcorn.HTMLNullVideoElement.js
+++ b/wrappers/null/popcorn.HTMLNullVideoElement.js
@@ -94,7 +94,7 @@
         height: parent.height|0 ? parent.height : self._util.MIN_HEIGHT,
         seeking: false,
         ended: false,
-        paused: 0, // 1 vs. true to differentiate first time access
+        paused: 1, // 1 vs. true to differentiate first time access
         error: null
       },
       playerReadyCallbacks = [],

From 7c9d4a03ce9068034816f265deb9cd8fb5c2d79b Mon Sep 17 00:00:00 2001
From: Katerina <ekaterina.maksimlyuk@vedidev.com>
Date: Mon, 21 Jan 2019 13:48:10 +0700
Subject: [PATCH 30/30] #882523780845215 Improve autoplay behaviour

removed autoplay
---
 wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js | 1 -
 wrappers/html5/popcorn.HTMLMediaElement.js            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
index 40f3d4e68..ca4b59f0c 100644
--- a/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
+++ b/wrappers/adaptive/popcorn.HTMLAdaptiveMediaElement.js
@@ -94,7 +94,6 @@
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
     media.setAttribute('muted', true);
-    media.setAttribute('autoplay', true);
     media.muted = true;
 
     var source = document.createElement('source');
diff --git a/wrappers/html5/popcorn.HTMLMediaElement.js b/wrappers/html5/popcorn.HTMLMediaElement.js
index 0981702c0..d760e489d 100644
--- a/wrappers/html5/popcorn.HTMLMediaElement.js
+++ b/wrappers/html5/popcorn.HTMLMediaElement.js
@@ -70,7 +70,6 @@
     media.setAttribute('muted', true);
     media.setAttribute('playsinline', '');
     media.setAttribute('webkit-playsinline', '');
-    media.setAttribute('autoplay', true);
     media.muted = true;
 
     var source = document.createElement('source');