<!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>[180099] branches/safari-600.1.4.15-branch/Source/WebCore</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/180099">180099</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 20:23:13 -0800 (Fri, 13 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/179768">r179768</a>. rdar://problem/19733844.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementh">branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementmm">branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (180098 => 180099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-14 04:20:21 UTC (rev 180098)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-14 04:23:13 UTC (rev 180099)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-02-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179768
+
+ 2015-02-06 Brent Fulgham <bfulgham@apple.com>
+
+ [iOS] Implement audio track selection in fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=131236
+ <rdar://problem/16552632>
+
+ Reviewed by Eric Carlson.
+
+ * platform/ios/WebVideoFullscreenModelVideoElement.h:
+ * platform/ios/WebVideoFullscreenModelVideoElement.mm:
+ (WebVideoFullscreenModelVideoElement::selectAudioMediaOption): Provide implementation.
+ (WebVideoFullscreenModelVideoElement::updateLegibleOptions): Add audio track information
+ to menu displayed to user.
+
+2015-02-13 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r174823
</span><span class="cx">
</span><span class="cx"> 2014-10-16 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h (180098 => 180099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h 2015-02-14 04:20:21 UTC (rev 180098)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h 2015-02-14 04:23:13 UTC (rev 180099)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class AudioTrack;
</ins><span class="cx"> class HTMLMediaElement;
</span><span class="cx"> class TextTrack;
</span><span class="cx"> class WebVideoFullscreenInterface;
</span><span class="lines">@@ -81,6 +82,7 @@
</span><span class="cx"> WebVideoFullscreenInterface* m_videoFullscreenInterface;
</span><span class="cx"> FloatRect m_videoFrame;
</span><span class="cx"> Vector<RefPtr<TextTrack>> m_legibleTracksForMenu;
</span><ins>+ Vector<RefPtr<AudioTrack>> m_audioTracksForMenu;
</ins><span class="cx">
</span><span class="cx"> void updateLegibleOptions();
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm (180098 => 180099)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm 2015-02-14 04:20:21 UTC (rev 180098)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm 2015-02-14 04:23:13 UTC (rev 180099)
</span><span class="lines">@@ -303,9 +303,18 @@
</span><span class="cx"> m_mediaElement->setVideoFullscreenGravity(videoGravity);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenModelMediaElement::selectAudioMediaOption(uint64_t)
-{
- // FIXME: 131236 Implement audio track selection.
</del><ins>+void WebVideoFullscreenModelMediaElement::selectAudioMediaOption(uint64_t selectedAudioIndex)
+{
+ AudioTrack* selectedAudioTrack = nullptr;
+
+ for (size_t index = 0; index < m_audioTracksForMenu.size(); ++index) {
+ auto& audioTrack = m_audioTracksForMenu[index];
+ audioTrack->setEnabled(index == static_cast<size_t>(selectedAudioIndex));
+ if (audioTrack->enabled())
+ selectedAudioTrack = audioTrack.get();
+ }
+
+ m_mediaElement->audioTrackEnabledChanged(selectedAudioTrack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenModelMediaElement::selectLegibleMediaOption(uint64_t index)
</span><span class="lines">@@ -320,8 +329,10 @@
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenModelMediaElement::updateLegibleOptions()
</span><span class="cx"> {
</span><ins>+ AudioTrackList* audioTrackList = m_mediaElement->audioTracks();
</ins><span class="cx"> TextTrackList* trackList = m_mediaElement->textTracks();
</span><del>- if (!trackList || !m_mediaElement->document().page() || !m_mediaElement->mediaControlsHost())
</del><ins>+
+ if ((!trackList && !audioTrackList) || !m_mediaElement->document().page() || !m_mediaElement->mediaControlsHost())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WTF::AtomicString displayMode = m_mediaElement->mediaControlsHost()->captionDisplayMode();
</span><span class="lines">@@ -329,6 +340,22 @@
</span><span class="cx"> TextTrack* automaticItem = m_mediaElement->mediaControlsHost()->captionMenuAutomaticItem();
</span><span class="cx"> CaptionUserPreferences& captionPreferences = *m_mediaElement->document().page()->group().captionPreferences();
</span><span class="cx"> m_legibleTracksForMenu = captionPreferences.sortedTrackListForMenu(trackList);
</span><ins>+
+ m_audioTracksForMenu = captionPreferences.sortedTrackListForMenu(audioTrackList);
+
+ Vector<String> audioTrackDisplayNames;
+ uint64_t selectedAudioIndex = 0;
+
+ for (size_t index = 0; index < m_audioTracksForMenu.size(); ++index) {
+ auto& track = m_audioTracksForMenu[index];
+ audioTrackDisplayNames.append(captionPreferences.displayNameForTrack(track.get()));
+
+ if (track->enabled())
+ selectedAudioIndex = index;
+ }
+
+ m_videoFullscreenInterface->setAudioMediaSelectionOptions(audioTrackDisplayNames, selectedAudioIndex);
+
</ins><span class="cx"> Vector<String> trackDisplayNames;
</span><span class="cx"> uint64_t selectedIndex = 0;
</span><span class="cx"> uint64_t offIndex = 0;
</span></span></pre>
</div>
</div>
</body>
</html>