<!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>[179549] 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/179549">179549</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-02-03 09:27:55 -0800 (Tue, 03 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] HLS audio is not correctly selected according to system language
https://bugs.webkit.org/show_bug.cgi?id=140398
rdar://problem/19218487
Reviewed by Darin Adler.
Source/WebCore:
Test: http/tests/media/hls/hls-audio-tracks-locale-selection.html
When AVMediaSelectionOptions come and go and no explicit track selection choice has
been made, automatically pick the most appropriate track according to the user's
current preferred locale settings.
* platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h:
* platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
(WebCore::MediaSelectionGroupAVFObjC::MediaSelectionGroupAVFObjC): Set m_shouldSelectOptionAutomatically
to true by default.
(WebCore::MediaSelectionGroupAVFObjC::updateOptions): If m_shouldSelectOptionAutomatically is set
pick the most appropriate media selection option.
(WebCore::MediaSelectionGroupAVFObjC::setSelectedOption): Set m_shouldSelectOptionAutomatically to false.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Remove these automatic selection
requests as they are ineffective when -appliesMediaSelectionCriteriaAutomatically is NO.
LayoutTests:
* http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt: Added.
* http/tests/media/hls/hls-audio-tracks-locale-selection.html: Added.
* http/tests/media/resources/hls/audio-tracks.m3u8:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsmediaresourceshlsaudiotracksm3u8">trunk/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediahlshlsaudiotrackslocaleselectionexpectedtxt">trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediahlshlsaudiotrackslocaleselectionhtml">trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179548 => 179549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-03 16:58:08 UTC (rev 179548)
+++ trunk/LayoutTests/ChangeLog 2015-02-03 17:27:55 UTC (rev 179549)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-03 Jer Noble <jer.noble@apple.com>
+
+ [Mac] HLS audio is not correctly selected according to system language
+ https://bugs.webkit.org/show_bug.cgi?id=140398
+ rdar://problem/19218487
+
+ Reviewed by Darin Adler.
+
+ * http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt: Added.
+ * http/tests/media/hls/hls-audio-tracks-locale-selection.html: Added.
+ * http/tests/media/resources/hls/audio-tracks.m3u8:
+
</ins><span class="cx"> 2015-02-03 Piotr Krysiewicz <p.krysiewicz@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] fast/borders/mixed-border-style2.html fails due to missing -expected.txt
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediahlshlsaudiotrackslocaleselectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt (0 => 179549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt 2015-02-03 17:27:55 UTC (rev 179549)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+
+RUN(internals.setUserPreferredLanguages(["jp", "fr", "es-EN", "en"]))
+EVENT(canplaythrough)
+EXPECTED (video.audioTracks.length == '3') OK
+EXPECTED (video.audioTracks[0].enabled == 'false') OK
+EXPECTED (video.audioTracks[1].enabled == 'true') OK
+EXPECTED (video.audioTracks[2].enabled == 'false') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediahlshlsaudiotrackslocaleselectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection.html (0 => 179549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection.html (rev 0)
+++ trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection.html 2015-02-03 17:27:55 UTC (rev 179549)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=../../media-resources/video-test.js></script>
+ <script src=../../media-resources/media-controls.js></script>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function start() {
+ if (window.internals)
+ run('internals.setUserPreferredLanguages(["jp", "fr", "es-EN", "en"])');
+ else
+ consoleWrite('Change your system language to French, and check that the french audio track was selected by default.');
+
+ video = document.getElementById('video');
+ waitForEvent('canplaythrough', canplaythrough);
+ video.src = "../resources/hls/audio-tracks.m3u8";
+ }
+
+ function canplaythrough() {
+ testExpected("video.audioTracks.length", 3);
+ testExpected("video.audioTracks[0].enabled", false);
+ testExpected("video.audioTracks[1].enabled", true);
+ testExpected("video.audioTracks[2].enabled", false);
+ endTest();
+ }
+ </script>
+ </head>
+ <body onload="start()">
+ <video id="video"></video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediaresourceshlsaudiotracksm3u8"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8 (179548 => 179549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8 2015-02-03 16:58:08 UTC (rev 179548)
+++ trunk/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8 2015-02-03 17:27:55 UTC (rev 179549)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> #EXTM3U
</span><span class="cx">
</span><del>-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="eng",NAME="English Sound",AUTOSELECT=YES,DEFAULT=YES
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="fre",NAME="French Sound",AUTOSELECT=NO,DEFAULT=NO,URI="french/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="spa",NAME="Spanish Sound",AUTOSELECT=NO,DEFAULT=NO,URI="spanish/prog_index.m3u8"
</del><ins>+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="en-US",NAME="English Sound",AUTOSELECT=YES,DEFAULT=YES
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="fr-FR",NAME="French Sound",AUTOSELECT=NO,DEFAULT=NO,URI="french/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="es-US",NAME="Spanish Sound",AUTOSELECT=NO,DEFAULT=NO,URI="spanish/prog_index.m3u8"
</ins><span class="cx">
</span><span class="cx"> #EXT-X-STREAM-INF:BANDWIDTH=634451,CODECS="mp4a.40.2, avc1.4d401e",RESOLUTION=640x480,AUDIO="bipbop_audio"
</span><span class="cx"> bipbop/prog_index.m3u8
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179548 => 179549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-03 16:58:08 UTC (rev 179548)
+++ trunk/Source/WebCore/ChangeLog 2015-02-03 17:27:55 UTC (rev 179549)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-02-03 Jer Noble <jer.noble@apple.com>
+
+ [Mac] HLS audio is not correctly selected according to system language
+ https://bugs.webkit.org/show_bug.cgi?id=140398
+ rdar://problem/19218487
+
+ Reviewed by Darin Adler.
+
+ Test: http/tests/media/hls/hls-audio-tracks-locale-selection.html
+
+ When AVMediaSelectionOptions come and go and no explicit track selection choice has
+ been made, automatically pick the most appropriate track according to the user's
+ current preferred locale settings.
+
+ * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h:
+ * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
+ (WebCore::MediaSelectionGroupAVFObjC::MediaSelectionGroupAVFObjC): Set m_shouldSelectOptionAutomatically
+ to true by default.
+ (WebCore::MediaSelectionGroupAVFObjC::updateOptions): If m_shouldSelectOptionAutomatically is set
+ pick the most appropriate media selection option.
+ (WebCore::MediaSelectionGroupAVFObjC::setSelectedOption): Set m_shouldSelectOptionAutomatically to false.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Remove these automatic selection
+ requests as they are ineffective when -appliesMediaSelectionCriteriaAutomatically is NO.
+
</ins><span class="cx"> 2015-02-03 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move InstanceInvalidationGuard/UpdateBlocker to SVGElement from SVGElementInstance
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h (179548 => 179549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h 2015-02-03 16:58:08 UTC (rev 179548)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h 2015-02-03 17:27:55 UTC (rev 179549)
</span><span class="lines">@@ -89,8 +89,9 @@
</span><span class="cx"> RetainPtr<AVPlayerItem> m_playerItem;
</span><span class="cx"> RetainPtr<AVMediaSelectionGroup> m_mediaSelectionGroup;
</span><span class="cx"> OptionContainer m_options;
</span><del>- MediaSelectionOptionAVFObjC* m_selectedOption;
</del><ins>+ MediaSelectionOptionAVFObjC* m_selectedOption { nullptr };
</ins><span class="cx"> Timer m_selectionTimer;
</span><ins>+ bool m_shouldSelectOptionAutomatically { true };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm (179548 => 179549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm 2015-02-03 16:58:08 UTC (rev 179548)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm 2015-02-03 17:27:55 UTC (rev 179549)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><ins>+#import "Language.h"
</ins><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import <AVFoundation/AVAsset.h>
</span><span class="cx"> #import <AVFoundation/AVMediaSelectionGroup.h>
</span><span class="lines">@@ -35,6 +36,7 @@
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><ins>+#import <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
</span><span class="cx">
</span><span class="lines">@@ -88,7 +90,6 @@
</span><span class="cx"> MediaSelectionGroupAVFObjC::MediaSelectionGroupAVFObjC(AVPlayerItem *item, AVMediaSelectionGroup *group)
</span><span class="cx"> : m_playerItem(item)
</span><span class="cx"> , m_mediaSelectionGroup(group)
</span><del>- , m_selectedOption(nullptr)
</del><span class="cx"> , m_selectionTimer(*this, &MediaSelectionGroupAVFObjC::selectionTimerFired)
</span><span class="cx"> {
</span><span class="cx"> updateOptions();
</span><span class="lines">@@ -128,6 +129,25 @@
</span><span class="cx"> m_selectedOption = addedOption.get();
</span><span class="cx"> m_options.set(addedAVOption, addedOption.release());
</span><span class="cx"> }
</span><ins>+
+ if (!m_shouldSelectOptionAutomatically)
+ return;
+
+ RetainPtr<NSMutableArray> nsLanguages = adoptNS([[NSMutableArray alloc] initWithCapacity:userPreferredLanguages().size()]);
+ for (auto& language : userPreferredLanguages())
+ [nsLanguages addObject:(NSString*)language];
+ NSArray* filteredOptions = [getAVMediaSelectionGroupClass() mediaSelectionOptionsFromArray:[m_mediaSelectionGroup options] filteredAndSortedAccordingToPreferredLanguages:nsLanguages.get()];
+
+ if (![filteredOptions count])
+ return;
+
+ AVMediaSelectionOption* preferredOption = [filteredOptions objectAtIndex:0];
+ if (m_selectedOption && m_selectedOption->avMediaSelectionOption() == preferredOption)
+ return;
+
+ ASSERT(m_options.contains(preferredOption));
+ m_selectedOption = m_options.get(preferredOption);
+ m_selectionTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSelectionGroupAVFObjC::setSelectedOption(MediaSelectionOptionAVFObjC* option)
</span><span class="lines">@@ -135,6 +155,7 @@
</span><span class="cx"> if (m_selectedOption == option)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_shouldSelectOptionAutomatically = false;
</ins><span class="cx"> m_selectedOption = option;
</span><span class="cx"> if (m_selectionTimer.isActive())
</span><span class="cx"> m_selectionTimer.stop();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (179548 => 179549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-02-03 16:58:08 UTC (rev 179548)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-02-03 17:27:55 UTC (rev 179549)
</span><span class="lines">@@ -935,12 +935,6 @@
</span><span class="cx"> [m_avPlayerItem.get() addOutput:m_legibleOutput.get()];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
- [m_avPlayerItem selectMediaOptionAutomaticallyInMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
- [m_avPlayerItem selectMediaOptionAutomaticallyInMediaSelectionGroup:safeMediaSelectionGroupForAudibleMedia()];
- [m_avPlayerItem selectMediaOptionAutomaticallyInMediaSelectionGroup:safeMediaSelectionGroupForVisualMedia()];
-#endif
-
</del><span class="cx"> #if ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
</span><span class="cx"> if (m_provider)
</span><span class="cx"> m_provider->setPlayerItem(m_avPlayerItem.get());
</span></span></pre>
</div>
</div>
</body>
</html>