129278 2014-02-24 17:06:12 -0800 [Win] Gracefully recover from missing "naturalSize" parameter for media 2014-02-25 11:42:11 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue eric.carlson glenn jer.noble philipj sergio oldest_to_newest 984114 0 bfulgham 2014-02-24 17:06:12 -0800 In some cases, we get a zero-size "naturalSize" result when querying the media for its size. When this happens, we should not refuse to play the media. Instead, we should use the player item's "presentationSize". 984115 1 bfulgham 2014-02-24 17:06:53 -0800 <rdar://problem/15952377> 984182 2 225121 bfulgham 2014-02-24 22:09:12 -0800 Created attachment 225121 Patch 984313 3 225121 eric.carlson 2014-02-25 07:45:33 -0800 Comment on attachment 225121 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225121&action=review > Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:758 > + // Don't treat a failure to retrieve these parameters as fatal. We will use @"presentationSize" instead. > + // <rdar://problem/15966685> This comment (and the change log) imply that MediaCharacteristicsWithMediaSelectionOptions is equivalent to NaturalSize. This is seems unlikely. Having separate comparisons for each, with a comment about why it is OK to fail to retrieve MediaCharacteristicsWithMediaSelectionOptions, would be better. > Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:904 > if (AVCFPlayerItemTrackIsEnabled(track)) { > RetainPtr<AVCFAssetTrackRef> assetTrack = adoptCF(AVCFPlayerItemTrackCopyAssetTrack(track)); > + if (!assetTrack) > + continue; This seems odd, please add a comment about why we don't care that a track is enabled but not available. 984414 4 bfulgham 2014-02-25 11:42:11 -0800 Committed r164660: <http://trac.webkit.org/changeset/164660> 225121 2014-02-24 22:09:12 -0800 2014-02-25 07:45:33 -0800 Patch bug-129278-20140224220911.patch text/plain 5712 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDYyOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAyLTI0ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIEdyYWNlZnVsbHkg cmVjb3ZlciBmcm9tIG1pc3NpbmcgJ25hdHVyYWxTaXplJyBwYXJhbWV0ZXIgZm9yIG1lZGlhCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjkyNzgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9BVkZvdW5kYXRpb25DRlNvZnRMaW5raW5nLmg6IEFk ZCBkZWNsYXJhdGlvbiBmb3IKKyAgICAgICAgbWlzc2luZyBmdW5jdGlvbiBjYWxsLgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25DRi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25DRjo6YXNzZXRTdGF0dXMpOiBEb24ndCB0cmVhdCBtaXNzaW5nICduYXR1cmFs U2l6ZScKKyAgICAgICAgYXMgYSBmYXRhbCBlcnJvci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGOjp0cmFja3NDaGFuZ2VkKTogSGFuZGxlIGNhc2Ug b2YgYXNzZXQgdHJhY2sKKyAgICAgICAgbm90IGJlaW5nIGF2YWlsYWJsZSB5ZXQuIAorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6OnNpemVDaGFuZ2Vk KTogSWYgdGhlICduYXR1cmFsU2l6ZScgaXMgZW1wdHksCisgICAgICAgIHVzZSB0aGUgUGxheWVy IEl0ZW0ncyAncHJlc2VudGF0aW9uU2l6ZScgaW5zdGVhZC4KKyAgICAgICAgKFdlYkNvcmU6OkFW RldyYXBwZXI6OnByb2Nlc3NOb3RpZmljYXRpb24pOiBBZGQgbWlzc2luZyBoYW5kbGVyIGZvciBk dXJhdGlvbiBjaGFuZ2VkLgorCiAyMDE0LTAyLTI0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxl LmNvbT4KIAogICAgICAgICBOZWVkIHRvIGluaXRpYWxpemUgVk0gc3RhY2sgZGF0YSBldmVuIHdo ZW4gdGhlIFZNIGlzIG9uIGFuIGV4Y2x1c2l2ZSB0aHJlYWQuCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvQVZGb3VuZGF0aW9uQ0ZTb2Z0TGlu a2luZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9jZi9BVkZvdW5kYXRpb25DRlNvZnRMaW5raW5nLmgJKHJldmlzaW9uIDE2NDU5 NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9B VkZvdW5kYXRpb25DRlNvZnRMaW5raW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBA CiAvKgotICogQ29weXJpZ2h0IChDKSAyMDExLCAyMDEyIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxMiwgMjAxNCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE0 OSw2ICsxNDksOSBAQCBTT0ZUX0xJTktfRExMX0lNUE9SVChBVkZvdW5kYXRpb25DRiwgQVZDCiBT T0ZUX0xJTktfRExMX0lNUE9SVChBVkZvdW5kYXRpb25DRiwgQVZDRlBsYXllckl0ZW1HZXREdXJh dGlvbiwgQ01UaW1lLCBfX2NkZWNsLCAoQVZDRlBsYXllckl0ZW1SZWYgcGxheWVySXRlbSksIChw bGF5ZXJJdGVtKSkKICNkZWZpbmUgQVZDRlBsYXllckl0ZW1HZXREdXJhdGlvbiBzb2Z0TGlua19B VkNGUGxheWVySXRlbUdldER1cmF0aW9uCiAKK1NPRlRfTElOS19ETExfSU1QT1JUKEFWRm91bmRh dGlvbkNGLCBBVkNGUGxheWVySXRlbUdldFByZXNlbnRhdGlvblNpemUsIENHU2l6ZSwgX19jZGVj bCwgKEFWQ0ZQbGF5ZXJJdGVtUmVmIHBsYXllckl0ZW0pLCAocGxheWVySXRlbSkpCisjZGVmaW5l IEFWQ0ZQbGF5ZXJJdGVtR2V0UHJlc2VudGF0aW9uU2l6ZSBzb2Z0TGlua19BVkNGUGxheWVySXRl bUdldFByZXNlbnRhdGlvblNpemUKKwogU09GVF9MSU5LX0RMTF9JTVBPUlQoQVZGb3VuZGF0aW9u Q0YsIEFWQ0ZQbGF5ZXJJdGVtR2V0U3RhdHVzLCBBVkNGUGxheWVySXRlbVN0YXR1cywgX19jZGVj bCwgKEFWQ0ZQbGF5ZXJJdGVtUmVmIHBsYXllckl0ZW0sIENGRXJyb3JSZWYgKmVycm9yT3V0KSwg KHBsYXllckl0ZW0sIGVycm9yT3V0KSkKICNkZWZpbmUgQVZDRlBsYXllckl0ZW1HZXRTdGF0dXMg c29mdExpbmtfQVZDRlBsYXllckl0ZW1HZXRTdGF0dXMKIApJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbkNGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3Bw CShyZXZpc2lvbiAxNjQ1OTYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC03NTEsOCArNzUxLDE1IEBAIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbjo6QXNzZXRTdGEKIAogICAgICAgICBpZiAoa2V5U3RhdHVzIDwgQVZDRlByb3BlcnR5VmFs dWVTdGF0dXNMb2FkZWQpCiAgICAgICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3Rh dHVzTG9hZGluZzsKLSAgICAgICAgaWYgKGtleVN0YXR1cyA9PSBBVkNGUHJvcGVydHlWYWx1ZVN0 YXR1c0ZhaWxlZCkKKyAgICAgICAgaWYgKGtleVN0YXR1cyA9PSBBVkNGUHJvcGVydHlWYWx1ZVN0 YXR1c0ZhaWxlZCkgeworICAgICAgICAgICAgaWYgKChDRlN0cmluZ0NvbXBhcmUoa2V5TmFtZSwg QVZDRkFzc2V0UHJvcGVydHlOYXR1cmFsU2l6ZSwgMCkgPT0ga0NGQ29tcGFyZUVxdWFsVG8pCisg ICAgICAgICAgICAgICAgfHwgKENGU3RyaW5nQ29tcGFyZShrZXlOYW1lLCBBVkNGQXNzZXRQcm9w ZXJ0eUF2YWlsYWJsZU1lZGlhQ2hhcmFjdGVyaXN0aWNzV2l0aE1lZGlhU2VsZWN0aW9uT3B0aW9u cywgMCkgPT0ga0NGQ29tcGFyZUVxdWFsVG8pKSB7CisgICAgICAgICAgICAgICAgLy8gRG9uJ3Qg dHJlYXQgYSBmYWlsdXJlIHRvIHJldHJpZXZlIHRoZXNlIHBhcmFtZXRlcnMgYXMgZmF0YWwuIFdl IHdpbGwgdXNlIEAicHJlc2VudGF0aW9uU2l6ZSIgaW5zdGVhZC4KKyAgICAgICAgICAgICAgICAv LyA8cmRhcjovL3Byb2JsZW0vMTU5NjY2ODU+CisgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXJBVkFzc2V0U3RhdHVz RmFpbGVkOworICAgICAgICB9CiAgICAgICAgIGlmIChrZXlTdGF0dXMgPT0gQVZDRlByb3BlcnR5 VmFsdWVTdGF0dXNDYW5jZWxsZWQpCiAgICAgICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXJBVkFz c2V0U3RhdHVzQ2FuY2VsbGVkOwogICAgIH0KQEAgLTg5Myw2ICs5MDAsOCBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNGOjp0CiAgICAgICAgICAgICAKICAgICAgICAgICAg IGlmIChBVkNGUGxheWVySXRlbVRyYWNrSXNFbmFibGVkKHRyYWNrKSkgewogICAgICAgICAgICAg ICAgIFJldGFpblB0cjxBVkNGQXNzZXRUcmFja1JlZj4gYXNzZXRUcmFjayA9IGFkb3B0Q0YoQVZD RlBsYXllckl0ZW1UcmFja0NvcHlBc3NldFRyYWNrKHRyYWNrKSk7CisgICAgICAgICAgICAgICAg aWYgKCFhc3NldFRyYWNrKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg ICAgICAgICBDRlN0cmluZ1JlZiBtZWRpYVR5cGUgPSBBVkNGQXNzZXRUcmFja0dldE1lZGlhVHlw ZShhc3NldFRyYWNrLmdldCgpKTsKICAgICAgICAgICAgICAgICBpZiAoIW1lZGlhVHlwZSkKICAg ICAgICAgICAgICAgICAgICAgY29udGludWU7CkBAIC05NjMsNiArOTcyLDkgQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6cwogICAgIHRyYWNrUmVjdFVuaW9uID0gQ0dS ZWN0T2Zmc2V0KHRyYWNrUmVjdFVuaW9uLCB0cmFja1JlY3RVbmlvbi5vcmlnaW4ueCwgdHJhY2tS ZWN0VW5pb24ub3JpZ2luLnkpOwogICAgIENHU2l6ZSBuYXR1cmFsU2l6ZSA9IHRyYWNrUmVjdFVu aW9uLnNpemU7CiAKKyAgICBpZiAoIW5hdHVyYWxTaXplLmhlaWdodCAmJiAhbmF0dXJhbFNpemUu d2lkdGggJiYgYXZQbGF5ZXJJdGVtKG1fYXZmV3JhcHBlcikpCisgICAgICAgIG5hdHVyYWxTaXpl ID0gQVZDRlBsYXllckl0ZW1HZXRQcmVzZW50YXRpb25TaXplKGF2UGxheWVySXRlbShtX2F2Zldy YXBwZXIpKTsKKwogICAgIC8vIEFsc28gbG9vayBhdCB0aGUgYXNzZXQncyBwcmVmZXJyZWQgdHJh bnNmb3JtIHNvIHdlIGFjY291bnQgZm9yIGEgbW92aWUgbWF0cml4LgogICAgIENHU2l6ZSBtb3Zp ZVNpemUgPSBDR1NpemVBcHBseUFmZmluZVRyYW5zZm9ybShBVkNGQXNzZXRHZXROYXR1cmFsU2l6 ZShhdkFzc2V0KG1fYXZmV3JhcHBlcikpLCBBVkNGQXNzZXRHZXRQcmVmZXJyZWRUcmFuc2Zvcm0o YXZBc3NldChtX2F2ZldyYXBwZXIpKSk7CiAgICAgaWYgKG1vdmllU2l6ZS53aWR0aCA+IG5hdHVy YWxTaXplLndpZHRoKQpAQCAtMTQ3MCw2ICsxNDgyLDggQEAgdm9pZCBBVkZXcmFwcGVyOjpwcm9j ZXNzTm90aWZpY2F0aW9uKHZvaQogICAgICAgICBzZWxmLT5tX293bmVyLT5zY2hlZHVsZU1haW5U aHJlYWROb3RpZmljYXRpb24oTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpOb3RpZmlj YXRpb246OlBsYXllclJhdGVDaGFuZ2VkKTsKICAgICBlbHNlIGlmIChDRkVxdWFsKHByb3BlcnR5 TmFtZSwgQ0FDRkNvbnRleHROZWVkc0ZsdXNoTm90aWZpY2F0aW9uKCkpKQogICAgICAgICBzZWxm LT5tX293bmVyLT5zY2hlZHVsZU1haW5UaHJlYWROb3RpZmljYXRpb24oTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uOjpOb3RpZmljYXRpb246OkNvbnRlbnRzTmVlZHNEaXNwbGF5KTsKKyAg ICBlbHNlIGlmIChDRkVxdWFsKHByb3BlcnR5TmFtZSwgQVZDRlBsYXllckl0ZW1EdXJhdGlvbkNo YW5nZWROb3RpZmljYXRpb24pKQorICAgICAgICBzZWxmLT5tX293bmVyLT5zY2hlZHVsZU1haW5U aHJlYWROb3RpZmljYXRpb24oTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpOb3RpZmlj YXRpb246OkR1cmF0aW9uQ2hhbmdlZCk7CiAgICAgZWxzZQogICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKIH0K