<!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>[164160] 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/164160">164160</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-02-15 00:23:53 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] 10X slower than Chrome when drawing a video into a canvas
https://bugs.webkit.org/show_bug.cgi?id=124599
Reviewed by Darin Adler.
Follow up patch to <a href="http://trac.webkit.org/projects/webkit/changeset/159518">r159518</a> to address Darin's post-commit review.
* html/HTMLVideoElement.cpp:
(WebCore::HTMLVideoElement::nativeImageForCurrentTime): Use nullptr.
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::nativeImageForCurrentTime): Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC): Clear the
AVPlayerItemVideoOutput's delegate callback.
(WebCore::CVPixelBufferGetBytePointerCallback): Use static_cast.
(WebCore::CVPixelBufferReleaseBytePointerCallback): Ditto.
(WebCore::CVPixelBufferReleaseInfoCallback): Ditto.
(-[WebCoreAVFPullDelegate initWithCallback:]): Space changes.
(-[WebCoreAVFPullDelegate setCallback:]): Added.
(-[WebCoreAVFPullDelegate outputMediaDataWillChange:]): Check the value of m_callback.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementcpp">trunk/Source/WebCore/html/HTMLVideoElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164159 => 164160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-15 08:18:13 UTC (rev 164159)
+++ trunk/Source/WebCore/ChangeLog 2014-02-15 08:23:53 UTC (rev 164160)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-15 Jer Noble <jer.noble@apple.com>
+
+ [Mac] 10X slower than Chrome when drawing a video into a canvas
+ https://bugs.webkit.org/show_bug.cgi?id=124599
+
+ Reviewed by Darin Adler.
+
+ Follow up patch to r159518 to address Darin's post-commit review.
+
+ * html/HTMLVideoElement.cpp:
+ (WebCore::HTMLVideoElement::nativeImageForCurrentTime): Use nullptr.
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::nativeImageForCurrentTime): Ditto.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::~MediaPlayerPrivateAVFoundationObjC): Clear the
+ AVPlayerItemVideoOutput's delegate callback.
+ (WebCore::CVPixelBufferGetBytePointerCallback): Use static_cast.
+ (WebCore::CVPixelBufferReleaseBytePointerCallback): Ditto.
+ (WebCore::CVPixelBufferReleaseInfoCallback): Ditto.
+ (-[WebCoreAVFPullDelegate initWithCallback:]): Space changes.
+ (-[WebCoreAVFPullDelegate setCallback:]): Added.
+ (-[WebCoreAVFPullDelegate outputMediaDataWillChange:]): Check the value of m_callback.
+
</ins><span class="cx"> 2014-02-14 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> CTTE: WorkerGlobalScope is always owned by a WorkerThread.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.cpp (164159 => 164160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.cpp 2014-02-15 08:18:13 UTC (rev 164159)
+++ trunk/Source/WebCore/html/HTMLVideoElement.cpp 2014-02-15 08:23:53 UTC (rev 164160)
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> PassNativeImagePtr HTMLVideoElement::nativeImageForCurrentTime()
</span><span class="cx"> {
</span><span class="cx"> if (!player())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return player()->nativeImageForCurrentTime();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (164159 => 164160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-02-15 08:18:13 UTC (rev 164159)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-02-15 08:23:53 UTC (rev 164160)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void paintCurrentFrameInContext(GraphicsContext* c, const IntRect& r) { paint(c, r); }
</span><span class="cx"> virtual bool copyVideoTextureToPlatformTexture(GraphicsContext3D*, Platform3DObject, GC3Dint, GC3Denum, GC3Denum, bool, bool) { return false; }
</span><del>- virtual PassNativeImagePtr nativeImageForCurrentTime() { return 0; }
</del><ins>+ virtual PassNativeImagePtr nativeImageForCurrentTime() { return nullptr; }
</ins><span class="cx">
</span><span class="cx"> virtual void setPreload(MediaPlayer::Preload) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (164159 => 164160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-02-15 08:18:13 UTC (rev 164159)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-02-15 08:23:53 UTC (rev 164160)
</span><span class="lines">@@ -207,10 +207,11 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
</span><span class="cx"> @interface WebCoreAVFPullDelegate : NSObject<AVPlayerItemOutputPullDelegate> {
</span><del>- MediaPlayerPrivateAVFoundationObjC* m_callback;
</del><ins>+ MediaPlayerPrivateAVFoundationObjC *m_callback;
</ins><span class="cx"> dispatch_semaphore_t m_semaphore;
</span><span class="cx"> }
</span><del>-- (id)initWithCallback:(MediaPlayerPrivateAVFoundationObjC*)callback;
</del><ins>+- (id)initWithCallback:(MediaPlayerPrivateAVFoundationObjC *)callback;
+- (void)setCallback:(MediaPlayerPrivateAVFoundationObjC*)callback;
</ins><span class="cx"> - (void)outputMediaDataWillChange:(AVPlayerItemOutput *)sender;
</span><span class="cx"> - (void)outputSequenceWasFlushed:(AVPlayerItemOutput *)output;
</span><span class="cx"> @end
</span><span class="lines">@@ -280,7 +281,7 @@
</span><span class="cx"> , m_haveCheckedPlayability(false)
</span><span class="cx"> #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
</span><span class="cx"> , m_videoOutputDelegate(adoptNS([[WebCoreAVFPullDelegate alloc] initWithCallback:this]))
</span><del>- , m_videoOutputSemaphore(0)
</del><ins>+ , m_videoOutputSemaphore(nullptr)
</ins><span class="cx"> #endif
</span><span class="cx"> #if HAVE(AVFOUNDATION_LOADER_DELEGATE)
</span><span class="cx"> , m_loaderDelegate(adoptNS([[WebCoreAVFLoaderDelegate alloc] initWithCallback:this]))
</span><span class="lines">@@ -309,6 +310,10 @@
</span><span class="cx"> [m_loaderDelegate.get() setCallback:0];
</span><span class="cx"> [[m_avAsset.get() resourceLoader] setDelegate:nil queue:0];
</span><span class="cx"> #endif
</span><ins>+#if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
+ [m_videoOutputDelegate setCallback:0];
+ [m_videoOutput setDelegate:nil queue:0];
+#endif
</ins><span class="cx"> cancelLoad();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1377,20 +1382,20 @@
</span><span class="cx">
</span><span class="cx"> static const void* CVPixelBufferGetBytePointerCallback(void* info)
</span><span class="cx"> {
</span><del>- CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)info;
</del><ins>+ CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
</ins><span class="cx"> CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
</span><span class="cx"> return CVPixelBufferGetBaseAddress(pixelBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void CVPixelBufferReleaseBytePointerCallback(void *info, const void *)
</del><ins>+static void CVPixelBufferReleaseBytePointerCallback(void* info, const void*)
</ins><span class="cx"> {
</span><del>- CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)info;
</del><ins>+ CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
</ins><span class="cx"> CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void CVPixelBufferReleaseInfoCallback(void *info)
</del><ins>+static void CVPixelBufferReleaseInfoCallback(void* info)
</ins><span class="cx"> {
</span><del>- CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)info;
</del><ins>+ CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
</ins><span class="cx"> CFRelease(pixelBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2199,7 +2204,7 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
</span><span class="cx"> @implementation WebCoreAVFPullDelegate
</span><del>-- (id)initWithCallback:(MediaPlayerPrivateAVFoundationObjC*)callback
</del><ins>+- (id)initWithCallback:(MediaPlayerPrivateAVFoundationObjC *)callback
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (self)
</span><span class="lines">@@ -2207,9 +2212,15 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setCallback:(MediaPlayerPrivateAVFoundationObjC *)callback
+{
+ m_callback = callback;
+}
+
</ins><span class="cx"> - (void)outputMediaDataWillChange:(AVPlayerItemVideoOutput *)output
</span><span class="cx"> {
</span><del>- m_callback->outputMediaDataWillChange(output);
</del><ins>+ if (m_callback)
+ m_callback->outputMediaDataWillChange(output);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)outputSequenceWasFlushed:(AVPlayerItemVideoOutput *)output
</span></span></pre>
</div>
</div>
</body>
</html>