Skip to content
This repository has been archived by the owner on Dec 10, 2020. It is now read-only.

Fix: Update broken mp4 test urls to working mp4 urls #231

Merged
merged 1 commit into from
Jul 21, 2017
Merged

Fix: Update broken mp4 test urls to working mp4 urls #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sandbox/videojs.html.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<body>

<video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
poster="http://video-js.zencoder.com/oceans-clip.png"
poster="http://vjs.zencdn.net/v/oceans.png"
data-setup='{"techOrder": ["flash"]}'>
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
<source src="http://vjs.zencdn.net/v/oceans.mp4" type='video/mp4' />
</video>

</body>
</html>
</html>
26 changes: 13 additions & 13 deletions tests/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="imagetoolbar" content="no" />
<title>VideoJS Workbench</title>
<link rel="stylesheet" href="css/reset.css"/>
<link rel="stylesheet" href="css/styles.css"/>
<link rel="stylesheet" href="css/reset.css"/>
<link rel="stylesheet" href="css/styles.css"/>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script type="text/javascript" src="js/swfobject.js"></script>
<script type="text/javascript">


function init(){

// control
Expand Down Expand Up @@ -85,7 +85,7 @@
$propVideoHeight = $("#propVideoHeight");

}

function log(msg){
try{
console.log(msg);
Expand All @@ -97,7 +97,7 @@
createSWF(e);
setTimeout(waitForSWF, 100);
}

function waitForSWF() {
var vid = $("#videoPlayer")[0];
log("Waiting for the SWF to be loaded...");
Expand Down Expand Up @@ -129,12 +129,12 @@
allowScriptAccess: "always",
bgcolor: "#000000"
};

var attributes = {
id: "videoPlayer",
name: "videoPlayer"
};

swfobject.embedSWF("../dist/video-js.swf", "videoPlayer", "100%", "100%", "10.3", "", flashvars, params, attributes);

}
Expand All @@ -159,7 +159,7 @@
e.preventDefault();
}
var el = $("#videoPlayer")[0];
el.vjs_src("http://video-js.zencoder.com/oceans-clip.mp4?");
el.vjs_src("http://vjs.zencdn.net/v/oceans.mp4?");
}

function playVideo(e){
Expand Down Expand Up @@ -220,7 +220,7 @@
function updatePlayerProperties(){

var el = $("#videoPlayer")[0];

$propCurrentSrc.html(el.vjs_getProperty("currentSrc"));
$propCurrentTime.html(el.vjs_getProperty("currentTime"));
$propTime.html(el.vjs_getProperty("time"));
Expand Down Expand Up @@ -349,15 +349,15 @@
<div id="videoPlayerWrapper" style="">
<div id="videoPlayer"></div>
</div>
</div>
</div>
<div id="control" class="span2">
<h1>Simple Controls</h1>
<p>Once playback has started, the SWF's control methods will work:</p>
<a id="btnPause" class="button" href="#">pause()</a><br>
<a id="btnResume" class="button" href="#">resume()</a><br>
<a id="btnSeek5" class="button" href="#">seek(5)</a><br>
<a id="btnResume" class="button" href="#">resume()</a><br>
<a id="btnSeek5" class="button" href="#">seek(5)</a><br>
</div>
</div>
</section>
</body>
</body>
</html>
26 changes: 13 additions & 13 deletions tests/manual/manual.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="imagetoolbar" content="no" />
<title>VideoJS Workbench</title>
<link rel="stylesheet" href="css/reset.css"/>
<link rel="stylesheet" href="css/styles.css"/>
<link rel="stylesheet" href="css/reset.css"/>
<link rel="stylesheet" href="css/styles.css"/>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script type="text/javascript" src="js/swfobject.js"></script>
<script type="text/javascript">


function init(){

// control
Expand Down Expand Up @@ -85,7 +85,7 @@
$propVideoHeight = $("#propVideoHeight");

}

function log(msg){
try{
console.log(msg);
Expand All @@ -97,7 +97,7 @@
createSWF(e);
setTimeout(waitForSWF, 100);
}

function waitForSWF() {
var vid = $("#videoPlayer")[0];
log("Waiting for the SWF to be loaded...");
Expand Down Expand Up @@ -129,12 +129,12 @@
allowScriptAccess: "always",
bgcolor: "#000000"
};

var attributes = {
id: "videoPlayer",
name: "videoPlayer"
};

swfobject.embedSWF("../../dist/video-js.swf", "videoPlayer", "100%", "100%", "10.3", "", flashvars, params, attributes);

}
Expand All @@ -159,7 +159,7 @@
e.preventDefault();
}
var el = $("#videoPlayer")[0];
el.vjs_src("http://video-js.zencoder.com/oceans-clip.mp4?");
el.vjs_src("http://vjs.zencdn.net/v/oceans.mp4?");
}

