<!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>[167440] 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/167440">167440</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-04-17 10:54:59 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] Multiple initialization segments with same codecs in tracks fail validation.
https://bugs.webkit.org/show_bug.cgi?id=131768
Source/WebCore:
Additional initialization segments added to the same SourceBuffer with the same
codec values will fail validation. Update the validation check to add the correct
codec information for the initial segment, and check against the correct codecs during
the validation step.
Additionally, after validation, if successful update the Audio, Video, and TextTracks
for the SourceBuffer with the updated initialization segment information.
Reviewed by Eric Carlson.
Test: media/media-source/media-source-multiple-initialization-segments.html
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::appendBufferTimerFired): m_source may have been cleared
as a result of the append, so check it before using.
(WebCore::SourceBuffer::sourceBufferPrivateDidEndStream): Call streamEndedWithError
instead of endOfStream as the latter is safe to call within an update.
(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment): Ditto.
Update the track lists if validation succeeds.
(WebCore::SourceBuffer::validateInitializationSegment): Switch the audio and video
codec checks.
Add the ability for Audio, Video, and InbandTextTracks to replace their private tracks:
* html/track/AudioTrack.cpp:
(WebCore::AudioTrack::AudioTrack): Call updateKindFromPrivate().
(WebCore::AudioTrack::setPrivate):
(WebCore::AudioTrack::updateKindFromPrivate): Split out from constructor.
* html/track/AudioTrack.h:
* html/track/InbandTextTrack.cpp:
(WebCore::InbandTextTrack::InbandTextTrack): Call updateKindFromPrivate().
(WebCore::InbandTextTrack::setPrivate):
(WebCore::InbandTextTrack::setMode): Split up into setModeInternal().
(WebCore::InbandTextTrack::setModeInternal): Broke out from setMode().
(WebCore::InbandTextTrack::updateKindFromPrivate): Split out from constructor.
* html/track/InbandTextTrack.h:
* html/track/TextTrack.h:
(WebCore::TextTrack::isInband): Added, returns false.
* html/track/VideoTrack.cpp:
(WebCore::VideoTrack::VideoTrack): Call updateKindFromPrivate().
(WebCore::VideoTrack::setPrivate):
(WebCore::VideoTrack::updateKindFromPrivate): Split out from constructor.
* html/track/VideoTrack.h:
LayoutTests:
Reviewed by Eric Carlson.
* media/media-source/media-source-multiple-initialization-segments-expected.txt: Added.
* media/media-source/media-source-multiple-initialization-segments.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackAudioTrackcpp">trunk/Source/WebCore/html/track/AudioTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackAudioTrackh">trunk/Source/WebCore/html/track/AudioTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandTextTrackcpp">trunk/Source/WebCore/html/track/InbandTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackInbandTextTrackh">trunk/Source/WebCore/html/track/InbandTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackh">trunk/Source/WebCore/html/track/TextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVideoTrackcpp">trunk/Source/WebCore/html/track/VideoTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVideoTrackh">trunk/Source/WebCore/html/track/VideoTrack.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourcemultipleinitializationsegmentsexpectedtxt">trunk/LayoutTests/media/media-source/media-source-multiple-initialization-segments-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediasourcemediasourcemultipleinitializationsegmentshtml">trunk/LayoutTests/media/media-source/media-source-multiple-initialization-segments.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/LayoutTests/ChangeLog 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-16 Jer Noble <jer.noble@apple.com>
+
+ [MSE] Multiple initialization segments with same codecs in tracks fail validation.
+ https://bugs.webkit.org/show_bug.cgi?id=131768
+
+ Reviewed by Eric Carlson.
+
+ * media/media-source/media-source-multiple-initialization-segments-expected.txt: Added.
+ * media/media-source/media-source-multiple-initialization-segments.html: Added.
+
</ins><span class="cx"> 2014-04-17 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Column sets below spanners don't repaint properly.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourcemultipleinitializationsegmentsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-multiple-initialization-segments-expected.txt (0 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-multiple-initialization-segments-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-multiple-initialization-segments-expected.txt 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+
+RUN(video.src = URL.createObjectURL(source))
+EVENT(sourceopen)
+RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock"))
+RUN(sourceBuffer.appendBuffer(initSegment))
+EVENT(updateend)
+Test that a replacement initialization segment containing a track with the same codec but a different trackID succeeds.
+RUN(sourceBuffer.appendBuffer(initSegment))
+EVENT(updateend)
+Test that a replacement initialization segment containing a track with a different codec but the same trackID fails.
+RUN(sourceBuffer.appendBuffer(initSegment))
+EVENT(sourceended)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediasourcemediasourcemultipleinitializationsegmentshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-source/media-source-multiple-initialization-segments.html (0 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-source/media-source-multiple-initialization-segments.html (rev 0)
+++ trunk/LayoutTests/media/media-source/media-source-multiple-initialization-segments.html 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>mock-media-source</title>
+ <script src="mock-media-source.js"></script>
+ <script src="../video-test.js"></script>
+ <script>
+ var source;
+ var sourceBuffer;
+ var initSegment;
+
+ if (window.internals)
+ internals.initializeMockMediaSource();
+
+ function runTest() {
+ findMediaElement();
+
+ source = new MediaSource();
+ waitForEventOn(source, 'sourceopen', sourceOpen);
+ waitForEventOn(source, 'sourceended', sourceEnded);
+ run('video.src = URL.createObjectURL(source)');
+ }
+
+ function sourceOpen() {
+ run('sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock")');
+
+ waitForEventOn(sourceBuffer, 'updateend', firstUpdate, false, true);
+ initSegment = makeAInit(100, [
+ makeATrack(1, 'mock', TRACK_KIND.VIDEO),
+ ]);
+ run('sourceBuffer.appendBuffer(initSegment)');
+ }
+
+ function sourceEnded() {
+ if (!expected)
+ logResult(Failed, 'Unexpected "sourceended" event');
+ endTest();
+ }
+
+ function firstUpdate() {
+ consoleWrite('Test that a replacement initialization segment containing a track with the same codec but a different trackID succeeds.')
+ waitForEventOn(sourceBuffer, 'updateend', secondUpdate, false, true);
+ initSegment = makeAInit(100, [
+ makeATrack(2, 'mock', TRACK_KIND.VIDEO),
+ ]);
+ run('sourceBuffer.appendBuffer(initSegment)');
+ }
+
+ function secondUpdate() {
+ consoleWrite('Test that a replacement initialization segment containing a track with a different codec but the same trackID fails.')
+ waitForEventOn(sourceBuffer, 'updateend', endTest, false, true);
+ expected = true;
+ initSegment = makeAInit(100, [
+ makeATrack(2, '!moc', TRACK_KIND.VIDEO),
+ ]);
+ run('sourceBuffer.appendBuffer(initSegment)');
+ }
+
+ </script>
+</head>
+<body onload="runTest()">
+ <video></video>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/ChangeLog 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-04-16 Jer Noble <jer.noble@apple.com>
+
+ [MSE] Multiple initialization segments with same codecs in tracks fail validation.
+ https://bugs.webkit.org/show_bug.cgi?id=131768
+
+ Additional initialization segments added to the same SourceBuffer with the same
+ codec values will fail validation. Update the validation check to add the correct
+ codec information for the initial segment, and check against the correct codecs during
+ the validation step.
+
+ Additionally, after validation, if successful update the Audio, Video, and TextTracks
+ for the SourceBuffer with the updated initialization segment information.
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-source/media-source-multiple-initialization-segments.html
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::appendBufferTimerFired): m_source may have been cleared
+ as a result of the append, so check it before using.
+ (WebCore::SourceBuffer::sourceBufferPrivateDidEndStream): Call streamEndedWithError
+ instead of endOfStream as the latter is safe to call within an update.
+ (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment): Ditto.
+ Update the track lists if validation succeeds.
+ (WebCore::SourceBuffer::validateInitializationSegment): Switch the audio and video
+ codec checks.
+
+ Add the ability for Audio, Video, and InbandTextTracks to replace their private tracks:
+ * html/track/AudioTrack.cpp:
+ (WebCore::AudioTrack::AudioTrack): Call updateKindFromPrivate().
+ (WebCore::AudioTrack::setPrivate):
+ (WebCore::AudioTrack::updateKindFromPrivate): Split out from constructor.
+ * html/track/AudioTrack.h:
+ * html/track/InbandTextTrack.cpp:
+ (WebCore::InbandTextTrack::InbandTextTrack): Call updateKindFromPrivate().
+ (WebCore::InbandTextTrack::setPrivate):
+ (WebCore::InbandTextTrack::setMode): Split up into setModeInternal().
+ (WebCore::InbandTextTrack::setModeInternal): Broke out from setMode().
+ (WebCore::InbandTextTrack::updateKindFromPrivate): Split out from constructor.
+ * html/track/InbandTextTrack.h:
+ * html/track/TextTrack.h:
+ (WebCore::TextTrack::isInband): Added, returns false.
+ * html/track/VideoTrack.cpp:
+ (WebCore::VideoTrack::VideoTrack): Call updateKindFromPrivate().
+ (WebCore::VideoTrack::setPrivate):
+ (WebCore::VideoTrack::updateKindFromPrivate): Split out from constructor.
+ * html/track/VideoTrack.h:
+
</ins><span class="cx"> 2014-04-17 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Column sets below spanners don't repaint properly.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -508,7 +508,8 @@
</span><span class="cx"> // 5. Queue a task to fire a simple event named updateend at this SourceBuffer object.
</span><span class="cx"> scheduleEvent(eventNames().updateendEvent);
</span><span class="cx">
</span><del>- m_source->monitorSourceBuffers();
</del><ins>+ if (m_source)
+ m_source->monitorSourceBuffers();
</ins><span class="cx"> for (auto iter = m_trackBufferMap.begin(), end = m_trackBufferMap.end(); iter != end; ++iter)
</span><span class="cx"> provideMediaData(iter->value, iter->key);
</span><span class="cx"> }
</span><span class="lines">@@ -645,7 +646,7 @@
</span><span class="cx"> void SourceBuffer::sourceBufferPrivateDidEndStream(SourceBufferPrivate*, const WTF::AtomicString& error)
</span><span class="cx"> {
</span><span class="cx"> if (!isRemoved())
</span><del>- m_source->endOfStream(error, IgnorableExceptionCode());
</del><ins>+ m_source->streamEndedWithError(error, IgnorableExceptionCode());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SourceBuffer::sourceBufferPrivateDidReceiveInitializationSegment(SourceBufferPrivate*, const InitializationSegment& segment)
</span><span class="lines">@@ -668,17 +669,51 @@
</span><span class="cx"> // 2. If the initialization segment has no audio, video, or text tracks, then run the end of stream
</span><span class="cx"> // algorithm with the error parameter set to "decode" and abort these steps.
</span><span class="cx"> if (!segment.audioTracks.size() && !segment.videoTracks.size() && !segment.textTracks.size())
</span><del>- m_source->endOfStream(decodeError(), IgnorableExceptionCode());
</del><ins>+ m_source->streamEndedWithError(decodeError(), IgnorableExceptionCode());
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // 3. If the first initialization segment flag is true, then run the following steps:
</span><span class="cx"> if (m_receivedFirstInitializationSegment) {
</span><span class="cx"> if (!validateInitializationSegment(segment)) {
</span><del>- m_source->endOfStream(decodeError(), IgnorableExceptionCode());
</del><ins>+ m_source->streamEndedWithError(decodeError(), IgnorableExceptionCode());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> // 3.2 Add the appropriate track descriptions from this initialization segment to each of the track buffers.
</span><del>- // NOTE: No changes to make
</del><ins>+ ASSERT(segment.audioTracks.size() == audioTracks()->length());
+ for (auto& audioTrackInfo : segment.audioTracks) {
+ if (audioTracks()->length() == 1) {
+ audioTracks()->item(0)->setPrivate(audioTrackInfo.track);
+ break;
+ }
+
+ auto audioTrack = audioTracks()->getTrackById(audioTrackInfo.track->id());
+ ASSERT(audioTrack);
+ audioTrack->setPrivate(audioTrackInfo.track);
+ }
+
+ ASSERT(segment.videoTracks.size() == videoTracks()->length());
+ for (auto& videoTrackInfo : segment.videoTracks) {
+ if (videoTracks()->length() == 1) {
+ videoTracks()->item(0)->setPrivate(videoTrackInfo.track);
+ break;
+ }
+
+ auto videoTrack = videoTracks()->getTrackById(videoTrackInfo.track->id());
+ ASSERT(videoTrack);
+ videoTrack->setPrivate(videoTrackInfo.track);
+ }
+
+ ASSERT(segment.textTracks.size() == textTracks()->length());
+ for (auto& textTrackInfo : segment.textTracks) {
+ if (textTracks()->length() == 1) {
+ toInbandTextTrack(textTracks()->item(0))->setPrivate(textTrackInfo.track);
+ break;
+ }
+
+ auto textTrack = textTracks()->getTrackById(textTrackInfo.track->id());
+ ASSERT(textTrack);
+ toInbandTextTrack(textTrack)->setPrivate(textTrackInfo.track);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 4. Let active track flag equal false.
</span><span class="lines">@@ -726,6 +761,8 @@
</span><span class="cx">
</span><span class="cx"> // 5.2.9 Add the track description for this track to the track buffer.
</span><span class="cx"> trackBuffer.description = it->description;
</span><ins>+
+ m_audioCodecs.append(trackBuffer.description->codec());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 5.3 For each video track in the initialization segment, run following steps:
</span><span class="lines">@@ -764,6 +801,8 @@
</span><span class="cx">
</span><span class="cx"> // 5.3.9 Add the track description for this track to the track buffer.
</span><span class="cx"> trackBuffer.description = it->description;
</span><ins>+
+ m_videoCodecs.append(trackBuffer.description->codec());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 5.4 For each text track in the initialization segment, run following steps:
</span><span class="lines">@@ -797,6 +836,8 @@
</span><span class="cx">
</span><span class="cx"> // 5.4.8 Add the track description for this track to the track buffer.
</span><span class="cx"> trackBuffer.description = it->description;
</span><ins>+
+ m_textCodecs.append(trackBuffer.description->codec());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 5.5 If active track flag equals true, then run the following steps:
</span><span class="lines">@@ -844,12 +885,12 @@
</span><span class="cx">
</span><span class="cx"> // * The codecs for each track, match what was specified in the first initialization segment.
</span><span class="cx"> for (auto it = segment.audioTracks.begin(); it != segment.audioTracks.end(); ++it) {
</span><del>- if (!m_videoCodecs.contains(it->description->codec()))
</del><ins>+ if (!m_audioCodecs.contains(it->description->codec()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto it = segment.videoTracks.begin(); it != segment.videoTracks.end(); ++it) {
</span><del>- if (!m_audioCodecs.contains(it->description->codec()))
</del><ins>+ if (!m_videoCodecs.contains(it->description->codec()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackAudioTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/AudioTrack.cpp (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/AudioTrack.cpp 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/html/track/AudioTrack.cpp 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -84,33 +84,7 @@
</span><span class="cx"> , m_private(trackPrivate)
</span><span class="cx"> {
</span><span class="cx"> m_private->setClient(this);
</span><del>-
- switch (m_private->kind()) {
- case AudioTrackPrivate::Alternative:
- setKind(AudioTrack::alternativeKeyword());
- break;
- case AudioTrackPrivate::Description:
- setKind(AudioTrack::descriptionKeyword());
- break;
- case AudioTrackPrivate::Main:
- setKind(AudioTrack::mainKeyword());
- break;
- case AudioTrackPrivate::MainDesc:
- setKind(AudioTrack::mainDescKeyword());
- break;
- case AudioTrackPrivate::Translation:
- setKind(AudioTrack::translationKeyword());
- break;
- case AudioTrackPrivate::Commentary:
- setKind(AudioTrack::commentaryKeyword());
- break;
- case AudioTrackPrivate::None:
- setKind(emptyString());
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
</del><ins>+ updateKindFromPrivate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AudioTrack::~AudioTrack()
</span><span class="lines">@@ -118,6 +92,22 @@
</span><span class="cx"> m_private->setClient(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AudioTrack::setPrivate(PassRefPtr<AudioTrackPrivate> trackPrivate)
+{
+ ASSERT(m_private);
+ ASSERT(trackPrivate);
+
+ if (m_private == trackPrivate)
+ return;
+
+ m_private->setClient(0);
+ m_private = trackPrivate;
+ m_private->setClient(this);
+
+ m_private->setEnabled(m_enabled);
+ updateKindFromPrivate();
+}
+
</ins><span class="cx"> bool AudioTrack::isValidKind(const AtomicString& value) const
</span><span class="cx"> {
</span><span class="cx"> if (value == alternativeKeyword())
</span><span class="lines">@@ -184,6 +174,36 @@
</span><span class="cx"> mediaElement()->removeAudioTrack(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AudioTrack::updateKindFromPrivate()
+{
+ switch (m_private->kind()) {
+ case AudioTrackPrivate::Alternative:
+ setKind(AudioTrack::alternativeKeyword());
+ break;
+ case AudioTrackPrivate::Description:
+ setKind(AudioTrack::descriptionKeyword());
+ break;
+ case AudioTrackPrivate::Main:
+ setKind(AudioTrack::mainKeyword());
+ break;
+ case AudioTrackPrivate::MainDesc:
+ setKind(AudioTrack::mainDescKeyword());
+ break;
+ case AudioTrackPrivate::Translation:
+ setKind(AudioTrack::translationKeyword());
+ break;
+ case AudioTrackPrivate::Commentary:
+ setKind(AudioTrack::commentaryKeyword());
+ break;
+ case AudioTrackPrivate::None:
+ setKind(emptyString());
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackAudioTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/AudioTrack.h (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/AudioTrack.h 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/html/track/AudioTrack.h 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx">
</span><span class="cx"> size_t inbandTrackIndex();
</span><span class="cx">
</span><ins>+ void setPrivate(PassRefPtr<AudioTrackPrivate>);
+
</ins><span class="cx"> protected:
</span><span class="cx"> AudioTrack(AudioTrackClient*, PassRefPtr<AudioTrackPrivate>);
</span><span class="cx">
</span><span class="lines">@@ -81,6 +83,8 @@
</span><span class="cx"> virtual void languageChanged(TrackPrivateBase*, const AtomicString&) override;
</span><span class="cx"> virtual void willRemove(TrackPrivateBase*) override;
</span><span class="cx">
</span><ins>+ void updateKindFromPrivate();
+
</ins><span class="cx"> bool m_enabled;
</span><span class="cx"> AudioTrackClient* m_client;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandTextTrack.cpp (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/InbandTextTrack.cpp 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/html/track/InbandTextTrack.cpp 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -65,31 +65,7 @@
</span><span class="cx"> , m_private(trackPrivate)
</span><span class="cx"> {
</span><span class="cx"> m_private->setClient(this);
</span><del>-
- switch (m_private->kind()) {
- case InbandTextTrackPrivate::Subtitles:
- setKind(TextTrack::subtitlesKeyword());
- break;
- case InbandTextTrackPrivate::Captions:
- setKind(TextTrack::captionsKeyword());
- break;
- case InbandTextTrackPrivate::Descriptions:
- setKind(TextTrack::descriptionsKeyword());
- break;
- case InbandTextTrackPrivate::Chapters:
- setKind(TextTrack::chaptersKeyword());
- break;
- case InbandTextTrackPrivate::Metadata:
- setKind(TextTrack::metadataKeyword());
- break;
- case InbandTextTrackPrivate::Forced:
- setKind(TextTrack::forcedKeyword());
- break;
- case InbandTextTrackPrivate::None:
- default:
- ASSERT_NOT_REACHED();
- break;
- }
</del><ins>+ updateKindFromPrivate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InbandTextTrack::~InbandTextTrack()
</span><span class="lines">@@ -97,10 +73,30 @@
</span><span class="cx"> m_private->setClient(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InbandTextTrack::setPrivate(PassRefPtr<InbandTextTrackPrivate> trackPrivate)
+{
+ ASSERT(m_private);
+ ASSERT(trackPrivate);
+
+ if (m_private == trackPrivate)
+ return;
+
+ m_private->setClient(0);
+ m_private = trackPrivate;
+ m_private->setClient(this);
+
+ setModeInternal(mode());
+ updateKindFromPrivate();
+}
+
</ins><span class="cx"> void InbandTextTrack::setMode(const AtomicString& mode)
</span><span class="cx"> {
</span><span class="cx"> TextTrack::setMode(mode);
</span><ins>+ setModeInternal(mode);
+}
</ins><span class="cx">
</span><ins>+void InbandTextTrack::setModeInternal(const AtomicString& mode)
+{
</ins><span class="cx"> if (mode == TextTrack::disabledKeyword())
</span><span class="cx"> m_private->setMode(InbandTextTrackPrivate::Disabled);
</span><span class="cx"> else if (mode == TextTrack::hiddenKeyword())
</span><span class="lines">@@ -189,6 +185,34 @@
</span><span class="cx"> mediaElement()->removeTextTrack(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InbandTextTrack::updateKindFromPrivate()
+{
+ switch (m_private->kind()) {
+ case InbandTextTrackPrivate::Subtitles:
+ setKind(TextTrack::subtitlesKeyword());
+ break;
+ case InbandTextTrackPrivate::Captions:
+ setKind(TextTrack::captionsKeyword());
+ break;
+ case InbandTextTrackPrivate::Descriptions:
+ setKind(TextTrack::descriptionsKeyword());
+ break;
+ case InbandTextTrackPrivate::Chapters:
+ setKind(TextTrack::chaptersKeyword());
+ break;
+ case InbandTextTrackPrivate::Metadata:
+ setKind(TextTrack::metadataKeyword());
+ break;
+ case InbandTextTrackPrivate::Forced:
+ setKind(TextTrack::forcedKeyword());
+ break;
+ case InbandTextTrackPrivate::None:
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackInbandTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/InbandTextTrack.h (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/InbandTextTrack.h 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/html/track/InbandTextTrack.h 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -50,9 +50,16 @@
</span><span class="cx">
</span><span class="cx"> virtual AtomicString inBandMetadataTrackDispatchType() const;
</span><span class="cx">
</span><ins>+ void setPrivate(PassRefPtr<InbandTextTrackPrivate>);
+
+ virtual bool isInband() const override { return true; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> InbandTextTrack(ScriptExecutionContext*, TextTrackClient*, PassRefPtr<InbandTextTrackPrivate>);
</span><span class="cx">
</span><ins>+ void setModeInternal(const AtomicString&);
+ void updateKindFromPrivate();
+
</ins><span class="cx"> RefPtr<InbandTextTrackPrivate> m_private;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -75,6 +82,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TYPE_CASTS_BASE(InbandTextTrack, TextTrack, track, track->isInband(), track.isInband());
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.h (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrack.h 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/html/track/TextTrack.h 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -156,6 +156,8 @@
</span><span class="cx"> virtual void setLanguage(const AtomicString&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ virtual bool isInband() const { return false; }
+
</ins><span class="cx"> using RefCounted<TrackBase>::ref;
</span><span class="cx"> using RefCounted<TrackBase>::deref;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVideoTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VideoTrack.cpp (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VideoTrack.cpp 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/html/track/VideoTrack.cpp 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -88,33 +88,7 @@
</span><span class="cx"> , m_private(trackPrivate)
</span><span class="cx"> {
</span><span class="cx"> m_private->setClient(this);
</span><del>-
- switch (m_private->kind()) {
- case VideoTrackPrivate::Alternative:
- setKindInternal(VideoTrack::alternativeKeyword());
- break;
- case VideoTrackPrivate::Captions:
- setKindInternal(VideoTrack::captionsKeyword());
- break;
- case VideoTrackPrivate::Main:
- setKindInternal(VideoTrack::mainKeyword());
- break;
- case VideoTrackPrivate::Sign:
- setKindInternal(VideoTrack::signKeyword());
- break;
- case VideoTrackPrivate::Subtitles:
- setKindInternal(VideoTrack::subtitlesKeyword());
- break;
- case VideoTrackPrivate::Commentary:
- setKindInternal(VideoTrack::commentaryKeyword());
- break;
- case VideoTrackPrivate::None:
- setKindInternal(emptyString());
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
</del><ins>+ updateKindFromPrivate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VideoTrack::~VideoTrack()
</span><span class="lines">@@ -122,6 +96,22 @@
</span><span class="cx"> m_private->setClient(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void VideoTrack::setPrivate(PassRefPtr<VideoTrackPrivate> trackPrivate)
+{
+ ASSERT(m_private);
+ ASSERT(trackPrivate);
+
+ if (m_private == trackPrivate)
+ return;
+
+ m_private->setClient(nullptr);
+ m_private = trackPrivate;
+ m_private->setClient(this);
+
+ m_private->setSelected(m_selected);
+ updateKindFromPrivate();
+}
+
</ins><span class="cx"> bool VideoTrack::isValidKind(const AtomicString& value) const
</span><span class="cx"> {
</span><span class="cx"> if (value == alternativeKeyword())
</span><span class="lines">@@ -231,6 +221,36 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void VideoTrack::updateKindFromPrivate()
+{
+ switch (m_private->kind()) {
+ case VideoTrackPrivate::Alternative:
+ setKindInternal(VideoTrack::alternativeKeyword());
+ break;
+ case VideoTrackPrivate::Captions:
+ setKindInternal(VideoTrack::captionsKeyword());
+ break;
+ case VideoTrackPrivate::Main:
+ setKindInternal(VideoTrack::mainKeyword());
+ break;
+ case VideoTrackPrivate::Sign:
+ setKindInternal(VideoTrack::signKeyword());
+ break;
+ case VideoTrackPrivate::Subtitles:
+ setKindInternal(VideoTrack::subtitlesKeyword());
+ break;
+ case VideoTrackPrivate::Commentary:
+ setKindInternal(VideoTrack::commentaryKeyword());
+ break;
+ case VideoTrackPrivate::None:
+ setKindInternal(emptyString());
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVideoTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VideoTrack.h (167439 => 167440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VideoTrack.h 2014-04-17 17:53:40 UTC (rev 167439)
+++ trunk/Source/WebCore/html/track/VideoTrack.h 2014-04-17 17:54:59 UTC (rev 167440)
</span><span class="lines">@@ -77,6 +77,8 @@
</span><span class="cx">
</span><span class="cx"> const MediaDescription& description() const;
</span><span class="cx">
</span><ins>+ void setPrivate(PassRefPtr<VideoTrackPrivate>);
+
</ins><span class="cx"> protected:
</span><span class="cx"> VideoTrack(VideoTrackClient*, PassRefPtr<VideoTrackPrivate> privateTrack);
</span><span class="cx">
</span><span class="lines">@@ -91,6 +93,8 @@
</span><span class="cx">
</span><span class="cx"> virtual bool enabled() const override { return selected(); }
</span><span class="cx">
</span><ins>+ void updateKindFromPrivate();
+
</ins><span class="cx"> bool m_selected;
</span><span class="cx"> VideoTrackClient* m_client;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>