Add LayoutTests for MediaSource codec config changes.
This patch tests codec configuration changes that are allowed
during the middle of playback when the MediaSource API is
being used. These tests construct 2 second presentations that
alternate between 2 different codec configurations every 0.5
seconds. Frame size, frame rate, and bitrate changes are for
both MP4 and WebM content are being tested.
The script used to generate the media files and HTML files
for these tests is also included in this patch to make it
easier to regenerate the media files and add new tests.
BUG=239506
TEST=LayoutTests/http/tests/media/media-source/mediasource-config-change*.html
Review URL: https://chromiumcodereview.appspot.com/17338002
git-svn-id: svn://svn.chromium.org/blink/trunk@152761 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-a-bitrate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-a-bitrate-expected.txt
new file mode 100644
index 0000000..a2def03
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-a-bitrate-expected.txt
@@ -0,0 +1,3 @@
+
+FAIL Tests mp4 audio-only bitrate changes. assert_true: audio/mp4;codecs="mp4a.40.2" is supported. expected true got false
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-a-bitrate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-a-bitrate.html
new file mode 100644
index 0000000..2640a64
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-a-bitrate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("mp4", "a-128k-44100Hz-1ch", "a-192k-44100Hz-1ch", "Tests mp4 audio-only bitrate changes.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate-expected.txt
new file mode 100644
index 0000000..9f7f060
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate-expected.txt
@@ -0,0 +1,3 @@
+
+FAIL Tests mp4 audio bitrate changes in multiplexed content. assert_true: video/mp4;codecs="avc1.4D4001,mp4a.40.2" is supported. expected true got false
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate.html
new file mode 100644
index 0000000..8bd2b4d
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-audio-bitrate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("mp4", "av-384k-44100Hz-1ch-640x480-30fps-10kfr", "av-448k-44100Hz-1ch-640x480-30fps-10kfr", "Tests mp4 audio bitrate changes in multiplexed content.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-framesize-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-framesize-expected.txt
new file mode 100644
index 0000000..fd7b61e
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-framesize-expected.txt
@@ -0,0 +1,3 @@
+
+FAIL Tests mp4 frame size changes in multiplexed content. assert_true: video/mp4;codecs="avc1.4D4001,mp4a.40.2" is supported. expected true got false
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-framesize.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-framesize.html
new file mode 100644
index 0000000..645e8ae
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-framesize.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("mp4", "av-384k-44100Hz-1ch-320x240-30fps-10kfr", "av-384k-44100Hz-1ch-640x480-30fps-10kfr", "Tests mp4 frame size changes in multiplexed content.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate-expected.txt
new file mode 100644
index 0000000..6d609be
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate-expected.txt
@@ -0,0 +1,3 @@
+
+FAIL Tests mp4 video bitrate changes in multiplexed content. assert_true: video/mp4;codecs="avc1.4D4001,mp4a.40.2" is supported. expected true got false
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate.html
new file mode 100644
index 0000000..32df9d0
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-av-video-bitrate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("mp4", "av-384k-44100Hz-1ch-640x480-30fps-10kfr", "av-640k-44100Hz-1ch-640x480-30fps-10kfr", "Tests mp4 video bitrate changes in multiplexed content.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate-expected.txt
new file mode 100644
index 0000000..41f714e
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate-expected.txt
@@ -0,0 +1,3 @@
+
+FAIL Tests mp4 video-only bitrate changes. assert_true: video/mp4;codecs="avc1.4D4001" is supported. expected true got false
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html
new file mode 100644
index 0000000..762d7696
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("mp4", "v-128k-320x240-30fps-10kfr", "v-256k-320x240-30fps-10kfr", "Tests mp4 video-only bitrate changes.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framerate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framerate-expected.txt
new file mode 100644
index 0000000..010ecb5
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framerate-expected.txt
@@ -0,0 +1,3 @@
+
+FAIL Tests mp4 video-only frame rate changes. assert_true: video/mp4;codecs="avc1.4D4001" is supported. expected true got false
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framerate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framerate.html
new file mode 100644
index 0000000..3a2a355
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framerate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("mp4", "v-128k-320x240-24fps-8kfr", "v-128k-320x240-30fps-10kfr", "Tests mp4 video-only frame rate changes.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framesize-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framesize-expected.txt
new file mode 100644
index 0000000..590d4ea
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framesize-expected.txt
@@ -0,0 +1,3 @@
+
+FAIL Tests mp4 video-only frame size changes. assert_true: video/mp4;codecs="avc1.4D4001" is supported. expected true got false
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framesize.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framesize.html
new file mode 100644
index 0000000..6dbf94c
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-mp4-v-framesize.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("mp4", "v-128k-320x240-30fps-10kfr", "v-128k-640x480-30fps-10kfr", "Tests mp4 video-only frame size changes.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-a-bitrate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-a-bitrate-expected.txt
new file mode 100644
index 0000000..8b4beca
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-a-bitrate-expected.txt
@@ -0,0 +1,3 @@
+
+PASS Tests webm audio-only bitrate changes.
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-a-bitrate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-a-bitrate.html
new file mode 100644
index 0000000..6fe23d4
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-a-bitrate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("webm", "a-128k-44100Hz-1ch", "a-192k-44100Hz-1ch", "Tests webm audio-only bitrate changes.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-audio-bitrate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-audio-bitrate-expected.txt
new file mode 100644
index 0000000..b0e64d7
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-audio-bitrate-expected.txt
@@ -0,0 +1,3 @@
+
+PASS Tests webm audio bitrate changes in multiplexed content.
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-audio-bitrate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-audio-bitrate.html
new file mode 100644
index 0000000..f198c71
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-audio-bitrate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("webm", "av-384k-44100Hz-1ch-640x480-30fps-10kfr", "av-448k-44100Hz-1ch-640x480-30fps-10kfr", "Tests webm audio bitrate changes in multiplexed content.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-framesize-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-framesize-expected.txt
new file mode 100644
index 0000000..c74e0b1
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-framesize-expected.txt
@@ -0,0 +1,3 @@
+
+PASS Tests webm frame size changes in multiplexed content.
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-framesize.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-framesize.html
new file mode 100644
index 0000000..81c33f1
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-framesize.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("webm", "av-384k-44100Hz-1ch-320x240-30fps-10kfr", "av-384k-44100Hz-1ch-640x480-30fps-10kfr", "Tests webm frame size changes in multiplexed content.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-video-bitrate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-video-bitrate-expected.txt
new file mode 100644
index 0000000..6f78945
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-video-bitrate-expected.txt
@@ -0,0 +1,3 @@
+
+PASS Tests webm video bitrate changes in multiplexed content.
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-video-bitrate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-video-bitrate.html
new file mode 100644
index 0000000..71178bc
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-av-video-bitrate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("webm", "av-384k-44100Hz-1ch-640x480-30fps-10kfr", "av-640k-44100Hz-1ch-640x480-30fps-10kfr", "Tests webm video bitrate changes in multiplexed content.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-bitrate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-bitrate-expected.txt
new file mode 100644
index 0000000..82c70bd
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-bitrate-expected.txt
@@ -0,0 +1,3 @@
+
+PASS Tests webm video-only bitrate changes.
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-bitrate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-bitrate.html
new file mode 100644
index 0000000..b277ab5
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-bitrate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("webm", "v-128k-320x240-30fps-10kfr", "v-256k-320x240-30fps-10kfr", "Tests webm video-only bitrate changes.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framerate-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framerate-expected.txt
new file mode 100644
index 0000000..056af61
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framerate-expected.txt
@@ -0,0 +1,3 @@
+
+PASS Tests webm video-only frame rate changes.
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framerate.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framerate.html
new file mode 100644
index 0000000..48dffd9
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framerate.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("webm", "v-128k-320x240-24fps-8kfr", "v-128k-320x240-30fps-10kfr", "Tests webm video-only frame rate changes.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framesize-expected.txt b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framesize-expected.txt
new file mode 100644
index 0000000..5a60504
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framesize-expected.txt
@@ -0,0 +1,3 @@
+
+PASS Tests webm video-only frame size changes.
+
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framesize.html b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framesize.html
new file mode 100644
index 0000000..4aee0d1
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-change-webm-v-framesize.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("webm", "v-128k-320x240-30fps-10kfr", "v-128k-640x480-30fps-10kfr", "Tests webm video-only frame size changes.");
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-config-changes.js b/LayoutTests/http/tests/media/media-source/mediasource-config-changes.js
new file mode 100644
index 0000000..7c17ccf
--- /dev/null
+++ b/LayoutTests/http/tests/media/media-source/mediasource-config-changes.js
@@ -0,0 +1,78 @@
+function fetchManifestAndData(test, manifestFilename, callback)
+{
+ var baseURL = '/media/resources/media-source/';
+ var manifestURL = baseURL + manifestFilename;
+ MediaSourceUtil.loadTextData(test, manifestURL, function(manifestText)
+ {
+ var manifest = JSON.parse(manifestText);
+
+ assert_true(MediaSource.isTypeSupported(manifest.type), manifest.type + " is supported.");
+
+ var mediaURL = baseURL + manifest.url;
+ MediaSourceUtil.loadBinaryData(test, mediaURL, function(mediaData)
+ {
+ callback(manifest.type, mediaData);
+ });
+ });
+}
+
+function appendBuffer(test, sourceBuffer, data)
+{
+ test.expectEvent(sourceBuffer, "update");
+ test.expectEvent(sourceBuffer, "updateend");
+ sourceBuffer.appendBuffer(data);
+}
+
+function mediaSourceConfigChangeTest(directory, idA, idB, description)
+{
+ var manifestFilenameA = directory + "/test-" + idA + "-manifest.json";
+ var manifestFilenameB = directory + "/test-" + idB + "-manifest.json";
+ mediasource_test(function(test, mediaElement, mediaSource)
+ {
+ mediaElement.pause();
+ test.failOnEvent(mediaElement, 'error');
+ test.endOnEvent(mediaElement, 'ended');
+
+ fetchManifestAndData(test, manifestFilenameA, function(typeA, dataA)
+ {
+ fetchManifestAndData(test, manifestFilenameB, function(typeB, dataB)
+ {
+ assert_equals(typeA, typeB, "Media format types match");
+
+ var sourceBuffer = mediaSource.addSourceBuffer(typeA);
+
+ appendBuffer(test, sourceBuffer, dataA);
+
+ test.waitForExpectedEvents(function()
+ {
+ // Add the second buffer starting at 0.5 second.
+ sourceBuffer.timestampOffset = 0.5;
+ appendBuffer(test, sourceBuffer, dataB);
+ });
+
+ test.waitForExpectedEvents(function()
+ {
+ // Add the first buffer starting at 1 second.
+ sourceBuffer.timestampOffset = 1;
+ appendBuffer(test, sourceBuffer, dataA);
+ });
+
+ test.waitForExpectedEvents(function()
+ {
+ // Add the second buffer starting at 1.5 second.
+ sourceBuffer.timestampOffset = 1.5;
+ appendBuffer(test, sourceBuffer, dataB);
+ });
+
+ test.waitForExpectedEvents(function()
+ {
+ // Truncate the presentation to a duration of 2 seconds.
+ mediaSource.duration = 2;
+ mediaSource.endOfStream();
+
+ mediaElement.play();
+ });
+ });
+ });
+ }, description, { timeout: 10000 } );
+};
diff --git a/LayoutTests/http/tests/media/media-source/mediasource-util.js b/LayoutTests/http/tests/media/media-source/mediasource-util.js
index 90a8f4d..907d187 100644
--- a/LayoutTests/http/tests/media/media-source/mediasource-util.js
+++ b/LayoutTests/http/tests/media/media-source/mediasource-util.js
@@ -82,7 +82,7 @@
if (isBinary) {
response = new Uint8Array(response);
}
- callback(new Uint8Array(response));
+ callback(response);
});
request.onerror = test.step_func(function(event)
{
@@ -172,8 +172,9 @@
};
window['MediaSourceUtil'] = MediaSourceUtil;
- window['mediasource_test'] = function(testFunction, description)
+ window['mediasource_test'] = function(testFunction, description, options)
{
+ options = options || {};
return async_test(function(test) {
var mediaTag = document.createElement("video");
document.body.appendChild(mediaTag);
@@ -196,7 +197,7 @@
{
testFunction(test, mediaTag, mediaSource);
});
- }, description);
+ }, description, options);
};
})(window);
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/generate-config-change-tests.py b/LayoutTests/http/tests/media/resources/media-source/generate-config-change-tests.py
new file mode 100755
index 0000000..4edb925
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/generate-config-change-tests.py
@@ -0,0 +1,226 @@
+#!/usr/bin/python
+# Copyright (C) 2013 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""
+This is a script that generates the content and HTML files for Media Source
+codec config change LayoutTests.
+"""
+import json
+import os
+
+DURATION = 2
+MEDIA_FORMATS = ['webm', 'mp4']
+ENCODE_SETTINGS = [
+ ## Video-only files
+ # Frame rate changes
+ {'fs': '320x240', 'fr': 24, 'kfr': 8, 'c': '#ff0000', 'vbr': 128, 'abr': 0, 'asr': 0, 'ach': 0, 'afreq': 0},
+ {'fs': '320x240', 'fr': 30, 'kfr': 10, 'c': '#ff0000', 'vbr': 128, 'abr': 0, 'asr': 0, 'ach': 0, 'afreq': 0},
+ # Frame size change
+ {'fs': '640x480', 'fr': 30, 'kfr': 10, 'c': '#00ff00', 'vbr': 128, 'abr': 0, 'asr': 0, 'ach': 0, 'afreq': 0},
+ # Bitrate change
+ {'fs': '320x240', 'fr': 30, 'kfr': 10, 'c': '#ff00ff', 'vbr': 256, 'abr': 0, 'asr': 0, 'ach': 0, 'afreq': 0},
+
+ ## Audio-only files
+ # Bitrate/Codebook changes
+ {'fs': '0x0', 'fr': 0, 'kfr': 0, 'c': '#000000', 'vbr': 0, 'abr': 128, 'asr': 44100, 'ach': 1, 'afreq': 2000},
+ {'fs': '0x0', 'fr': 0, 'kfr': 0, 'c': '#000000', 'vbr': 0, 'abr': 192, 'asr': 44100, 'ach': 1, 'afreq': 4000},
+
+ ## Audio-Video files
+ # Frame size change.
+ {'fs': '320x240', 'fr': 30, 'kfr': 10, 'c': '#ff0000', 'vbr': 256, 'abr': 128, 'asr': 44100, 'ach': 1, 'afreq': 2000},
+ {'fs': '640x480', 'fr': 30, 'kfr': 10, 'c': '#00ff00', 'vbr': 256, 'abr': 128, 'asr': 44100, 'ach': 1, 'afreq': 2000},
+ # Audio bitrate change.
+ {'fs': '640x480', 'fr': 30, 'kfr': 10, 'c': '#00ff00', 'vbr': 256, 'abr': 192, 'asr': 44100, 'ach': 1, 'afreq': 4000},
+ # Video bitrate change.
+ {'fs': '640x480', 'fr': 30, 'kfr': 10, 'c': '#00ffff', 'vbr': 512, 'abr': 128, 'asr': 44100, 'ach': 1, 'afreq': 2000},
+]
+
+CONFIG_CHANGE_TESTS = [
+ ["v-framerate", 0, 1, "Tests %s video-only frame rate changes."],
+ ["v-framesize", 1, 2, "Tests %s video-only frame size changes."],
+ ["v-bitrate", 1, 3, "Tests %s video-only bitrate changes."],
+ ["a-bitrate", 4, 5, "Tests %s audio-only bitrate changes."],
+ ["av-framesize", 6, 7, "Tests %s frame size changes in multiplexed content."],
+ ["av-audio-bitrate", 7, 8, "Tests %s audio bitrate changes in multiplexed content."],
+ ["av-video-bitrate", 7, 9, "Tests %s video bitrate changes in multiplexed content."]
+]
+
+CODEC_INFO = {
+ "mp4": {"audio": "mp4a.40.2", "video": "avc1.4D4001"},
+ "webm": {"audio": "vorbis", "video": "vp8"}
+}
+
+HTML_TEMPLATE = """<!DOCTYPE html>
+<html>
+ <head>
+ <script src="/w3c/resources/testharness.js"></script>
+ <script src="/w3c/resources/testharnessreport.js"></script>
+ <script src="mediasource-util.js"></script>
+ <script src="mediasource-config-changes.js"></script>
+ <link rel="stylesheet" href="/w3c/resources/testharness.css">
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ mediaSourceConfigChangeTest("%(media_format)s", "%(idA)s", "%(idB)s", "%(description)s");
+ </script>
+ </body>
+</html>
+"""
+
+def run(cmd_line):
+ os.system(" ".join(cmd_line))
+
+def generate_manifest(filename, media_filename, media_format, has_audio, has_video):
+ major_type = "audio"
+ if has_video:
+ major_type = "video"
+
+ codecs = []
+ if has_video:
+ codecs.append(CODEC_INFO[media_format]["video"])
+
+ if has_audio:
+ codecs.append(CODEC_INFO[media_format]["audio"])
+
+ mimetype = "%s/%s;codecs=\"%s\"" % (major_type, media_format, ",".join(codecs))
+
+ manifest = { 'url': media_filename, 'type': mimetype}
+
+ f = open(filename, "wb")
+ f.write(json.dumps(manifest, indent=4, separators=(',', ': ')))
+ f.close()
+
+def generate_test_html(media_format, config_change_tests, encoding_ids):
+ for test_info in config_change_tests:
+ filename = "../../media-source/mediasource-config-change-%s-%s.html" % (media_format, test_info[0])
+ html = HTML_TEMPLATE % {'media_format': media_format,
+ 'idA': encoding_ids[test_info[1]],
+ 'idB': encoding_ids[test_info[2]],
+ 'description': test_info[3] % (media_format)}
+ f = open(filename, "wb")
+ f.write(html)
+ f.close()
+
+
+def main():
+ encoding_ids = []
+
+ for media_format in MEDIA_FORMATS:
+ run(["mkdir ", media_format])
+
+ for settings in ENCODE_SETTINGS:
+ video_bitrate = settings['vbr']
+ has_video = (video_bitrate > 0)
+
+ audio_bitrate = settings['abr']
+ has_audio = (audio_bitrate > 0)
+ bitrate = video_bitrate + audio_bitrate
+
+ frame_size = settings['fs']
+ frame_rate = settings['fr']
+ keyframe_rate = settings['kfr']
+ color = settings['c']
+
+ sample_rate = settings['asr']
+ channels = settings['ach']
+ frequency = settings['afreq']
+
+ cmdline = ["ffmpeg", "-y"]
+
+ id_prefix = ""
+ id_params = ""
+ if has_audio:
+ id_prefix += "a"
+ id_params += "-%sHz-%sch" % (sample_rate, channels)
+
+ channel_layout = "FC"
+ sin_func = "sin(%s*2*PI*t)" % frequency
+ func = sin_func
+ if channels == 2:
+ channel_layout += "|BC"
+ func += "|" + sin_func
+
+ cmdline += ["-f", "lavfi", "-i", "aevalsrc=\"%s:s=%s:c=%s:d=%s\"" % (func, sample_rate, channel_layout, DURATION)]
+
+ if has_video:
+ id_prefix += "v"
+ id_params += "-%s-%sfps-%skfr" % (frame_size, frame_rate, keyframe_rate)
+
+ cmdline += ["-f", "lavfi", "-i", "color=%s:duration=%s:size=%s:rate=%s" % (color, DURATION, frame_size, frame_rate)]
+
+ if has_audio:
+ cmdline += ["-b:a", "%sk" % audio_bitrate]
+
+ if has_video:
+ cmdline += ["-b:v", "%sk" % video_bitrate]
+ cmdline += ["-keyint_min", "%s" % keyframe_rate]
+ cmdline += ["-g", "%s" % keyframe_rate]
+
+
+ textOverlayInfo = "'drawtext=fontfile=Mono:fontsize=32:text=Time\\\\:\\\\ %{pts}"
+ textOverlayInfo += ",drawtext=fontfile=Mono:fontsize=32:y=32:text=Size\\\\:\\\\ %s" % (frame_size)
+ textOverlayInfo += ",drawtext=fontfile=Mono:fontsize=32:y=64:text=Bitrate\\\\:\\\\ %s" % (bitrate)
+ textOverlayInfo += ",drawtext=fontfile=Mono:fontsize=32:y=96:text=FrameRate\\\\:\\\\ %s" % (frame_rate)
+ textOverlayInfo += ",drawtext=fontfile=Mono:fontsize=32:y=128:text=KeyFrameRate\\\\:\\\\ %s" % (keyframe_rate)
+
+ if has_audio:
+ textOverlayInfo += ",drawtext=fontfile=Mono:fontsize=32:y=160:text=SampleRate\\\\:\\\\ %s" % (sample_rate)
+ textOverlayInfo += ",drawtext=fontfile=Mono:fontsize=32:y=192:text=Channels\\\\:\\\\ %s" % (channels)
+
+ textOverlayInfo += "'"
+ cmdline += ["-vf", textOverlayInfo]
+
+ encoding_id = "%s-%sk%s" % (id_prefix, bitrate, id_params)
+
+ if len(encoding_ids) < len(ENCODE_SETTINGS):
+ encoding_ids.append(encoding_id)
+
+ filename_base = "%s/test-%s" % (media_format, encoding_id)
+ media_filename = filename_base + "." + media_format
+ manifest_filename = filename_base + "-manifest.json"
+
+ cmdline.append(media_filename)
+ run(cmdline)
+
+ # Remux file so it conforms to MSE bytestream requirements.
+ if media_format == "webm":
+ tmp_filename = media_filename + ".tmp"
+ run(["mse_webm_remuxer", media_filename, tmp_filename])
+ run(["mv", tmp_filename, media_filename])
+ elif media_format == "mp4":
+ run(["MP4Box", "-dash", "250", "-rap", media_filename])
+ run(["mv", filename_base + "_dash.mp4", media_filename])
+ run(["rm", filename_base + "_dash.mpd"])
+
+ generate_manifest(manifest_filename, media_filename, media_format, has_audio, has_video)
+ generate_test_html(media_format, CONFIG_CHANGE_TESTS, encoding_ids)
+
+if '__main__' == __name__:
+ main()
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json
new file mode 100644
index 0000000..f3caa46
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-a-128k-44100Hz-1ch.mp4",
+ "type": "audio/mp4;codecs=\"mp4a.40.2\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json
new file mode 100644
index 0000000..41a6f33
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-a-192k-44100Hz-1ch.mp4",
+ "type": "audio/mp4;codecs=\"mp4a.40.2\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..7731e31
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4",
+ "type": "video/mp4;codecs=\"avc1.4D4001,mp4a.40.2\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..78ded61
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
+ "type": "video/mp4;codecs=\"avc1.4D4001,mp4a.40.2\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..ba46349
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
+ "type": "video/mp4;codecs=\"avc1.4D4001,mp4a.40.2\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..24da9b4
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
+ "type": "video/mp4;codecs=\"avc1.4D4001,mp4a.40.2\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json
new file mode 100644
index 0000000..a31b6d0
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-v-128k-320x240-24fps-8kfr.mp4",
+ "type": "video/mp4;codecs=\"avc1.4D4001\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..3e02844
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-v-128k-320x240-30fps-10kfr.mp4",
+ "type": "video/mp4;codecs=\"avc1.4D4001\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..10c4f4b
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-v-128k-640x480-30fps-10kfr.mp4",
+ "type": "video/mp4;codecs=\"avc1.4D4001\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..42d3e1e
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "mp4/test-v-256k-320x240-30fps-10kfr.mp4",
+ "type": "video/mp4;codecs=\"avc1.4D4001\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json
new file mode 100644
index 0000000..524da81
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-a-128k-44100Hz-1ch.webm",
+ "type": "audio/webm;codecs=\"vorbis\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json
new file mode 100644
index 0000000..7f2fa1e
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-a-192k-44100Hz-1ch.webm",
+ "type": "audio/webm;codecs=\"vorbis\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..af9f07a
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm",
+ "type": "video/webm;codecs=\"vp8,vorbis\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..f7ec86b
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm",
+ "type": "video/webm;codecs=\"vp8,vorbis\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..96a59db
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm",
+ "type": "video/webm;codecs=\"vp8,vorbis\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..86723b3
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm",
+ "type": "video/webm;codecs=\"vp8,vorbis\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json
new file mode 100644
index 0000000..00e103a
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-v-128k-320x240-24fps-8kfr.webm",
+ "type": "video/webm;codecs=\"vp8\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..fdeeb40
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-v-128k-320x240-30fps-10kfr.webm",
+ "type": "video/webm;codecs=\"vp8\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..4e30460
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-v-128k-640x480-30fps-10kfr.webm",
+ "type": "video/webm;codecs=\"vp8\""
+}
\ No newline at end of file
diff --git a/LayoutTests/http/tests/media/resources/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json b/LayoutTests/http/tests/media/resources/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json
new file mode 100644
index 0000000..3470674
--- /dev/null
+++ b/LayoutTests/http/tests/media/resources/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json
@@ -0,0 +1,4 @@
+{
+ "url": "webm/test-v-256k-320x240-30fps-10kfr.webm",
+ "type": "video/webm;codecs=\"vp8\""
+}
\ No newline at end of file