function playVideo(e){
Expand Down Expand Up @@ -220,7 +220,7 @@
function updatePlayerProperties(){

var el = $("#videoPlayer")[0];

$propCurrentSrc.html(el.vjs_getProperty("currentSrc"));
$propCurrentTime.html(el.vjs_getProperty("currentTime"));
$propTime.html(el.vjs_getProperty("time"));
Expand Down Expand Up @@ -355,15 +355,15 @@
<div id="videoPlayerWrapper" style="">
<div id="videoPlayer"></div>
</div>
</div>
</div>
<div id="control" class="span2">
<h1>Simple Controls</h1>
<p>Once playback has started, the SWF's control methods will work:</p>
<a id="btnPause" class="button" href="#">pause()</a><br>
<a id="btnResume" class="button" href="#">resume()</a><br>
<a id="btnSeek5" class="button" href="#">seek(5)</a><br>
<a id="btnResume" class="button" href="#">resume()</a><br>
<a id="btnSeek5" class="button" href="#">seek(5)</a><br>
</div>
</div>
</section>
</body>
</body>
</html>
36 changes: 18 additions & 18 deletions tests/manual/manual_full.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="imagetoolbar" content="no" />
<title>VideoJS Workbench</title>
<link rel="stylesheet" href="css/reset.css"/>
<link rel="stylesheet" href="css/styles.css"/>
<link rel="stylesheet" href="css/reset.css"/>
<link rel="stylesheet" href="css/styles.css"/>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script type="text/javascript" src="js/swfobject.js"></script>
<script type="text/javascript">


function init(){

$("#btnInstantiate").click(createSWF);
$("#btnSetProps").click(setProperties);
$("#btnSetSrc").click(setSource);
Expand Down Expand Up @@ -103,7 +103,7 @@
$propVideoHeight = $("#propVideoHeight");

}

function log(msg){
try{
console.log(msg);
Expand All @@ -128,12 +128,12 @@
allowScriptAccess: "always",
bgcolor: "#000000"
};

var attributes = {
id: "videoPlayer",
name: "videoPlayer"
};

swfobject.embedSWF("../../dist/video-js.swf", "videoPlayer", "100%", "100%", "10.3", "", flashvars, params, attributes);

}
Expand Down Expand Up @@ -168,7 +168,7 @@
function setSource(e){
e.preventDefault();
var el = $("#videoPlayer")[0];
el.vjs_src("http://video-js.zencoder.com/oceans-clip.mp4?");
el.vjs_src("http://vjs.zencdn.net/v/oceans.mp4?");
}

function loadVideo(e){
Expand Down Expand Up @@ -233,7 +233,7 @@
function updatePlayerProperties(){

var el = $("#videoPlayer")[0];

$propCurrentSrc.html(el.vjs_getProperty("currentSrc"));
$propCurrentTime.html(el.vjs_getProperty("currentTime"));
$propTime.html(el.vjs_getProperty("time"));
Expand Down Expand Up @@ -360,7 +360,7 @@
</div>
</div>
</section>

<section id="instantiation">
<div class="row">
<div class="span2">
Expand All @@ -373,7 +373,7 @@ <h1>Step 1: Instantiation</h1>
<div id="videoPlayerWrapper" style="">
<div id="videoPlayer"></div>
</div>
</div>
</div>
</div>
</section>

Expand All @@ -390,7 +390,7 @@ <h1>Step 2: Configuration &amp; Playback</h1>
</ul>
<a id="btnSetProps" class="button" href="#">Set Properties</a>
<p>Next, we'll call src() to let the swf know where the media asset can be found:</p>
<a id="btnSetSrc" class="button" href="#">src("http://video-js.zencoder.com/oceans-clip.mp4?")</a>
<a id="btnSetSrc" class="button" href="#">src("http://vjs.zencdn.net/v/oceans.mp4?")</a>
<p>If the SWF's autoplay property had been set to true at any point prior to this src() call, loading and playback would begin.</p>
<p>To begin loading without playing, call load():</p>
<a id="btnLoad" class="button" href="#">load()</a>
Expand All @@ -400,20 +400,20 @@ <h1>Step 2: Configuration &amp; Playback</h1>
<div id="control" class="span3">
<h1>Step 3: Control</h1>
<p>Once playback has started, the SWF's control methods will work:</p>
<a id="btnPause" class="button" href="#">pause()</a>
<a id="btnResume" class="button" href="#">resume()</a>
<a id="btnPause" class="button" href="#">pause()</a>
<a id="btnResume" class="button" href="#">resume()</a>
<br />
<a id="btnSeek5" class="button" href="#">seek(5)</a>
<a id="btnSeek10" class="button" href="#">seek(10)</a>
<a id="btnSeek5" class="button" href="#">seek(5)</a>
<a id="btnSeek10" class="button" href="#">seek(10)</a>
<a id="btnSeek15" class="button" href="#">seek(15)</a>
<br />
<a id="btnEnlarge" class="button" href="#">enlarge</a>
<a id="btnEnlarge" class="button" href="#">enlarge</a>
<a id="btnReduce" class="button" href="#">reduce</a>
</div>
</div>
</section>



</body>
</body>
</html>
Loading