Skip to content

Commit

Permalink
Delete blink MSE config change tests to de-dup with upstream wpt.
Browse files Browse the repository at this point in the history 
The deletion is limited to the config-change tests to scope the work
of reconciling differences between blink and wpt. Non-config-change
tests are also present in both folders and may be de-dupped later on.

There were a few things to reconcile in the de-duping.
1) test js
2) files

For 1) The mediasource-config-changes.js differed slightly. This CL
brings in the more verbose comments from blink while keeping a few
additional asserts from wpt. I also opportunistically merged
comments/asserts in mediasource-play.html.

For 2) The upstream WebM config change files match.

The upstream MP4 config change files are slightly different, but just as
good. Their history all takes the form here
https://github.com/w3c/web-platform-tests/commits/master/media-source/mp4/test-a-128k-44100Hz-1ch.mp4

With the intial commit matching what we have and the later commit
remuxing to tweak movie-fragment relative addresssing.

FOR POSTERITY... DETAILS OF MOVEI-FRAG-RELATIVE-ADDRESSING:

MSE spec requires MovieFragBox (MOOF) must use movie-fragment relative addresssing
https://www.w3.org/TR/mse-byte-stream-format-isobmff/#movie-fragment-relative-addressing

1. First TRUN in a TrackFragmentBox (TRAF) has data-offset-present flag set (0x01)
-- AND EITHER--
2a. every TrackFragmentBox (in its header TFHD) has default-base-is-moof flag (0x20000)
2b. OR MovieFragBox (MOOF) contains a single TRAF and that box (in its TFHD) DOES NOT SET base-data-offset-present flag  (0x1)

DO WE ENFORCE THE ABOVE?

1. no. we allow both data_offset_present as well as not present
https://cs.chromium.org/chromium/src/media/formats/mp4/box_definitions.cc?rcl=b768fa508f99dd9a6a4cf7689d6ecccd1b66a5fb&l=1327

2a. no. we comment that we would like to, but that it would fail a lot of otherwise valid files
https://cs.chromium.org/chromium/src/media/formats/mp4/box_definitions.cc?rcl=105b3747c5eab20245f2e13834d33701f4ec2e50&l=1282

2b. yes, but we go further. we assert that all TFHDs DO NOT set base-data-offset-present (regardless of how many are in the given MOOF)
https://cs.chromium.org/chromium/src/media/formats/mp4/box_definitions.cc?rcl=242b78c83ad56851fb49f0f9e2001cdeecebd935&l=1283

Aaron's original files met req 1, but do not meet 2a (tfhd.flags == 0), but does meet 2b (flags are 0, and every MOOF has only one TRAF

Aarons updated files (in wpt) meet req 1, also meet 2a (tfhd.flags == 0x20000), also meets 2b (every MOOF has only one TRAF, none set base-data offset-present)

In short, either would be fine and the latest files go above and beyond the requirements.

Change-Id: I91fca61196d7d8d0bf0f45655269fdb48b3ce852
Reviewed-on: https://chromium-review.googlesource.com/862993
Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: Matthew Wolenetz <wolenetz@chromium.org>
Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#529870}
  • Loading branch information
@chcunningham @chromium-wpt-export-bot
chcunningham authored and chromium-wpt-export-bot committed Jan 17, 2018
1 parent d9fef5c commit 5d2bdef
Show file tree
Hide file tree
Showing 3 changed files with 241 additions and 6 deletions.
226 changes: 226 additions & 0 deletions media-source/generate-config-change-tests.py
View file
Original file line number Diff line number Diff line change
@@ -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()
9 changes: 6 additions & 3 deletions media-source/mediasource-config-changes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,24 @@ function mediaSourceConfigChangeTest(directory, idA, idB, description)
assert_false(sourceBuffer.updating, "updating");

// Truncate the presentation to a duration of 2 seconds.
// First, explicitly remove the media beyond 2 seconds.
sourceBuffer.remove(2, Infinity);

assert_true(sourceBuffer.updating, "updating");
assert_true(sourceBuffer.updating, "sourceBuffer.updating during range removal");
test.expectEvent(sourceBuffer, 'updatestart', 'sourceBuffer');
test.expectEvent(sourceBuffer, 'update', 'sourceBuffer');
test.expectEvent(sourceBuffer, 'updateend', 'sourceBuffer');
});

test.waitForExpectedEvents(function()
{
assert_false(sourceBuffer.updating, "updating");
assert_false(sourceBuffer.updating, "sourceBuffer.updating prior to duration reduction");
assert_greater_than(mediaSource.duration, 2, "duration");

// Truncate the presentation to a duration of 2 seconds.
// Complete the truncation of presentation to 2 second
// duration.
mediaSource.duration = 2;
assert_false(sourceBuffer.updating, "sourceBuffer.updating synchronously after duration reduction");

test.expectEvent(mediaElement, "durationchange");
});
Expand Down
12 changes: 9 additions & 3 deletions media-source/mediasource-play.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,20 @@
test.expectEvent(sourceBuffer, 'update', 'sourceBuffer');
test.expectEvent(sourceBuffer, 'updateend', 'sourceBuffer');

assert_false(sourceBuffer.updating, "sourceBuffer.updating");

sourceBuffer.appendBuffer(mediaData);

assert_true(sourceBuffer.updating, "sourceBuffer.updating");

test.waitForExpectedEvents(function()
{
assert_false(sourceBuffer.updating, "updating");
assert_false(sourceBuffer.updating, "sourceBuffer.updating");

sourceBuffer.remove(1, Infinity);
// Truncate the buffered media to about 1 second duration.
sourceBuffer.remove(1, +Infinity);

assert_true(sourceBuffer.updating, "updating");
assert_true(sourceBuffer.updating, "sourceBuffer.updating");
test.expectEvent(sourceBuffer, 'updatestart', 'sourceBuffer');
test.expectEvent(sourceBuffer, 'update', 'sourceBuffer');
test.expectEvent(sourceBuffer, 'updateend', 'sourceBuffer');
Expand All @@ -38,6 +43,7 @@
assert_false(sourceBuffer.updating, "updating");
assert_greater_than(mediaSource.duration, 1, "duration");

// Complete truncation of duration to 1 second.
mediaSource.duration = 1;

test.expectEvent(mediaElement, "durationchange");
Expand Down

0 comments on commit 5d2bdef

Please sign in to comment.