Commit 9df3d957 authored by Brendan Long's avatar Brendan Long

Merge branch 'master' of github.com:cablelabs/track-test

Conflicts:
	demo.html
parents e1c3fea5 1f8d7285
......@@ -10,12 +10,5 @@ Most of the files aren't included in the repo because want to keep it
reasonably small. If WebKit is checked out in the same directory as this
repo, the "counting" videos will be taken from `../webkit/LayoutTests/media`.
To get local copies of Sintel, use wget, or download them in your browser, then
put them in the same folder as demo.html.
## Output
When you click buttons that should have output, they print to the web console.
To get to it in the WebKit test browser, right click on anything on the page,
choose "Inspect Element", then in the panel that shows up, click the "Console"
tab.
To get local copies of Sintel and the RUI test media (ClosedCaptions.ts and
UserPrivateStreams.ts), use `./get_files.sh`.
......@@ -28,10 +28,10 @@ var config = {
/* List of media options. Name will be shown on the button label, url is the URL */
media: [{
label: "Sintel Trailer (Theora + Vorbis + Kate)",
url: "http://ftp.nluug.nl/ftp/graphics/blender/apricot/trailer/sintel_trailer-480p.ogv"
url: "http://download.blender.org/durian/trailer/sintel_trailer-480p.ogv"
}, {
label: "Sintel Trailer (h264 + aac + Subtitles)",
url: "http://ftp.nluug.nl/ftp/graphics/blender/apricot/trailer/Sintel_Trailer1.480p.DivX_Plus_HD.mkv"
url: "http://download.blender.org/durian/trailer/Sintel_Trailer1.480p.DivX_Plus_HD.mkv"
}, {
label: "Multi Track Test File (Ogg; 2x Theora + 2x Vorbis)",
url: "test.ogv"
......@@ -47,9 +47,6 @@ var config = {
}, {
label: "Tears of Steel (Local File; MPEG-TS + CEA 608)",
url: "Ultimate-Stream-1280x720-5Mb-mpeg2v-ac3_0100_CC_Trim.ts"
},{
label: "Tears of Steel from FTP (Local File; MPEG-PS + CEA 608)",
url: "tears_of_steel_720p-MPEG-2 Program stream, 15 Mbps.mpeg"
}, {
label: "WebKit Counting-Subtitled (Local File; m4v)",
url: "../webkit/LayoutTests/media/content/counting-subtitled.m4v"
......@@ -59,15 +56,12 @@ var config = {
}, {
label: "WebKit Counting-Subtitled (Local File; ogg; Theora + Kate)",
url: "../webkit/LayoutTests/media/content/counting-subtitled-kate.ogv"
}, {
label: "WebKit Two Audio and Video Tracks (Local File; Matroska; mpeg4 + srt)",
url: "../webkit/LayoutTests/media/content/two-audio-and-video-tracks.mkv"
}, {
label: "WebKit Counting (Local File; MPEG-TS)",
url: "../webkit/LayoutTests/media/content/counting.ts"
}, {
label: "Ogg Skeleton File",
url: "skeleton.ogv"
label: "WebKit Two Audio and Video Tracks (Local File; Matroska; mpeg4 + srt)",
url: "../webkit/LayoutTests/media/content/two-audio-and-video-tracks.mkv"
}, {
label: "Chromium Bear (Local File; webm; VP8 + WebVTT",
url: "../chromium/src/media/test/data/bear-vp8-webvtt.webm"
......@@ -77,24 +71,12 @@ var config = {
}, {
label: "Local RTP Stream (whatever's on port 5004)",
url: "rtp://localhost:5004"
}, {
label: "O-MP2TS_SN-1.mpg (DLNA test video?)",
url: "O-MP2TS_SN-1.mpg"
}, {
label: "SPTS-1_track-2_referenced_videos-1min.ts (DLNA test video?)",
url: "SPTS-1_track-2_referenced_videos-1min.ts"
}, {
label: "UserPrivateStreams.ts (DLNA test video?)",
url: "UserPrivateStreams.ts"
}, {
label: "ClosedCaption.ts (DLNA test video?)",
url: "ClosedCaption.ts"
url: "media/ClosedCaption.ts"
}, {
label: "football.ts",
url: "football.ts"
}, {
label: "mpt-200309161700-clip.ts",
url: "mpt-200309161700-clip.ts"
label: "UserPrivateStreams.ts (DLNA test video?)",
url: "media/UserPrivateStreams.ts"
}],
/* Whether or not to show native controls */
......
#!/bin/bash
# This script attempts to download the "local files" for demo.html.
# The Ultimate Stream will only download if you're on the RUI
# private network.
FILES=(http://ftp.nluug.nl/ftp/graphics/blender/apricot/trailer/Sintel_Trailer1.480p.DivX_Plus_HD.mkv http://10.49.5.101/videos/Ultimate-Stream-1280x720-5Mb-mpeg2v-ac3_0100_CC_Trim.ts)
FILES=(http://download.blender.org/durian/trailer/Sintel_Trailer1.480p.DivX_Plus_HD.mkv http://download.blender.org/durian/trailer/sintel_trailer-480p.ogv)
for file in ${FILES[@]} ; do
if [[ ! -f $(basename "$file") ]] ; then
wget --tries=1 "$file"
fi
done
if [[ ! -f media/ClosedCaption.ts ]] || [[ ! -f media/UserPrivateStreams.ts ]] ; then
wget http://html5.cablelabs.com/dlna-rui-test/dlna/media/media.tar.gz && tar -xf media.tar.gz
rm -f media.tar.gz
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment