<!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>[160839] trunk/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/160839">160839</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 09:51:04 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build fix for platforms which do not define -[AVSampleBufferAudioRenderer muted].
Rubber-stamped by Eric Carlson.
To work around platforms with broken AVSampleBufferAudioRenderer headers, just
declare only those functions we need, and update isAvalable to bail out early if
those methods are not present.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160838 => 160839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-19 17:50:01 UTC (rev 160838)
+++ trunk/Source/WebCore/ChangeLog 2013-12-19 17:51:04 UTC (rev 160839)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-19 Jer Noble <jer.noble@apple.com>
+
+ Build fix for platforms which do not define -[AVSampleBufferAudioRenderer muted].
+ Rubber-stamped by Eric Carlson.
+
+ To work around platforms with broken AVSampleBufferAudioRenderer headers, just
+ declare only those functions we need, and update isAvalable to bail out early if
+ those methods are not present.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+
</ins><span class="cx"> 2013-12-16 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve "bad parent" and "bad child list" assertions in line boxes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (160838 => 160839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2013-12-19 17:50:01 UTC (rev 160838)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2013-12-19 17:51:04 UTC (rev 160839)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #import "MediaTimeMac.h"
</span><span class="cx"> #import "PlatformClockCM.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><del>-#import <AVFoundation/AVSampleBufferDisplayLayer.h>
</del><span class="cx"> #import <AVFoundation/AVAsset.h>
</span><span class="cx"> #import <CoreMedia/CMSync.h>
</span><span class="cx"> #import <objc_runtime.h>
</span><span class="lines">@@ -68,6 +67,12 @@
</span><span class="cx"> #define kCMTimebaseNotification_EffectiveRateChanged getkCMTimebaseNotification_EffectiveRateChanged()
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><ins>+#pragma mark AVSampleBufferDisplayLayer
+
+@interface AVSampleBufferDisplayLayer : CALayer
+@end
+
+#pragma mark -
</ins><span class="cx"> #pragma mark AVVideoPerformanceMetrics
</span><span class="cx">
</span><span class="cx"> @interface AVVideoPerformanceMetrics : NSObject
</span><span class="lines">@@ -81,17 +86,13 @@
</span><span class="cx"> - (AVVideoPerformanceMetrics *)videoPerformanceMetrics;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-
</del><span class="cx"> #pragma mark -
</span><span class="cx"> #pragma mark AVSampleBufferAudioRenderer
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</del><span class="cx"> @interface AVSampleBufferAudioRenderer : NSObject
</span><del>-- (CMTimebaseRef)timebase;
</del><span class="cx"> - (void)setVolume:(float)volume;
</span><span class="cx"> - (void)setMuted:(BOOL)muted;
</span><span class="cx"> @end
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #pragma mark -
</span><span class="cx"> #pragma mark AVSampleBufferRenderSynchronizer
</span><span class="lines">@@ -168,7 +169,12 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateMediaSourceAVFObjC::isAvailable()
</span><span class="cx"> {
</span><del>- return AVFoundationLibrary() && CoreMediaLibrary() && getAVStreamDataParserClass() && getAVSampleBufferAudioRendererClass() && getAVSampleBufferRenderSynchronizerClass();
</del><ins>+ return AVFoundationLibrary()
+ && CoreMediaLibrary()
+ && getAVStreamDataParserClass()
+ && getAVSampleBufferAudioRendererClass()
+ && getAVSampleBufferRenderSynchronizerClass()
+ && class_getInstanceMethod(getAVSampleBufferAudioRendererClass(), @selector(setMuted:));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static HashSet<String> mimeTypeCache()
</span></span></pre>
</div>
</div>
</body>
</html>