<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168377] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168377">168377</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 13:19:31 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] make metadata cue attributes consistent
https://bugs.webkit.org/show_bug.cgi?id=132610
Reviewed by Jer Noble.
Source/WebCore:
No new tests, updated http/tests/media/track-in-band-hls-metadata.html.
* platform/mac/SerializedPlatformRepresentationMac.mm:
(WebCore::jsValueWithAVMetadataItemInContext): Don't include keys @dataTypeNamespace
or @pictureType, @dataType -> @type.
LayoutTests:
* http/tests/media/track-in-band-hls-metadata-expected.txt:
* http/tests/media/track-in-band-hls-metadata.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmediatrackinbandhlsmetadataexpectedtxt">trunk/LayoutTests/http/tests/media/track-in-band-hls-metadata-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediatrackinbandhlsmetadatahtml">trunk/LayoutTests/http/tests/media/track-in-band-hls-metadata.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMacmm">trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168376 => 168377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-06 20:10:01 UTC (rev 168376)
+++ trunk/LayoutTests/ChangeLog 2014-05-06 20:19:31 UTC (rev 168377)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-06 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] make metadata cue attributes consistent
+ https://bugs.webkit.org/show_bug.cgi?id=132610
+
+ Reviewed by Jer Noble.
+
+ * http/tests/media/track-in-band-hls-metadata-expected.txt:
+ * http/tests/media/track-in-band-hls-metadata.html:
+
</ins><span class="cx"> 2014-05-06 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out r167889
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediatrackinbandhlsmetadataexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/track-in-band-hls-metadata-expected.txt (168376 => 168377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/track-in-band-hls-metadata-expected.txt 2014-05-06 20:10:01 UTC (rev 168376)
+++ trunk/LayoutTests/http/tests/media/track-in-band-hls-metadata-expected.txt 2014-05-06 20:19:31 UTC (rev 168377)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> ** Set video.src, wait for media data to load
</span><ins>+RUN(video.src = 'http://127.0.0.1:8000/media/resources/hls/metadata/prog_index.m3u8')
+
</ins><span class="cx"> EVENT(addtrack)
</span><span class="cx"> EXPECTED (tracks.length == '1') OK
</span><span class="cx"> RUN(track = video.textTracks[0])
</span><span class="lines">@@ -12,6 +14,7 @@
</span><span class="cx"> EVENT(canplaythrough)
</span><span class="cx">
</span><span class="cx"> ** Start playback, wait for all cues to load
</span><ins>+RUN(video.play())
</ins><span class="cx"> EVENT(cuechange)
</span><span class="cx"> EVENT(cuechange)
</span><span class="cx"> EVENT(cuechange)
</span><span class="lines">@@ -20,34 +23,50 @@
</span><span class="cx"> EVENT(cuechange)
</span><span class="cx">
</span><span class="cx"> ** Validate cue data
</span><ins>+* 1
</ins><span class="cx"> EXPECTED (cue.type == 'org.id3') OK
</span><span class="cx"> EXPECTED (cue.data == 'null') OK
</span><del>-EXPECTED ('{"value":{"key":"TIT2","data":"Stream Counting"}}' == '{"value":{"key":"TIT2","data":"Stream Counting"}}') OK
</del><ins>+EXPECTED (cue.value.key == '"TIT2"') OK
+EXPECTED (cue.value.data == '"Stream Counting"') OK
</ins><span class="cx">
</span><ins>+* 2
</ins><span class="cx"> EXPECTED (cue.type == 'org.id3') OK
</span><span class="cx"> EXPECTED (cue.data == 'null') OK
</span><del>-EXPECTED ('{"value":{"key":"TPE1","data":"Andy"}}' == '{"value":{"key":"TPE1","data":"Andy"}}') OK
</del><ins>+EXPECTED (cue.value.key == '"TPE1"') OK
+EXPECTED (cue.value.data == '"Andy"') OK
</ins><span class="cx">
</span><ins>+* 3
</ins><span class="cx"> EXPECTED (cue.type == 'org.id3') OK
</span><span class="cx"> EXPECTED (cue.data == 'null') OK
</span><del>-EXPECTED ('{"value":{"key":"TALB","data":"Greatest Hits"}}' == '{"value":{"key":"TALB","data":"Greatest Hits"}}') OK
</del><ins>+EXPECTED (cue.value.key == '"TALB"') OK
+EXPECTED (cue.value.data == '"Greatest Hits"') OK
</ins><span class="cx">
</span><ins>+* 4
</ins><span class="cx"> EXPECTED (cue.type == 'org.id3') OK
</span><span class="cx"> EXPECTED (cue.data == 'null') OK
</span><del>-EXPECTED ('{"value":{"data":{},"info":"Our Hero","key":"GEOB","name":"abe.png","type":"image/png"}}' == '{"value":{"data":{},"info":"Our Hero","key":"GEOB","name":"abe.png","type":"image/png"}}') OK
</del><ins>+EXPECTED (cue.value.key == '"GEOB"') OK
+EXPECTED (cue.value.data == '{}') OK
+EXPECTED (cue.value.type == '"image/png"') OK
+EXPECTED (cue.value.info == '"Our Hero"') OK
+EXPECTED (cue.value.name == '"abe.png"') OK
</ins><span class="cx">
</span><ins>+* 5
</ins><span class="cx"> EXPECTED (cue.type == 'org.id3') OK
</span><span class="cx"> EXPECTED (cue.data == 'null') OK
</span><del>-EXPECTED ('{"value":{"data":{},"key":"APIC","type":"image/png","dataType":"Movie/video screen capture"}}' == '{"value":{"data":{},"key":"APIC","type":"image/png","dataType":"Movie/video screen capture"}}') OK
</del><ins>+EXPECTED (cue.value.key == '"APIC"') OK
+EXPECTED (cue.value.data == '{}') OK
+EXPECTED (cue.value.type == '"image/png"') OK
</ins><span class="cx">
</span><ins>+* 6
</ins><span class="cx"> EXPECTED (cue.type == 'org.id3') OK
</span><span class="cx"> EXPECTED (cue.data == 'null') OK
</span><del>-EXPECTED ('{"value":{"key":"TXXX","data":"Text Blob"}}' == '{"value":{"key":"TXXX","data":"Text Blob"}}') OK
</del><ins>+EXPECTED (cue.value.key == '"TXXX"') OK
+EXPECTED (cue.value.data == '"Text Blob"') OK
</ins><span class="cx">
</span><span class="cx"> ** Extract images from cue data, validate by setting img.src
</span><span class="cx"> RUN(cueImageData = track.cues[3].value.data)
</span><span class="cx"> EXPECTED (cueImageData instanceof ArrayBuffer == 'true') OK
</span><del>-RUN(blobUrl = URL.createObjectURL(new Blob([cueImageData], { type: 'image/png' } )))
</del><ins>+RUN(blobUrl = URL.createObjectURL(new Blob([cueImageData], { type: 'image/png' })))
</ins><span class="cx"> RUN(imageElement.src = blobUrl)
</span><span class="cx"> EVENT(load)
</span><span class="cx"> EXPECTED (imageElement.width == '76') OK
</span><span class="lines">@@ -55,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> RUN(cueImageData = track.cues[4].value.data)
</span><span class="cx"> EXPECTED (cueImageData instanceof ArrayBuffer == 'true') OK
</span><del>-RUN(blobUrl = URL.createObjectURL(new Blob([cueImageData], { type: 'image/png' } )))
</del><ins>+RUN(blobUrl = URL.createObjectURL(new Blob([cueImageData], { type: 'image/png' })))
</ins><span class="cx"> RUN(imageElement.src = blobUrl)
</span><span class="cx"> EVENT(load)
</span><span class="cx"> EXPECTED (imageElement.width == '100') OK
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediatrackinbandhlsmetadatahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/track-in-band-hls-metadata.html (168376 => 168377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/track-in-band-hls-metadata.html 2014-05-06 20:10:01 UTC (rev 168376)
+++ trunk/LayoutTests/http/tests/media/track-in-band-hls-metadata.html 2014-05-06 20:19:31 UTC (rev 168377)
</span><span class="lines">@@ -10,13 +10,13 @@
</span><span class="cx"> var track;
</span><span class="cx"> var cuechangeCount = 0;
</span><span class="cx"> var loadCount = 0;
</span><del>- var cueJSON = [
- '{"value":{"key":"TIT2","data":"Stream Counting"}}',
- '{"value":{"key":"TPE1","data":"Andy"}}',
- '{"value":{"key":"TALB","data":"Greatest Hits"}}',
- '{"value":{"data":{},"info":"Our Hero","key":"GEOB","name":"abe.png","type":"image/png"}}',
- '{"value":{"data":{},"key":"APIC","type":"image/png","dataType":"Movie/video screen capture"}}',
- '{"value":{"key":"TXXX","data":"Text Blob"}}'
</del><ins>+ var cueData = [
+ {"key" : "TIT2", "data" : "Stream Counting"},
+ {"key" : "TPE1", "data" : "Andy"},
+ {"key" : "TALB", "data" : "Greatest Hits"},
+ {"key" : "GEOB", "data" : {}, "type" : "image/png", "info" : "Our Hero", "name" : "abe.png"},
+ {"key" : "APIC", "data" : {}, "type" : "image/png"},
+ {"key" : "TXXX", "data" : "Text Blob"},
</ins><span class="cx"> ];
</span><span class="cx"> var imageSizes = [ [76, 103], [100, 100] ];
</span><span class="cx">
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> run("track.mode = 'hidden'");
</span><span class="cx"> track.addEventListener('cuechange', cuechange, true);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function imageLoad()
</span><span class="cx"> {
</span><span class="cx"> testExpected("imageElement.width", imageSizes[loadCount][0]);
</span><span class="lines">@@ -49,30 +49,53 @@
</span><span class="cx"> {
</span><span class="cx"> run("cueImageData = track.cues[" + cueIndex + "].value.data");
</span><span class="cx"> testExpected("cueImageData instanceof ArrayBuffer", true);
</span><del>- run("blobUrl = URL.createObjectURL(new Blob([cueImageData], { type: 'image/png' } ))");
</del><ins>+ run("blobUrl = URL.createObjectURL(new Blob([cueImageData], { type: 'image/png' }))");
</ins><span class="cx"> imageElement = document.querySelector("#photo");
</span><span class="cx"> run("imageElement.src = blobUrl");
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ function compareCues(observed, expected)
+ {
+ // Make a mutable copy of the cue so we can remove attributes as they are processed.
+ observed = JSON.parse(JSON.stringify(observed));
+ for (property in expected) {
+ observedValue = observed[property];
+ expectedValue = expected[property];
+ cue.value[property] = observedValue;
+
+ observedValue = JSON.stringify(observedValue);
+ expectedValue = JSON.stringify(expectedValue);
+ reportExpected(observedValue == expectedValue, "cue.value." + property, "==", expectedValue, observedValue);
+ delete observed[property];
+ }
+
+ for (property in observed) {
+ observedName = property;
+ observedValue = observed[property];
+ logResult(Failed, "Error: unexpected cue property <em>cue.value." + observedName + "</em> = <em>'" + observedValue + "'</em> ");
+ }
+ }
+
</ins><span class="cx"> function cuechange(event)
</span><span class="cx"> {
</span><span class="cx"> consoleWrite("EVENT(cuechange)");
</span><span class="cx"> if (++cuechangeCount != 6)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- consoleWrite("<br><i>** Validate cue data</i>");
</del><ins>+ consoleWrite("<br><em>** Validate cue data</em>");
</ins><span class="cx"> track.removeEventListener("cuechange", cuechange, true);
</span><span class="cx"> video.pause();
</span><del>-
</del><ins>+
</ins><span class="cx"> for (var i = 0; i < 6; i++) {
</span><ins>+ consoleWrite("<em>* " + (i + 1) + "</em>");
</ins><span class="cx"> cue = track.cues[i];
</span><span class="cx"> testExpected("cue.type", "org.id3");
</span><span class="cx"> testExpected("cue.data", null);
</span><del>- testExpected("'" + JSON.stringify(cue) + "'", cueJSON[i]);
</del><ins>+ compareCues(cue.value, cueData[i]);
</ins><span class="cx"> consoleWrite("");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- consoleWrite("<i>** Extract images from cue data, validate by setting img.src</i>");
</del><ins>+ consoleWrite("<em>** Extract images from cue data, validate by setting img.src</em>");
</ins><span class="cx"> imageElement = document.querySelector("#photo");
</span><span class="cx"> waitForEvent('load', imageLoad, false, false, imageElement)
</span><span class="cx"> testImage(3);
</span><span class="lines">@@ -80,16 +103,17 @@
</span><span class="cx">
</span><span class="cx"> function canplaythrough()
</span><span class="cx"> {
</span><del>- consoleWrite("<br><i>** Start playback, wait for all cues to load</i>");
- video.play();
</del><ins>+ consoleWrite("<br><em>** Start playback, wait for all cues to load</em>");
+ run("video.play()");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function start()
</span><span class="cx"> {
</span><del>- consoleWrite("<br><i>** Set video.src, wait for media data to load</i>");
</del><ins>+ consoleWrite("<br><em>** Set video.src, wait for media data to load</em>");
</ins><span class="cx"> findMediaElement();
</span><del>- video.src = "http://127.0.0.1:8000/media/resources/hls/metadata/prog_index.m3u8";
</del><ins>+ run("video.src = 'http://127.0.0.1:8000/media/resources/hls/metadata/prog_index.m3u8'");
</ins><span class="cx">
</span><ins>+ consoleWrite("");
</ins><span class="cx"> waitForEvent("canplaythrough", canplaythrough);
</span><span class="cx"> waitForEvent('addtrack', addtrack, false, false, video.textTracks);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168376 => 168377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-06 20:10:01 UTC (rev 168376)
+++ trunk/Source/WebCore/ChangeLog 2014-05-06 20:19:31 UTC (rev 168377)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-06 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] make metadata cue attributes consistent
+ https://bugs.webkit.org/show_bug.cgi?id=132610
+
+ Reviewed by Jer Noble.
+
+ No new tests, updated http/tests/media/track-in-band-hls-metadata.html.
+
+ * platform/mac/SerializedPlatformRepresentationMac.mm:
+ (WebCore::jsValueWithAVMetadataItemInContext): Don't include keys @dataTypeNamespace
+ or @pictureType, @dataType -> @type.
+
</ins><span class="cx"> 2014-05-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> "Flash of content without image" when pasting a raw image from the pasteboard
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSerializedPlatformRepresentationMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm (168376 => 168377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm 2014-05-06 20:10:01 UTC (rev 168376)
+++ trunk/Source/WebCore/platform/mac/SerializedPlatformRepresentationMac.mm 2014-05-06 20:19:31 UTC (rev 168377)
</span><span class="lines">@@ -216,9 +216,17 @@
</span><span class="cx">
</span><span class="cx"> if ([key isEqualToString:@"MIMEtype"])
</span><span class="cx"> keyString = @"type";
</span><del>- else if ([key isEqualToString:@"info"] && [value isKindOfClass:[NSString class]] && ![value length]) {
- // An "info" key is added to all TXXX, GEOB, and APIC items but the value may be empty.
</del><ins>+ else if ([key isEqualToString:@"dataTypeNamespace"] || [key isEqualToString:@"pictureType"])
</ins><span class="cx"> continue;
</span><ins>+ else if ([key isEqualToString:@"dataType"]) {
+ id dataTypeNamespace = [extras objectForKey:@"dataTypeNamespace"];
+ if (!dataTypeNamespace || ![dataTypeNamespace isKindOfClass:[NSString class]] || ![dataTypeNamespace isEqualToString:@"org.iana.media-type"])
+ continue;
+ keyString = @"type";
+ } else if ([value isKindOfClass:[NSString class]]) {
+ if (![value length])
+ continue;
+ keyString = [key lowercaseString];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [dictionary setObject:value forKey:keyString];
</span></span></pre>
</div>
</div>
</body>
</html>