Skip to content
This repository has been archived by the owner on Feb 13, 2019. It is now read-only.

Commit

Permalink
Merge pull request #25 from nhjm449/pull1
Browse files Browse the repository at this point in the history 
Merge
  • Loading branch information
@shaqq
shaqq committed May 30, 2014
2 parents f4f2c41 + 4a98fec commit 6c5e3ad
Show file tree
Hide file tree
Showing 2 changed files with 124 additions and 50 deletions.
52 changes: 38 additions & 14 deletions spec/VastPluginSpec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,72 +84,96 @@

describe("createSourceObjects", function() {

it("should return objects with 'src' and 'type' properties", function() {
it("should return objects with 'src', 'type', 'width', and 'height' properties", function() {
var media_files = [
{
fileURL: "TRL",
mimeType: "video/webm"
mimeType: "video/webm",
width: 640,
height: 360
},
{
fileURL: "BuddhaForRill",
mimeType: "video/mp4"
mimeType: "video/mp4",
width: 0,
height: 0
}
];
var sources = player.vast.createSourceObjects(media_files);
for (var s in sources) {
expect(sources[s].src).toBeDefined();
expect(sources[s].type).toBeDefined();
expect(sources[s].width).toBeDefined();
expect(sources[s].height).toBeDefined();
}
});

it("should not accept all video formats", function() {
var media_files = [
{
fileURL: "TRL",
mimeType: "video/flv"
mimeType: "video/flv",
width: 640,
height: 360
},
{
fileURL: "So Trill",
mimeType: "video/x-flv"
mimeType: "video/x-flv",
width: 512,
height: 288
},
{
fileURL: "Skrill, WHERES MY SKRILL",
mimeType: "video/mpeg"
mimeType: "video/mpeg",
width: 0,
height: 0
},
{
fileURL: "Jack and Jill",
mimeType: "video/ogg"
mimeType: "video/ogg",
width: 1280,
height: 720
},
{
fileURL: "-- Code Raps -- ",
mimeType: "hls/playlist.m3u8"
mimeType: "hls/playlist.m3u8",
width: 640,
height: 480
},
{
fileURL: "I'm tapped",
mimeType: "video/avi"
mimeType: "video/avi",
width: 512,
height: 384
},
{
fileURL: "BuddhaForRill",
mimeType: "video/mp4"
mimeType: "video/mp4",
width: 1920,
height: 1080
}
];
var sources = player.vast.createSourceObjects(media_files);
expect(sources.length).toBe(1);
});

it("returns sources with unique formats", function() {
it("can return sources with duplicate formats", function() {
var media_files = [
{
fileURL: "TRL",
mimeType: "video/mp4"
mimeType: "video/mp4",
width: 640,
height: 360
},
{
fileURL: "BuddhaForRill",
mimeType: "video/mp4"
mimeType: "video/mp4",
width: 853,
height: 480
}
];
var sources = player.vast.createSourceObjects(media_files);
expect(sources.length).toBe(1);
expect(sources.length).toBe(2);
});

});
Expand Down
122 changes: 86 additions & 36 deletions videojs.vast.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},

defaults = {
skip: 5,
skip: 5 // negative disables
},

vastPlugin = function(options) {
Expand All @@ -33,6 +33,7 @@
return;
}

// videojs-ads triggers this when src changes
player.on('contentupdate', function(){
player.vast.getContent(settings.url);
});
Expand All @@ -46,31 +47,71 @@
if (response) {
for (var adIdx = 0; adIdx < response.ads.length; adIdx++) {
var ad = response.ads[adIdx];
player.vast.companion = undefined;
for (var creaIdx = 0; creaIdx < ad.creatives.length; creaIdx++) {
var linearCreative = ad.creatives[creaIdx];
if (linearCreative.type !== "linear") continue;

if (linearCreative.mediaFiles.length) {
var creative = ad.creatives[creaIdx], foundCreative = false, foundCompanion = false;
if (creative.type === "linear" && !foundCreative) {

player.vast.sources = player.vast.createSourceObjects(linearCreative.mediaFiles);
if (creative.mediaFiles.length) {

if (!player.vast.sources.length) {
player.trigger('adtimeout');
return;
}
player.vast.sources = player.vast.createSourceObjects(creative.mediaFiles);

player.vastTracker = new vast.tracker(ad, linearCreative);
player.on('canplay', function() {this.vastTracker.load();});
player.on('timeupdate', function() {
if (isNaN(this.vastTracker.assetDuration)) {
this.vastTracker.assetDuration = this.duration();
if (!player.vast.sources.length) {
player.trigger('adtimeout');
return;
}
this.vastTracker.setProgress(this.currentTime());
});
player.on('play', function() {this.vastTracker.setPaused(false);});
player.on('pause', function() {this.vastTracker.setPaused(true);});

break;
player.vastTracker = new vast.tracker(ad, creative);

var errorOccurred = false,
canplayFn = function() {
this.vastTracker.load();
},
timeupdateFn = function() {
if (isNaN(this.vastTracker.assetDuration)) {
this.vastTracker.assetDuration = this.duration();
}
this.vastTracker.setProgress(this.currentTime());
},
playFn = function() {
this.vastTracker.setPaused(false);
},
pauseFn = function() {
this.vastTracker.setPaused(true);
},
errorFn = function() {
// Inform ad server we couldn't play the media file for this ad
vast.util.track(ad.errorURLTemplates, {ERRORCODE: 405});
errorOccurred = true;
player.trigger('ended');
};

player.on('canplay', canplayFn);
player.on('timeupdate', timeupdateFn);
player.on('play', playFn);
player.on('pause', pauseFn);
player.on('error', errorFn);

player.one('ended', function() {
player.off('canplay', canplayFn);
player.off('timeupdate', timeupdateFn);
player.off('play', playFn);
player.off('pause', pauseFn);
player.off('error', errorFn);
if (!errorOccurred) {
this.vastTracker.complete();
}
});

foundCreative = true;
}

} else if (creative.type === "companion" && !foundCompanion) {

player.vast.companion = creative;

foundCompanion = true;

}
}

Expand Down Expand Up @@ -116,14 +157,18 @@
blocker.onclick = function() {
var clicktrackers = player.vastTracker.clickTrackingURLTemplate;
if (clicktrackers) {
player.vastTracker.trackURLs(clicktrackers);
player.vastTracker.trackURLs([clicktrackers]);
}
player.trigger("adclick");
};
player.vast.blocker = blocker;
player.el().insertBefore(blocker, player.controlBar.el());

var skipButton = document.createElement("div");
skipButton.className = "vast-skip-button";
if (settings.skip < 0) {
skipButton.style.display = "none";
}
player.vast.skipButton = skipButton;
player.el().appendChild(skipButton);

Expand Down Expand Up @@ -164,28 +209,33 @@
}
};
player.vast.createSourceObjects = function(media_files) {
var fileURLs = {};
var sourcesByFormat = {}, format, i;
var vidFormats = ['video/mp4', 'video/webm', 'video/ogv'];
// get a list of files with unique formats
for (var i = 0; i < media_files.length; i++) {
var file_url = media_files[i].fileURL;
var mime_type = media_files[i].mimeType;

if (vidFormats.indexOf(mime_type) >= 0) {
if(fileURLs[mime_type] === undefined) {
fileURLs[mime_type] = file_url;
}
for (i = 0; i < media_files.length; i++) {
format = media_files[i].mimeType;

if (vidFormats.indexOf(format) >= 0) {
if(sourcesByFormat[format] === undefined) {
sourcesByFormat[format] = [];
}
sourcesByFormat[format].push({
type: format,
src: media_files[i].fileURL,
width: media_files[i].width,
height: media_files[i].height
});
}
}

// Create sources in preferred format order
var sources = [];
for (var j=0; j < vidFormats.length; j++) {
var format = vidFormats[j];
if (fileURLs[format] !== undefined) {
sources.push({
type: format,
src: fileURLs[format]
});
format = vidFormats[j];
if (sourcesByFormat[format] !== undefined) {
for (i = 0; i < sourcesByFormat[format].length; i++) {
sources.push(sourcesByFormat[format][i]);
}
}
}
return sources;
Expand Down

0 comments on commit 6c5e3ad

Please sign in to comment.