<!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>[175072] 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/175072">175072</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2014-10-22 16:18:30 -0700 (Wed, 22 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaPlayerPrivateAVFoundation::hasAudio() returns false even when there is an audible AVMediaSelectionOption selected
https://bugs.webkit.org/show_bug.cgi?id=137935
Reviewed by Eric Carlson.
Source/WebCore:
Set hasAudio to true if there's a selected audible AVMediaSelectionOption
after the call to updateAudioTracks(). Ditto for video.
Test: http/tests/media/hls/hls-audio-tracks-has-audio.html
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged):
* testing/Internals.cpp:
(WebCore::Internals::mediaElementHasCharacteristic):
* testing/Internals.h:
* testing/Internals.idl:
Add internals.mediaElementHasCharacteristic for the new test.
LayoutTests:
* http/tests/media/hls/hls-audio-tracks-has-audio-expected.txt: Added.
* http/tests/media/hls/hls-audio-tracks-has-audio.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="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediahlshlsaudiotrackshasaudioexpectedtxt">trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-has-audio-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediahlshlsaudiotrackshasaudiohtml">trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-has-audio.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175071 => 175072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-22 23:03:15 UTC (rev 175071)
+++ trunk/LayoutTests/ChangeLog 2014-10-22 23:18:30 UTC (rev 175072)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-10-21 Ada Chan <adachan@apple.com>
+
+ MediaPlayerPrivateAVFoundation::hasAudio() returns false even when there is an audible AVMediaSelectionOption selected
+ https://bugs.webkit.org/show_bug.cgi?id=137935
+
+ Reviewed by Eric Carlson.
+
+ * http/tests/media/hls/hls-audio-tracks-has-audio-expected.txt: Added.
+ * http/tests/media/hls/hls-audio-tracks-has-audio.html: Added.
+
</ins><span class="cx"> 2014-10-22 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Unreviewed EFL gardening.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediahlshlsaudiotrackshasaudioexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-has-audio-expected.txt (0 => 175072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-has-audio-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-has-audio-expected.txt 2014-10-22 23:18:30 UTC (rev 175072)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+
+EVENT(canplaythrough)
+EXPECTED (window.internals.mediaElementHasCharacteristic(video, 'Audible') == 'true') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediahlshlsaudiotrackshasaudiohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-has-audio.html (0 => 175072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-has-audio.html (rev 0)
+++ trunk/LayoutTests/http/tests/media/hls/hls-audio-tracks-has-audio.html 2014-10-22 23:18:30 UTC (rev 175072)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=../../media-resources/video-test.js></script>
+ <script src=../../media-resources/media-controls.js></script>
+ <script>
+ function start()
+ {
+ findMediaElement();
+ waitForEvent('canplaythrough', canplaythrough);
+ video.src = "../resources/hls/audio-tracks.m3u8";
+ }
+
+ function canplaythrough()
+ {
+ testExpected("window.internals.mediaElementHasCharacteristic(video, 'Audible')", true);
+ endTest();
+ }
+ </script>
+ </head>
+ <body onload="start()">
+ <video id="video"></video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175071 => 175072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-22 23:03:15 UTC (rev 175071)
+++ trunk/Source/WebCore/ChangeLog 2014-10-22 23:18:30 UTC (rev 175072)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-10-21 Ada Chan <adachan@apple.com>
+
+ MediaPlayerPrivateAVFoundation::hasAudio() returns false even when there is an audible AVMediaSelectionOption selected
+ https://bugs.webkit.org/show_bug.cgi?id=137935
+
+ Reviewed by Eric Carlson.
+
+ Set hasAudio to true if there's a selected audible AVMediaSelectionOption
+ after the call to updateAudioTracks(). Ditto for video.
+
+ Test: http/tests/media/hls/hls-audio-tracks-has-audio.html
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged):
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::mediaElementHasCharacteristic):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+ Add internals.mediaElementHasCharacteristic for the new test.
+
</ins><span class="cx"> 2014-10-22 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove WidgetBackingStoreCairo::create() factory function
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (175071 => 175072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-10-22 23:03:15 UTC (rev 175071)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-10-22 23:18:30 UTC (rev 175072)
</span><span class="lines">@@ -1707,6 +1707,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO_TRACK)
+ updateAudioTracks();
+ updateVideoTracks();
+
+#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
+ hasAudio |= (m_audibleGroup && m_audibleGroup->selectedOption());
+ hasVideo |= (m_visualGroup && m_visualGroup->selectedOption());
+#endif
+#endif
+
</ins><span class="cx"> // Always says we have video if the AVPlayerLayer is ready for diaplay to work around
</span><span class="cx"> // an AVFoundation bug which causes it to sometimes claim a track is disabled even
</span><span class="cx"> // when it is not.
</span><span class="lines">@@ -1717,11 +1727,6 @@
</span><span class="cx"> if (hasMetaData)
</span><span class="cx"> processMetadataTrack();
</span><span class="cx"> #endif
</span><del>-
-#if ENABLE(VIDEO_TRACK)
- updateAudioTracks();
- updateVideoTracks();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (175071 => 175072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-10-22 23:03:15 UTC (rev 175071)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-10-22 23:18:30 UTC (rev 175072)
</span><span class="lines">@@ -2084,6 +2084,24 @@
</span><span class="cx"> UNUSED_PARAM(node);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+bool Internals::mediaElementHasCharacteristic(Node* node, const String& characteristic, ExceptionCode& ec)
+{
+ if (!is<HTMLMediaElement>(*node))
+ return false;
+
+ HTMLMediaElement* element = downcast<HTMLMediaElement>(node);
+
+ if (equalIgnoringCase(characteristic, "Audible"))
+ return element->hasAudio();
+ if (equalIgnoringCase(characteristic, "Visual"))
+ return element->hasVideo();
+ if (equalIgnoringCase(characteristic, "Legible"))
+ return element->hasClosedCaptions();
+
+ ec = SYNTAX_ERR;
+ return false;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool Internals::isSelectPopupVisible(Node* node)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (175071 => 175072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-10-22 23:03:15 UTC (rev 175071)
+++ trunk/Source/WebCore/testing/Internals.h 2014-10-22 23:18:30 UTC (rev 175072)
</span><span class="lines">@@ -302,6 +302,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> void simulateAudioInterruption(Node*);
</span><ins>+ bool mediaElementHasCharacteristic(Node*, const String&, ExceptionCode&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool isSelectPopupVisible(Node*);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (175071 => 175072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2014-10-22 23:03:15 UTC (rev 175071)
+++ trunk/Source/WebCore/testing/Internals.idl 2014-10-22 23:18:30 UTC (rev 175072)
</span><span class="lines">@@ -258,6 +258,7 @@
</span><span class="cx"> void forceReload(boolean endToEnd);
</span><span class="cx">
</span><span class="cx"> [Conditional=VIDEO] void simulateAudioInterruption(Node node);
</span><ins>+ [Conditional=VIDEO, RaisesException] boolean mediaElementHasCharacteristic(Node node, DOMString characteristic);
</ins><span class="cx">
</span><span class="cx"> [Conditional=ENCRYPTED_MEDIA_V2] void initializeMockCDM();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>