From c562a7f843cd174d578977c16084d349d6a06f28 Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Tue, 4 Oct 2016 15:28:30 +0100
Subject: [PATCH 1/2] Prevent advert play/pause/end/progress events from being
 tracked by the main video tracking when the ad library reuses the primary
 <video> element

---
 src/js/ads.js   | 10 ++++++++++
 src/js/video.js | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/js/ads.js b/src/js/ads.js
index f522287..1fb60d8 100644
--- a/src/js/ads.js
+++ b/src/js/ads.js
@@ -16,6 +16,9 @@ class VideoAds {
 		this.adsLoaded = false;
 		this.videoLoaded = false;
 		this.loadingStateDisplayed = false;
+
+		// record when the advert has completed
+		this.adsCompleted = false;
 	}
 
 	loadAdsLibrary() {
@@ -135,8 +138,14 @@ class VideoAds {
 
 		// Add listeners to the required events.
 		this.adsManager.addEventListener(google.ima.AdErrorEvent.Type.AD_ERROR, this.adErrorHandler);
+
+		// "Fired when content should be paused. This usually happens right before an ad is about to cover the content"
 		this.adsManager.addEventListener(google.ima.AdEvent.Type.CONTENT_PAUSE_REQUESTED, this.contentPauseRequestHandler);
+
+		// "Fired when content should be resumed. This usually happens when an ad finishes or collapses"
 		this.adsManager.addEventListener(google.ima.AdEvent.Type.CONTENT_RESUME_REQUESTED, this.contentResumeRequestHandler);
+
+		// "Fired when the ads manager is done playing all the ads"
 		this.adsManager.addEventListener(google.ima.AdEvent.Type.ALL_ADS_COMPLETED, this.adEventHandler);
 
 		// Listen to any additional events, if necessary.
@@ -301,6 +310,7 @@ class VideoAds {
 
 	contentResumeRequestHandler() {
 		this.video.containerEl.removeChild(this.adContainerEl);
+		this.adsCompleted = true;
 		this.video.videoEl.play();
 	}
 }
diff --git a/src/js/video.js b/src/js/video.js
index 77a744c..eb58b8f 100644
--- a/src/js/video.js
+++ b/src/js/video.js
@@ -7,6 +7,16 @@ import Playlist from './playlist';
 
 function eventListener(video, ev) {
 
+	// On some platforms (eg iOS), the Google advert library will use the main <video> element
+	// used by o-video to also play a pre-roll advert; as the advert plays, this will trigger
+	// the normal <video> event listeners.  Discard events that we can identify as coming
+	// from the pre-roll rather than the main content.
+	// To do this, check whether advertising is still enabled (it'll be disabled on any error),
+	// and for the video ads load and completed flags.
+	if (video.opts.advertising && video.videoAds && video.videoAds.adsLoaded && !video.videoAds.adsCompleted) {
+		return;
+	}
+
 	// Dispatch progress event at around 25%, 50%, 75% and 100%
 	// If allProgress is set to true, then we send spoor events for every native video progress event (every 5 sec)
 	if (!video.opts.allProgress && ev.type === 'progress' && !shouldDispatch(video.getProgress())) {

From be1295fe8b4c0c17260182cd3da99cc9023bdc79 Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Tue, 4 Oct 2016 15:42:02 +0100
Subject: [PATCH 2/2] Reset ads completed state again if the ad handler
 triggers again, for future-proofing

---
 src/js/ads.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/js/ads.js b/src/js/ads.js
index 1fb60d8..320e3f6 100644
--- a/src/js/ads.js
+++ b/src/js/ads.js
@@ -305,6 +305,7 @@ class VideoAds {
 	}
 
 	contentPauseRequestHandler() {
+		this.adsCompleted = false;
 		this.video.videoEl.pause();
 	}