Internal change

PiperOrigin-RevId: 290115022
googleads · Feb 25, 2020 · fe084e5 · fe084e5
1 parent b06c9ca
commit fe084e5
Show file tree

Hide file tree

Showing 23 changed files with 14 additions and 55 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/advanced/ads.js b/advanced/ads.js
diff --git a/advanced/index.html b/advanced/index.html
@@ -49,8 +49,7 @@
 
     <div id="videoplayer">
       <video id="content">
-        <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4"></source>
-        <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.webm"></source>
+        <source src="https://storage.googleapis.com/gvabox/media/samples/stock.mp4"></source>
       </video>
       <div id="adcontainer">
       </div>

diff --git a/advanced/video_player.js b/advanced/video_player.js
diff --git a/attempt_to_autoplay/ads.js b/attempt_to_autoplay/ads.js
@@ -163,6 +163,9 @@ function onAdsManagerLoaded(adsManagerLoadedEvent) {
   // videoContent should be set to the content video element.
   adsManager = adsManagerLoadedEvent.getAdsManager(
       videoContent, adsRenderingSettings);
+  // Mute the ad if doing muted autoplay.
+  const adVolume = (autoplayAllowed && autoplayRequiresMuted) ? 0 : 1;
+  adsManager.setVolume(adVolume);
 
   // Add listeners to the required events.
   adsManager.addEventListener(
@@ -216,6 +219,8 @@ function onAdError(adErrorEvent) {
   // Handle the error logging.
   console.log(adErrorEvent.getError());
   adsManager.destroy();
+  // Fall back to playing content.
+  videoContent.play();
 }
 
 function onContentPauseRequested() {

diff --git a/attempt_to_autoplay/index.html b/attempt_to_autoplay/index.html
@@ -17,9 +17,8 @@
     </p>
     <div id="mainContainer">
       <div id="content">
-        <video id="contentElement">
-          <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4"></source>
-          <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.webm"></source>
+        <video id="contentElement" playsinline>
+          <source src="https://storage.googleapis.com/gvabox/media/samples/stock.mp4"></source>
         </video>
       </div>
       <div id="adContainer"></div>

diff --git a/attempt_to_autoplay/style.css b/attempt_to_autoplay/style.css
diff --git a/live_stream_prefetch/ads.js b/live_stream_prefetch/ads.js
diff --git a/live_stream_prefetch/index.html b/live_stream_prefetch/index.html
@@ -8,8 +8,7 @@
     <div id="mainContainer">
       <div id="content">
         <video id="contentElement">
-          <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4"></source>
-          <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.webm"></source>
+          <source src="https://storage.googleapis.com/gvabox/media/samples/stock.mp4"></source>
         </video>
       </div>
       <div id="adContainer"></div>

diff --git a/live_stream_prefetch/style.css b/live_stream_prefetch/style.css
diff --git a/mobile_auto_skippable/ads.js b/mobile_auto_skippable/ads.js
diff --git a/mobile_auto_skippable/index.html b/mobile_auto_skippable/index.html
@@ -8,8 +8,7 @@
     <div id="mainContainer">
       <div id="content">
         <video id="contentElement" playsinline muted>
-          <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4"></source>
-          <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.webm"></source>
+          <source src="https://storage.googleapis.com/gvabox/media/samples/stock.mp4"></source>
         </video>
       </div>
       <div id="adContainer"></div>

diff --git a/mobile_auto_skippable/style.css b/mobile_auto_skippable/style.css
diff --git a/playlist/ads.js b/playlist/ads.js
@@ -206,7 +206,6 @@ Ads.prototype.onAdError_ = function(adErrorEvent) {
  * the video player fires the ended event. Here ads are done, so if
  * the content video is done, we start the next video. If ads are done but the
  * content video is still playing, we just let it finish.
- *
  * @private
  */
 Ads.prototype.onAllAdsCompleted_ = function() {

diff --git a/playlist/application.js b/playlist/application.js
diff --git a/playlist/index.html b/playlist/index.html
@@ -44,8 +44,7 @@
 
     <div id="videoplayer">
       <video id="content">
-        <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.webm"></source>
-        <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4"></source>
+        <source src="https://storage.googleapis.com/gvabox/media/samples/stock.mp4"></source>
       </video>
       <div id="adcontainer">
       </div>

diff --git a/playlist/style.css b/playlist/style.css
diff --git a/playlist/video_player.js b/playlist/video_player.js
@@ -12,8 +12,8 @@ var VideoPlayer = function() {
   this.videoPlayerContainer_ = document.getElementById('videoplayer');
 
   this.contentIndex = 0;
-  this.contentUrls = ['http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4',
-                      'http://rmcdn.2mdn.net/Demo/html5/output.mp4'];
+  this.contentUrls = ['https://storage.googleapis.com/gvabox/media/samples/stock.mp4',
+                      'https://storage.googleapis.com/gvabox/media/samples/android.mp4'];
 
   this.width = 640;
   this.height = 360;

diff --git a/simple/ads.js b/simple/ads.js
diff --git a/simple/index.html b/simple/index.html
@@ -8,8 +8,7 @@
     <div id="mainContainer">
       <div id="content">
         <video id="contentElement">
-          <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4"></source>
-          <source src="http://rmcdn.2mdn.net/Demo/vast_inspector/android.webm"></source>
+          <source src="https://storage.googleapis.com/gvabox/media/samples/stock.mp4"></source>
         </video>
       </div>
       <div id="adContainer"></div>

diff --git a/simple/style.css b/simple/style.css
diff --git a/vpaid/linear/VpaidVideoAd.js b/vpaid/linear/VpaidVideoAd.js
@@ -1,7 +1,6 @@
 /**
  * @fileoverview A sample VPAID ad useful for testing a VPAID JS enabled player.
  * This ad will just play a video.
- *
  */
 
 /**
@@ -74,7 +73,6 @@ var VpaidVideoPlayer = function() {
   /**
    * Parameters passed in from the AdParameters section of the VAST.
    * Used for video URL and MIME type.
-   *
    * @type {!object}
    * @private
    */
@@ -95,7 +93,6 @@ VpaidVideoPlayer.prototype.handshakeVersion = function(version) {
 /**
  * Initializes all attributes in the ad. The ad will not start until startAd is\
  * called.
- *
  * @param {number} width The ad width.
  * @param {number} height The ad height.
  * @param {string} viewMode The ad view mode.
@@ -254,7 +251,6 @@ VpaidVideoPlayer.prototype.stopAd = function() {
 
 /**
  * Called when the video player changes the width/height of the container.
- *
  * @param {number} width The new width.
  * @param {number} height A new height.
  * @param {string} viewMode A new view mode.
@@ -322,7 +318,6 @@ VpaidVideoPlayer.prototype.skipAd = function() {
 
 /**
  * Registers a callback for an event.
- *
  * @param {Function} aCallback The callback function.
  * @param {string} eventName The callback type.
  * @param {Object} aContext The context for the callback.
@@ -339,7 +334,6 @@ VpaidVideoPlayer.prototype.subscribe = function(
 
 /**
  * Removes a callback based on the eventName.
- *
  * @param {string} eventName The callback type.
  */
 VpaidVideoPlayer.prototype.unsubscribe = function(eventName) {
@@ -350,7 +344,6 @@ VpaidVideoPlayer.prototype.unsubscribe = function(eventName) {
 
 /**
  * Returns whether the ad is linear.
- *
  * @return {boolean} True if the ad is a linear, false for non linear.
  */
 VpaidVideoPlayer.prototype.getAdLinear = function() {
@@ -359,7 +352,6 @@ VpaidVideoPlayer.prototype.getAdLinear = function() {
 
 /**
  * Returns ad width.
- *
  * @return {number} The ad width.
  */
 VpaidVideoPlayer.prototype.getAdWidth = function() {
@@ -369,7 +361,6 @@ VpaidVideoPlayer.prototype.getAdWidth = function() {
 
 /**
  * Returns ad height.
- *
  * @return {number} The ad height.
  */
 VpaidVideoPlayer.prototype.getAdHeight = function() {
@@ -379,7 +370,6 @@ VpaidVideoPlayer.prototype.getAdHeight = function() {
 
 /**
  * Returns true if the ad is expanded.
- *
  * @return {boolean}
  */
 VpaidVideoPlayer.prototype.getAdExpanded = function() {
@@ -390,7 +380,6 @@ VpaidVideoPlayer.prototype.getAdExpanded = function() {
 
 /**
  * Returns the skippable state of the ad.
- *
  * @return {boolean}
  */
 VpaidVideoPlayer.prototype.getAdSkippableState = function() {
@@ -401,7 +390,6 @@ VpaidVideoPlayer.prototype.getAdSkippableState = function() {
 
 /**
  * Returns the remaining ad time, in seconds.
- *
  * @return {number} The time remaining in the ad.
  */
 VpaidVideoPlayer.prototype.getAdRemainingTime = function() {
@@ -411,7 +399,6 @@ VpaidVideoPlayer.prototype.getAdRemainingTime = function() {
 
 /**
  * Returns the duration of the ad, in seconds.
- *
  * @return {number} The duration of the ad.
  */
 VpaidVideoPlayer.prototype.getAdDuration = function() {
@@ -421,7 +408,6 @@ VpaidVideoPlayer.prototype.getAdDuration = function() {
 
 /**
  * Returns the ad volume.
- *
  * @return {number} The volume of the ad.
  */
 VpaidVideoPlayer.prototype.getAdVolume = function() {
@@ -432,7 +418,6 @@ VpaidVideoPlayer.prototype.getAdVolume = function() {
 
 /**
  * Sets the ad volume.
- *
  * @param {number} value The volume in percentage.
  */
 VpaidVideoPlayer.prototype.setAdVolume = function(value) {
@@ -444,7 +429,6 @@ VpaidVideoPlayer.prototype.setAdVolume = function(value) {
 
 /**
  * Returns a list of companion ads for the ad.
- *
  * @return {string} List of companions in VAST XML.
  */
 VpaidVideoPlayer.prototype.getAdCompanions = function() {
@@ -454,7 +438,6 @@ VpaidVideoPlayer.prototype.getAdCompanions = function() {
 
 /**
  * Returns a list of icons.
- *
  * @return {string} A list of icons.
  */
 VpaidVideoPlayer.prototype.getAdIcons = function() {
@@ -464,7 +447,6 @@ VpaidVideoPlayer.prototype.getAdIcons = function() {
 
 /**
  * Logs events and messages.
- *
  * @param {string} message
  */
 VpaidVideoPlayer.prototype.log = function(message) {
@@ -474,7 +456,6 @@ VpaidVideoPlayer.prototype.log = function(message) {
 
 /**
  * Calls an event if there is a callback.
- *
  * @param {string} eventType
  * @private
  */
@@ -487,7 +468,6 @@ VpaidVideoPlayer.prototype.callEvent_ = function(eventType) {
 
 /**
  * Main function called by wrapper to get the VPAID ad.
- *
  * @return {Object} The VPAID compliant ad.
  */
 var getVPAIDAd = function() {