<!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>[215052] branches/safari-604.1.14-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/215052">215052</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2017-04-06 11:58:24 -0700 (Thu, 06 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/214930">r214930</a>. rdar://problem/31445339</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari604114branchSourceWebCoreChangeLog">branches/safari-604.1.14-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari604114branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">branches/safari-604.1.14-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#branchessafari604114branchSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm">branches/safari-604.1.14-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm</a></li>
<li><a href="#branchessafari604114branchSourceWebCoreplatformspimacAVFoundationSPIh">branches/safari-604.1.14-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari604114branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/WebCore/ChangeLog (215051 => 215052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/WebCore/ChangeLog 2017-04-06 18:56:33 UTC (rev 215051)
+++ branches/safari-604.1.14-branch/Source/WebCore/ChangeLog 2017-04-06 18:58:24 UTC (rev 215052)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-04-06 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r214930.
+
+ 2017-04-04 Jer Noble <jer.noble@apple.com>
+
+ Move AVSampleBufferDisplayLayer declarations into AVFoundationSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=170471
+
+ Reviewed by Eric Carlson.
+
+ Move the declaration of AVSampleBufferDisplayLayer (and related classes) into AVFoundationSPI.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ * platform/spi/mac/AVFoundationSPI.h:
+
</ins><span class="cx"> 2017-03-29 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Cherry-pick r214435. rdar://problem/31303823
</span></span></pre></div>
<a id="branchessafari604114branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (215051 => 215052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-04-06 18:56:33 UTC (rev 215051)
+++ branches/safari-604.1.14-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-04-06 18:58:24 UTC (rev 215052)
</span><span class="lines">@@ -73,12 +73,6 @@
</span><span class="cx"> #define AVAudioTimePitchAlgorithmVarispeed getAVAudioTimePitchAlgorithmVarispeed()
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><del>-#pragma mark AVSampleBufferDisplayLayer
-
-@interface AVSampleBufferDisplayLayer : CALayer
-@end
-
-#pragma mark -
</del><span class="cx"> #pragma mark AVVideoPerformanceMetrics
</span><span class="cx">
</span><span class="cx"> @interface AVVideoPerformanceMetrics : NSObject
</span></span></pre></div>
<a id="branchessafari604114branchSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (215051 => 215052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-04-06 18:56:33 UTC (rev 215051)
+++ branches/safari-604.1.14-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-04-06 18:58:24 UTC (rev 215052)
</span><span class="lines">@@ -98,20 +98,6 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><del>-#pragma mark AVSampleBufferDisplayLayer
-
-@interface AVSampleBufferDisplayLayer : CALayer
-- (NSInteger)status;
-- (NSError*)error;
-- (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer;
-- (void)flush;
-- (void)flushAndRemoveImage;
-- (BOOL)isReadyForMoreMediaData;
-- (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
-- (void)stopRequestingMediaData;
-@end
-
-#pragma mark -
</del><span class="cx"> #pragma mark WebAVStreamDataParserListener
</span><span class="cx">
</span><span class="cx"> @interface WebAVStreamDataParserListener : NSObject<AVStreamDataParserOutputHandling> {
</span></span></pre></div>
<a id="branchessafari604114branchSourceWebCoreplatformspimacAVFoundationSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-604.1.14-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (215051 => 215052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-604.1.14-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-04-06 18:56:33 UTC (rev 215051)
+++ branches/safari-604.1.14-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-04-06 18:58:24 UTC (rev 215052)
</span><span class="lines">@@ -163,8 +163,19 @@
</span><span class="cx"> #import <CoreMedia/CMSampleBuffer.h>
</span><span class="cx"> #import <CoreMedia/CMSync.h>
</span><span class="cx">
</span><ins>+#if __has_include(<AVFoundation/AVSampleBufferRenderSynchronizer.h>)
+#import <AVFoundation/AVSampleBufferRenderSynchronizer.h>
+
</ins><span class="cx"> NS_ASSUME_NONNULL_BEGIN
</span><ins>+@interface AVSampleBufferRenderSynchronizer (AVSampleBufferRenderSynchronizerPrivate)
+- (void)removeRenderer:(id)renderer atTime:(CMTime)time withCompletionHandler:(void (^)(BOOL didRemoveRenderer))completionHandler;
+@end
+NS_ASSUME_NONNULL_END
</ins><span class="cx">
</span><ins>+#else
+
+NS_ASSUME_NONNULL_BEGIN
+
</ins><span class="cx"> @interface AVSampleBufferRenderSynchronizer : NSObject
</span><span class="cx"> - (CMTimebaseRef)timebase;
</span><span class="cx"> - (float)rate;
</span><span class="lines">@@ -180,7 +191,37 @@
</span><span class="cx">
</span><span class="cx"> NS_ASSUME_NONNULL_END
</span><span class="cx">
</span><del>-#if __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
</del><ins>+#endif // __has_include(<AVFoundation/AVSampleBufferRenderSynchronizer.h>)
+
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
+#import <AVFoundation/AVQueuedSampleBufferRendering.h>
+#elif __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
+#import <AVFoundation/AVSampleBufferDisplayLayer.h>
+#else
+
+NS_ASSUME_NONNULL_BEGIN
+
+#pragma mark -
+#pragma mark AVSampleBufferDisplayLayer
+
+@interface AVSampleBufferDisplayLayer : CALayer
+- (NSInteger)status;
+- (NSError*)error;
+- (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer;
+- (void)flush;
+- (void)flushAndRemoveImage;
+- (BOOL)isReadyForMoreMediaData;
+- (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
+- (void)stopRequestingMediaData;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
+
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
+// Nothing to do, AVfoundation/AVQueuedSampleBufferRendering.h was imported above.
+#elif __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
</ins><span class="cx"> #import <AVFoundation/AVSampleBufferAudioRenderer.h>
</span><span class="cx"> #else
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>