120170 2013-08-22 13:54:38 -0700 MediaPlayerPrivateAVFoundationObjC is painting video frames under the video layer 2013-08-28 13:26:17 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser eric.carlson commit-queue eric.carlson glenn jer.noble simon.fraser webkit-bug-importer oldest_to_newest 919958 0 simon.fraser 2013-08-22 13:54:38 -0700 RenderVideo::paintReplaced() is called any time the render tree is being painted. In the non-flattening case, this calls into mediaPlayer->paint(), and MediaPlayerPrivateAVFoundationObjC: then calls down into MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput() which does CIContext stuff. This is crazy because you're painting a video frame into a layer whose sublayer is showing video frames, and means that whenever the page paints, you're getting a CVPixelBufferRef which is expensive. 919959 1 webkit-bug-importer 2013-08-22 13:54:53 -0700 <rdar://problem/14811861> 919977 2 simon.fraser 2013-08-22 14:57:11 -0700 Maybe patch: diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm index 1615340eec1152c3366639b41fcc5b4e85de9e2c..ecfa806819780e8dc434cc7065a05ce7b7c109c5 100644 --- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm +++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm @@ -787,14 +787,6 @@ void MediaPlayerPrivateAVFoundationObjC::paintCurrentFrameInContext(GraphicsCont if (!metaDataAvailable() || context->paintingDisabled()) return; - paint(context, rect); -} - -void MediaPlayerPrivateAVFoundationObjC::paint(GraphicsContext* context, const IntRect& rect) -{ - if (!metaDataAvailable() || context->paintingDisabled()) - return; - setDelayCallbacks(true); BEGIN_BLOCK_OBJC_EXCEPTIONS; @@ -810,6 +802,19 @@ void MediaPlayerPrivateAVFoundationObjC::paint(GraphicsContext* context, const I m_videoFrameHasDrawn = true; } +void MediaPlayerPrivateAVFoundationObjC::paint(GraphicsContext* context, const IntRect& rect) +{ + LOG(Media, "MediaPlayerPrivateAVFoundationObjC::paint(%p) - metaDataAvailable = %d", this, metaDataAvailable()); + + if (!metaDataAvailable() || context->paintingDisabled()) + return; + + if (currentRenderingMode() == MediaRenderingToLayer) + return; + + paintCurrentFrameInContext(context, rect); +} + #if __MAC_OS_X_VERSION_MIN_REQUIRED < 1080 void MediaPlayerPrivateAVFoundationObjC::paintWithImageGenerator(GraphicsContext* context, const IntRect& rect) { 919979 3 simon.fraser 2013-08-22 14:58:42 -0700 After some testing, this only happens if the <video> has style that requires it to have a layer (e.g. border, background color, shadow, outline etc), and the painting happens on things like window resize and selection. 922163 4 209917 eric.carlson 2013-08-28 13:08:47 -0700 Created attachment 209917 Proposed patch 922165 5 209917 simon.fraser 2013-08-28 13:16:48 -0700 Comment on attachment 209917 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=209917&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:804 > + > #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 > paintWithVideoOutput(context, rect); > #else > paintWithImageGenerator(context, rect); > #endif > - > + > END_BLOCK_OBJC_EXCEPTIONS; > setDelayCallbacks(false); > - > + Some non-empty lines here. 922172 6 eric.carlson 2013-08-28 13:26:09 -0700 Committed r154775: https://trac.webkit.org/r154775 209917 2013-08-28 13:08:47 -0700 2013-08-28 13:26:17 -0700 Proposed patch patch_1.txt text/plain 3173 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDc3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA4LTI4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakMgaXMgcGFpbnRpbmcgdmlkZW8gZnJhbWVzIHVuZGVyIHRoZSB2 aWRlbyBsYXllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIwMTcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBpdCBpcyBvbmx5IHBvc3NpYmxlIHRvIHRlc3QgaW4gdGhlIGRlYnVn Z2VyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6Omhhc0F2YWlsYWJsZVZpZGVvRnJhbWUp OiBEcml2ZSBieSBvcHRpbWl6YXRpb24uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpwYWludEN1cnJlbnRGcmFtZUluQ29udGV4dCk6IE1vdmUg bG9naWMgZnJvbSBwYWludCBoZXJlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzo6cGFpbnQpOiBEbyBub3RoaW5nIGlmIHdlIGFscmVhZHkgaGF2 ZSBhIHZpZGVvIGxheWVyLAorICAgICAgICAgICAgb3RoZXJ3aXNlIGNhbGwgcGFpbnQoKS4KKwog MjAxMy0wOC0yOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIGNoaWxkIGFuZCBkZXNjZW5kYW50IGNvbnN0IGl0ZXJhdG9ycwpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDLm1tCShyZXZpc2lvbiAxNTQ2ODEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25PYmpDLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zOTAsNyArMzkwLDEwIEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzoKIAogYm9vbCBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDOjpoYXNBdmFpbGFibGVWaWRlb0ZyYW1lKCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gKG1fdmlkZW9GcmFtZUhhc0RyYXduIHx8IChtX3ZpZGVvTGF5ZXIgJiYgW21fdmlkZW9M YXllci5nZXQoKSBpc1JlYWR5Rm9yRGlzcGxheV0pKTsKKyAgICBpZiAoY3VycmVudFJlbmRlcmlu Z01vZGUoKSA9PSBNZWRpYVJlbmRlcmluZ1RvTGF5ZXIpCisgICAgICAgIHJldHVybiBtX3ZpZGVv TGF5ZXIgJiYgW21fdmlkZW9MYXllci5nZXQoKSBpc1JlYWR5Rm9yRGlzcGxheV07CisKKyAgICBy ZXR1cm4gbV92aWRlb0ZyYW1lSGFzRHJhd247CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlQVZBc3NldEZvclVSTChjb25zdCBTdHJpbmcmIHVybCkK QEAgLTc4NywyOSArNzkwLDMzIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u T2JqQzoKICAgICBpZiAoIW1ldGFEYXRhQXZhaWxhYmxlKCkgfHwgY29udGV4dC0+cGFpbnRpbmdE aXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBwYWludChjb250ZXh0LCByZWN0KTsK LX0KLQotdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpwYWludChHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCi17Ci0gICAgaWYgKCFt ZXRhRGF0YUF2YWlsYWJsZSgpIHx8IGNvbnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSkKLSAgICAg ICAgcmV0dXJuOwotCiAgICAgc2V0RGVsYXlDYWxsYmFja3ModHJ1ZSk7CiAgICAgQkVHSU5fQkxP Q0tfT0JKQ19FWENFUFRJT05TOwotCisgICAgCiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMDgwCiAgICAgcGFpbnRXaXRoVmlkZW9PdXRwdXQoY29udGV4dCwgcmVjdCk7 CiAjZWxzZQogICAgIHBhaW50V2l0aEltYWdlR2VuZXJhdG9yKGNvbnRleHQsIHJlY3QpOwogI2Vu ZGlmCi0KKyAgICAKICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogICAgIHNldERlbGF5 Q2FsbGJhY2tzKGZhbHNlKTsKLQorICAgIAogICAgIG1fdmlkZW9GcmFtZUhhc0RyYXduID0gdHJ1 ZTsKIH0KIAordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpwYWludChH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCit7CisgICAgaWYg KCFtZXRhRGF0YUF2YWlsYWJsZSgpIHx8IGNvbnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgLy8gV2UgY2FuIGlnbm9yZSB0aGUgcmVxdWVzdCBpZiB3ZSBh cmUgYWxyZWFkeSByZW5kZXJpbmcgdG8gYSBsYXllci4KKyAgICBpZiAoY3VycmVudFJlbmRlcmlu Z01vZGUoKSA9PSBNZWRpYVJlbmRlcmluZ1RvTGF5ZXIpCisgICAgICAgIHJldHVybjsKKworICAg IHBhaW50Q3VycmVudEZyYW1lSW5Db250ZXh0KGNvbnRleHQsIHJlY3QpOworfQorCiAjaWYgX19N QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwODAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzo6cGFpbnRXaXRoSW1hZ2VHZW5lcmF0b3IoR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogewo=