231225 2021-10-05 03:27:21 -0700 createImageBitmap using a HLS video as source is always black 2021-10-05 16:43:37 -0700 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=231005 https://bugs.webkit.org/show_bug.cgi?id=136872 InRadar, Regression P2 Normal --- 1 jean-yves.avenard jean-yves.avenard eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1800496 0 jean-yves.avenard 2021-10-05 03:27:21 -0700 Seen with bug 231005 MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput checks that we have a video track before creating an image. However to checks if a video track exists it calls AVAssetTrack* firstEnabledVideoTrack = firstEnabledTrack(safeAVAssetTracksForVisualMedia()); safeAVAssetTracksForVisualMedia queries m_avAsset (a AVURLAsset) for the list of track. However, with HLS the AVURLAsset doesn't contain any tracks, instead they are found in the AVPlayerItem instead. 1800537 1 webkit-bug-importer 2021-10-05 06:48:04 -0700 <rdar://problem/83884031> 1800543 2 440208 jean-yves.avenard 2021-10-05 07:01:12 -0700 Created attachment 440208 Patch 1800845 3 ews-feeder 2021-10-05 16:43:36 -0700 Committed r283585 (242543@main): <https://commits.webkit.org/242543@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440208. 440208 2021-10-05 07:01:12 -0700 2021-10-05 16:43:37 -0700 Patch bug-231225-20211006010110.patch text/plain 15071 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1NTIzNWM2ZjExNDk3 ZjJjY2IxNWE0Zjc5N2QyNjM0N2NiZjI0ZC4uZTA1OTRhMDQwYjQzYzNlNjQ0MGE1N2UxNWM5Yzdl YzE1ZDE5MDBhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTEwLTA1ICBKZWFu LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CisKKyAgICAgICAgY3JlYXRlSW1hZ2VCaXRt YXAgdXNpbmcgYSBITFMgdmlkZW8gYXMgc291cmNlIGFsd2F5cyByZXR1cm4gYSBibGFjayBpbWFn ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTIy NQorICAgICAgICByZGFyOi8vODM4ODQwMzEKKworICAgICAgICBXaGVuIHBsYXlpbmcgSExTIGNv bnRlbnQsIFtBVlVSTEFzc2V0IHRyYWNrc10gcmV0dXJuIGFuIGVtcHR5IGFycmF5LgorICAgICAg ICBXZSBuZWVkIHRvIGluc3RlYWQgcmV0cmlldmUgaXQgZnJvbSB0aGUgQVZQbGF5ZXJJdGVtIG9i amVjdC4gVGhlIG1ldGhvZAorICAgICAgICBwYWludFdpdGhWaWRlb091dHB1dCB3b3VsZCBoYXZl IGJhaWxlZCBvdXQgZWFybHkgYXMgYSBjb25zZXF1ZW5jZS4KKyAgICAgICAgU28gd2UgcmVmYWN0 b3IgdGhlIGNvZGUgYSBsaXR0bGUgdG8gcmV0cmlldmUgdGhlIHRyYWNrcyB3aGVyZSB0aGV5IGNh biBiZSBmb3VuZAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRlc3Q6IGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8taGxzLWNvcHktaW50by1jYW52YXMuaHRt bAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMu bW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD OjpjcmVhdGVBVlBsYXllckl0ZW0pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzo6dHJhY2tzQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjp1cGRhdGVSb3RhdGlvblNlc3Npb24p OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 YXVkaW9Tb3VyY2VQcm92aWRlcik6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDOjp1cGRhdGVMYXN0SW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6cGFpbnRXaXRoVmlkZW9PdXRwdXQp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 Zmlyc3RFbmFibGVkVHJhY2sgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Zmlyc3RFbmFibGVkQXVkaWJsZVRyYWNrIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmZp cnN0RW5hYmxlZFZpc2libGVUcmFjayBjb25zdCk6CisKIDIwMjEtMTAtMDQgIEplYW4tWXZlcyBB dmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChNb250ZXJleSk6 IHBhcmFtb3VudHBsdXMuY29tOiBDYW5ub3QgZW50ZXIgZnVsbHNjcmVlbiBpbiBTYWZhcmkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbk9iakMuaAppbmRleCA0MDlhNGRmYWRmZDljNmMyYWI1NmM1Y2IwNGJkODZmZTEz MGZkMmI3Li41YTVhMDAzZTliMTZmM2EyMDIwOTAwOTU5MzYzNjU3Zjc5NjliMmJmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQy5oCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAu aD4KIAogT0JKQ19DTEFTUyBBVkFzc2V0SW1hZ2VHZW5lcmF0b3I7CitPQkpDX0NMQVNTIEFWQXNz ZXRUcmFjazsKIE9CSkNfQ0xBU1MgQVZBc3NldFJlc291cmNlTG9hZGluZ1JlcXVlc3Q7CiBPQkpD X0NMQVNTIEFWTWVkaWFTZWxlY3Rpb25Hcm91cDsKIE9CSkNfQ0xBU1MgQVZPdXRwdXRDb250ZXh0 OwpAQCAtNTAsNiArNTEsNyBAQCBPQkpDX0NMQVNTIFdlYkNvcmVBVkZQdWxsRGVsZWdhdGU7CiAK IHR5cGVkZWYgc3RydWN0IENHSW1hZ2UgKkNHSW1hZ2VSZWY7CiB0eXBlZGVmIHN0cnVjdCBfX0NW QnVmZmVyICpDVlBpeGVsQnVmZmVyUmVmOwordHlwZWRlZiBOU1N0cmluZyAqQVZNZWRpYUNoYXJh Y3RlcmlzdGljOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTI3NSw4ICsyNzcsOSBAQCBw cml2YXRlOgogICAgIEFWTWVkaWFTZWxlY3Rpb25Hcm91cCAqc2FmZU1lZGlhU2VsZWN0aW9uR3Jv dXBGb3JBdWRpYmxlTWVkaWEoKTsKICAgICBBVk1lZGlhU2VsZWN0aW9uR3JvdXAgKnNhZmVNZWRp YVNlbGVjdGlvbkdyb3VwRm9yVmlzdWFsTWVkaWEoKTsKIAotICAgIE5TQXJyYXkgKnNhZmVBVkFz c2V0VHJhY2tzRm9yQXVkaWJsZU1lZGlhKCk7Ci0gICAgTlNBcnJheSAqc2FmZUFWQXNzZXRUcmFj a3NGb3JWaXN1YWxNZWRpYSgpOworICAgIEFWQXNzZXRUcmFjayogZmlyc3RFbmFibGVkQXVkaWJs ZVRyYWNrKCkgY29uc3Q7CisgICAgQVZBc3NldFRyYWNrKiBmaXJzdEVuYWJsZWRWaXNpYmxlVHJh Y2soKSBjb25zdDsKKyAgICBBVkFzc2V0VHJhY2sqIGZpcnN0RW5hYmxlZFRyYWNrKEFWTWVkaWFD aGFyYWN0ZXJpc3RpYykgY29uc3Q7CiAKICNpZiBFTkFCTEUoREFUQUNVRV9WQUxVRSkKICAgICB2 b2lkIHByb2Nlc3NNZXRhZGF0YVRyYWNrKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCBk MWVhZGRjYjgxMjNkY2M0MzQ5Yzg3N2ViNzRhMDk2YTFhNzNmN2FiLi5kOWE4ZmZhZTM0Yzk0N2E3 MTE5ODQxMzRlOGNkOTMyN2RiZGU0NDUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTI0 Nyw3ICsyNDcsNiBAQCBzdGF0aWMgTlNBcnJheSAqYXNzZXRNZXRhZGF0YUtleU5hbWVzKCk7CiBz dGF0aWMgTlNBcnJheSAqaXRlbUtWT1Byb3BlcnRpZXMoKTsKIHN0YXRpYyBOU0FycmF5ICphc3Nl dFRyYWNrTWV0YWRhdGFLZXlOYW1lcygpOwogc3RhdGljIE5TQXJyYXkgKnBsYXllcktWT1Byb3Bl cnRpZXMoKTsKLXN0YXRpYyBBVkFzc2V0VHJhY2sqIGZpcnN0RW5hYmxlZFRyYWNrKE5TQXJyYXkq IHRyYWNrcyk7CiAKIHN0YXRpYyBkaXNwYXRjaF9xdWV1ZV90IGdsb2JhbExvYWRlckRlbGVnYXRl UXVldWUoKQogewpAQCAtMTE2OCw3ICsxMTY3LDcgQEAgQUxMT1dfTkVXX0FQSV9XSVRIT1VUX0dV QVJEU19FTkQKICNpZiBFTkFCTEUoV0VCX0FVRElPKSAmJiBVU0UoTUVESUFUT09MQk9YKQogICAg IGlmIChtX3Byb3ZpZGVyKSB7CiAgICAgICAgIG1fcHJvdmlkZXItPnNldFBsYXllckl0ZW0obV9h dlBsYXllckl0ZW0uZ2V0KCkpOwotICAgICAgICBtX3Byb3ZpZGVyLT5zZXRBdWRpb1RyYWNrKGZp cnN0RW5hYmxlZFRyYWNrKHNhZmVBVkFzc2V0VHJhY2tzRm9yQXVkaWJsZU1lZGlhKCkpKTsKKyAg ICAgICAgbV9wcm92aWRlci0+c2V0QXVkaW9UcmFjayhmaXJzdEVuYWJsZWRBdWRpYmxlVHJhY2so KSk7CiAgICAgfQogI2VuZGlmCiAKQEAgLTIwODYsMTYgKzIwODUsNiBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnVwZGF0ZVZpZGVvTGF5ZXJHcmF2aXR5KCkKICAg ICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOwogfQogCi1zdGF0aWMgQVZBc3NldFRyYWNrKiBmaXJz dEVuYWJsZWRUcmFjayhOU0FycmF5KiB0cmFja3MpCi17Ci0gICAgTlNVSW50ZWdlciBpbmRleCA9 IFt0cmFja3MgaW5kZXhPZk9iamVjdFBhc3NpbmdUZXN0Ol4oaWQgb2JqLCBOU1VJbnRlZ2VyLCBC T09MICopIHsKLSAgICAgICAgcmV0dXJuIFtzdGF0aWNfY2FzdDxBVkFzc2V0VHJhY2sqPihvYmop IGlzRW5hYmxlZF07Ci0gICAgfV07Ci0gICAgaWYgKGluZGV4ID09IE5TTm90Rm91bmQpCi0gICAg ICAgIHJldHVybiBuaWw7Ci0gICAgcmV0dXJuIFt0cmFja3Mgb2JqZWN0QXRJbmRleDppbmRleF07 Ci19Ci0KIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6bWV0YWRhdGFM b2FkZWQoKQogewogICAgIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6bWV0YWRhdGFM b2FkZWQoKTsKQEAgLTIxNDEsOSArMjEzMCw5IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQzo6dHJhY2tzQ2hhbmdlZCgpCiAgICAgaWYgKCFtX2F2UGxheWVySXRlbSkg ewogICAgICAgICAvLyBXZSBkb24ndCBoYXZlIGEgcGxheWVyIGl0ZW0geWV0LCBzbyBjaGVjayB3 aXRoIHRoZSBhc3NldCBiZWNhdXNlIHNvbWUgYXNzZXRzIHN1cHBvcnQgaW5zcGVjdGlvbgogICAg ICAgICAvLyBwcmlvciB0byBiZWNvbWluZyByZWFkeSB0byBwbGF5LgotICAgICAgICBBVkFzc2V0 VHJhY2sqIGZpcnN0RW5hYmxlZFZpZGVvVHJhY2sgPSBmaXJzdEVuYWJsZWRUcmFjayhzYWZlQVZB c3NldFRyYWNrc0ZvclZpc3VhbE1lZGlhKCkpOworICAgICAgICBhdXRvKiBmaXJzdEVuYWJsZWRW aWRlb1RyYWNrID0gZmlyc3RFbmFibGVkVmlzaWJsZVRyYWNrKCk7CiAgICAgICAgIHNldEhhc1Zp ZGVvKGZpcnN0RW5hYmxlZFZpZGVvVHJhY2spOwotICAgICAgICBzZXRIYXNBdWRpbyhmaXJzdEVu YWJsZWRUcmFjayhzYWZlQVZBc3NldFRyYWNrc0ZvckF1ZGlibGVNZWRpYSgpKSk7CisgICAgICAg IHNldEhhc0F1ZGlvKGZpcnN0RW5hYmxlZEF1ZGlibGVUcmFjaygpKTsKICAgICAgICAgYXV0byBz aXplID0gZmlyc3RFbmFibGVkVmlkZW9UcmFjayA/IEZsb2F0U2l6ZShDR1NpemVBcHBseUFmZmlu ZVRyYW5zZm9ybShbZmlyc3RFbmFibGVkVmlkZW9UcmFjayBuYXR1cmFsU2l6ZV0sIFtmaXJzdEVu YWJsZWRWaWRlb1RyYWNrIHByZWZlcnJlZFRyYW5zZm9ybV0pKSA6IEZsb2F0U2l6ZSgpOwogICAg ICAgICAvLyBGb3IgdmlkZW9zIHdpdGggcm90YXRpb24gdGFnIHNldCwgdGhlIHRyYW5zZm9ybWF0 aW9uIGFib3ZlIG1pZ2h0IHJldHVybiBhIENHU2l6ZSBpbnN0YW5jZSB3aXRoIG5lZ2F0aXZlIHdp ZHRoIG9yIGhlaWdodC4KICAgICAgICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzI2NDguCkBAIC0yMjE0LDcgKzIyMDMsNyBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnRyYWNrc0NoYW5nZWQoKQogCiAjaWYgRU5BQkxF KFdFQl9BVURJTykgJiYgVVNFKE1FRElBVE9PTEJPWCkKICAgICBpZiAobV9wcm92aWRlcikKLSAg ICAgICAgbV9wcm92aWRlci0+c2V0QXVkaW9UcmFjayhmaXJzdEVuYWJsZWRUcmFjayhzYWZlQVZB c3NldFRyYWNrc0ZvckF1ZGlibGVNZWRpYSgpKSk7CisgICAgICAgIG1fcHJvdmlkZXItPnNldEF1 ZGlvVHJhY2soZmlyc3RFbmFibGVkQXVkaWJsZVRyYWNrKCkpOwogI2VuZGlmCiAKICAgICBzZXRE ZWxheUNoYXJhY3RlcmlzdGljc0NoYW5nZWROb3RpZmljYXRpb24oZmFsc2UpOwpAQCAtMjIyNyw3 ICsyMjE2LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjp1cGRh dGVSb3RhdGlvblNlc3Npb24oKQogCiAgICAgQWZmaW5lVHJhbnNmb3JtIGZpbmFsVHJhbnNmb3Jt ID0gbV9hdkFzc2V0LmdldCgpLnByZWZlcnJlZFRyYW5zZm9ybTsKICAgICBGbG9hdFNpemUgbmF0 dXJhbFNpemU7Ci0gICAgaWYgKGF1dG8qIGZpcnN0RW5hYmxlZFZpZGVvVHJhY2sgPSBmaXJzdEVu YWJsZWRUcmFjayhzYWZlQVZBc3NldFRyYWNrc0ZvclZpc3VhbE1lZGlhKCkpKSB7CisgICAgaWYg KGF1dG8qIGZpcnN0RW5hYmxlZFZpZGVvVHJhY2sgPSBmaXJzdEVuYWJsZWRWaXNpYmxlVHJhY2so KSkgewogICAgICAgICBuYXR1cmFsU2l6ZSA9IEZsb2F0U2l6ZShmaXJzdEVuYWJsZWRWaWRlb1Ry YWNrLm5hdHVyYWxTaXplKTsKICAgICAgICAgZmluYWxUcmFuc2Zvcm0gKj0gZmlyc3RFbmFibGVk VmlkZW9UcmFjay5wcmVmZXJyZWRUcmFuc2Zvcm07CiAgICAgfQpAQCAtMjQxNyw3ICsyNDA2LDcg QEAgQXVkaW9Tb3VyY2VQcm92aWRlciogTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6YXVkaW9Tb3VyY2VQcm92aWRlcigpCiB7CiAgICAgaWYgKCFtX3Byb3ZpZGVyKSB7CiAgICAg ICAgIG1fcHJvdmlkZXIgPSBBdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2JqQzo6Y3JlYXRlKG1fYXZQ bGF5ZXJJdGVtLmdldCgpKTsKLSAgICAgICAgbV9wcm92aWRlci0+c2V0QXVkaW9UcmFjayhmaXJz dEVuYWJsZWRUcmFjayhzYWZlQVZBc3NldFRyYWNrc0ZvckF1ZGlibGVNZWRpYSgpKSk7CisgICAg ICAgIG1fcHJvdmlkZXItPnNldEF1ZGlvVHJhY2soZmlyc3RFbmFibGVkQXVkaWJsZVRyYWNrKCkp OwogICAgIH0KICAgICByZXR1cm4gbV9wcm92aWRlci5nZXQoKTsKIH0KQEAgLTI1NDUsNiArMjUz NCwxMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnVwZGF0ZUxh c3RJbWFnZShVcGRhdGVUeXBlIHR5cGUpCiAgICAgaWYgKCFtX2F2UGxheWVySXRlbSB8fCByZWFk eVN0YXRlKCkgPCBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZTo6SGF2ZUN1cnJlbnREYXRhKQogICAg ICAgICByZXR1cm47CiAKKyAgICBhdXRvKiBmaXJzdEVuYWJsZWRWaWRlb1RyYWNrID0gZmlyc3RF bmFibGVkVmlzaWJsZVRyYWNrKCk7CisgICAgaWYgKCFmaXJzdEVuYWJsZWRWaWRlb1RyYWNrKQor ICAgICAgICByZXR1cm47CisKICAgICBpZiAodHlwZSA9PSBVcGRhdGVUeXBlOjpVcGRhdGVTeW5j aHJvbm91c2x5ICYmICFtX2xhc3RJbWFnZSAmJiAhdmlkZW9PdXRwdXRIYXNBdmFpbGFibGVGcmFt ZSgpKQogICAgICAgICB3YWl0Rm9yVmlkZW9PdXRwdXRNZWRpYURhdGFXaWxsQ2hhbmdlKCk7CiAK QEAgLTI1NzIsMTAgKzI1NjUsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakM6OnBhaW50V2l0aFZpZGVvT3V0cHV0KEdyYXBoaWNzQ29udGV4dCYgYwogICAgIGlmICgh bV9sYXN0SW1hZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFWQXNzZXRUcmFjayogZmlyc3RF bmFibGVkVmlkZW9UcmFjayA9IGZpcnN0RW5hYmxlZFRyYWNrKHNhZmVBVkFzc2V0VHJhY2tzRm9y VmlzdWFsTWVkaWEoKSk7Ci0gICAgaWYgKCFmaXJzdEVuYWJsZWRWaWRlb1RyYWNrKQotICAgICAg ICByZXR1cm47Ci0KICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSKTsKIAogICAgIEZsb2F0UmVj dCBpbWFnZVJlY3QgeyBGbG9hdFBvaW50Ojp6ZXJvKCksIG1fbGFzdEltYWdlLT5zaXplKCkgfTsK QEAgLTI3NTAsMjYgKzI3MzksNDIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25PYmpDOjpzZXRXYWl0aW5nRm9yS2V5KGJvb2wgd2FpdGluZ0ZvcktleSkKIH0KICNlbmRpZgog Ci1OU0FycmF5KiBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpzYWZlQVZBc3Nl dFRyYWNrc0ZvckF1ZGlibGVNZWRpYSgpCitBVkFzc2V0VHJhY2sqIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakM6OmZpcnN0RW5hYmxlZFRyYWNrKEFWTWVkaWFDaGFyYWN0ZXJpc3Rp YyBjaGFyYWN0ZXJpc3RpYykgY29uc3QKIHsKKyAgICBpZiAobV9hdlBsYXllckl0ZW0pIHsKKyAg ICAgICAgZm9yIChBVlBsYXllckl0ZW1UcmFjayogdHJhY2sgaW4gW21fYXZQbGF5ZXJJdGVtIHRy YWNrc10pIHsKKyAgICAgICAgICAgIGlmICghdHJhY2suZW5hYmxlZCkKKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIGlmICghdHJhY2suYXNzZXRUcmFjaykKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGlmIChbdHJhY2suYXNzZXRUcmFjayBoYXNN ZWRpYUNoYXJhY3RlcmlzdGljOmNoYXJhY3RlcmlzdGljXSkKKyAgICAgICAgICAgICAgICByZXR1 cm4gdHJhY2suYXNzZXRUcmFjazsKKyAgICAgICAgfQorICAgIH0KICAgICBpZiAoIW1fYXZBc3Nl dCkKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIGlmIChbbV9hdkFzc2V0LmdldCgpIHN0YXR1 c09mVmFsdWVGb3JLZXk6QCJ0cmFja3MiIGVycm9yOk5VTExdICE9IEFWS2V5VmFsdWVTdGF0dXNM b2FkZWQpCiAgICAgICAgIHJldHVybiBuaWw7CiAKLSAgICByZXR1cm4gW21fYXZBc3NldCB0cmFj a3NXaXRoTWVkaWFDaGFyYWN0ZXJpc3RpYzpBVk1lZGlhQ2hhcmFjdGVyaXN0aWNBdWRpYmxlXTsK KyAgICByZXR1cm4gW10gKE5TQXJyYXkqIHRyYWNrcykgLT4gQVZBc3NldFRyYWNrKiB7CisgICAg ICAgIE5TVUludGVnZXIgaW5kZXggPSBbdHJhY2tzIGluZGV4T2ZPYmplY3RQYXNzaW5nVGVzdDpe KGlkIG9iaiwgTlNVSW50ZWdlciwgQk9PTCAqKSB7CisgICAgICAgICAgICByZXR1cm4gW3N0YXRp Y19jYXN0PEFWQXNzZXRUcmFjayo+KG9iaikgaXNFbmFibGVkXTsKKyAgICAgICAgfV07CisgICAg ICAgIGlmIChpbmRleCA9PSBOU05vdEZvdW5kKQorICAgICAgICAgICAgcmV0dXJuIG5pbDsKKyAg ICAgICAgcmV0dXJuIFt0cmFja3Mgb2JqZWN0QXRJbmRleDppbmRleF07CisgICAgfShbbV9hdkFz c2V0IHRyYWNrc1dpdGhNZWRpYUNoYXJhY3RlcmlzdGljOmNoYXJhY3RlcmlzdGljXSk7CiB9CiAK LU5TQXJyYXkqIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnNhZmVBVkFzc2V0 VHJhY2tzRm9yVmlzdWFsTWVkaWEoKQorQVZBc3NldFRyYWNrKiBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDOjpmaXJzdEVuYWJsZWRBdWRpYmxlVHJhY2soKSBjb25zdAogewotICAg IGlmICghbV9hdkFzc2V0KQotICAgICAgICByZXR1cm4gbmlsOwotCi0gICAgaWYgKFttX2F2QXNz ZXQuZ2V0KCkgc3RhdHVzT2ZWYWx1ZUZvcktleTpAInRyYWNrcyIgZXJyb3I6TlVMTF0gIT0gQVZL ZXlWYWx1ZVN0YXR1c0xvYWRlZCkKLSAgICAgICAgcmV0dXJuIG5pbDsKKyAgICByZXR1cm4gZmly c3RFbmFibGVkVHJhY2soQVZNZWRpYUNoYXJhY3RlcmlzdGljQXVkaWJsZSk7Cit9CiAKLSAgICBy ZXR1cm4gW21fYXZBc3NldCB0cmFja3NXaXRoTWVkaWFDaGFyYWN0ZXJpc3RpYzpBVk1lZGlhQ2hh cmFjdGVyaXN0aWNWaXN1YWxdOworQVZBc3NldFRyYWNrKiBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDOjpmaXJzdEVuYWJsZWRWaXNpYmxlVHJhY2soKSBjb25zdAoreworICAgIHJl dHVybiBmaXJzdEVuYWJsZWRUcmFjayhBVk1lZGlhQ2hhcmFjdGVyaXN0aWNWaXN1YWwpOwogfQog CiBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6Omhhc0xvYWRlZE1lZGlh U2VsZWN0aW9uR3JvdXBzKCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwODViNzFhYWM1NzlmZDBhZGNjZDg0OTE4NTVjNzRm ODA4MDJmMWI3Li4xNzgxYjgyYmI4MTFiMjI1YzA2OTEwM2M5ZTJhODYxODA2ZjQ1MDYwIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMTAtMDUgIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFw cGxlLmNvbT4KKworICAgICAgICBjcmVhdGVJbWFnZUJpdG1hcCB1c2luZyBhIEhMUyB2aWRlbyBh cyBzb3VyY2UgYWx3YXlzIHJldHVybiBhIGJsYWNrIGltYWdlLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMjI1CisgICAgICAgIHJkYXI6Ly84Mzg4 NDAzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aHR0cC90ZXN0cy9tZWRpYS92aWRlby1obHMtY29weS1pbnRvLWNhbnZhcy1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8taGxzLWNvcHktaW50by1j YW52YXMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDktMjYgIEplYW4tWXZlcyBBdmVuYXJkICA8anlh QGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYVNvdXJjZSBsYXlvdXQgdGVzdHMgc2hvdWxkIGJl IGVuYWJsZWQgb24gaVBhZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRp YS92aWRlby1obHMtY29weS1pbnRvLWNhbnZhcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL21lZGlhL3ZpZGVvLWhscy1jb3B5LWludG8tY2FudmFzLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5mYjhhMmY3MzgwZjE0ZTBjMzc5NjkyMmU1NmM2OTE4MmU3MmI0NDk4Ci0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1obHMtY29w eS1pbnRvLWNhbnZhcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAorCitDaGVjayB0aGF0 IGNyZWF0aW5nIGFuIEltYWdlQml0bWFwIGZyb20gYSB2aWRlbyBzdWNjZWVkcy4KKworCisqKiBT ZXQgdmlkZW8uc3JjLCB3YWl0IGZvciBtZWRpYSBkYXRhIHRvIGxvYWQKK1JVTih2aWRlby5zcmMg PSAnaHR0cDovLzEyNy4wLjAuMTo4MDAwL21lZGlhL3Jlc291cmNlcy9obHMvbWV0YWRhdGEvcHJv Z19pbmRleC5tM3U4JykKKworRVZFTlQoY2FucGxheXRocm91Z2gpCitFWFBFQ1RFRCAoaW1hZ2VC aXRtYXAgaW5zdGFuY2VvZiBJbWFnZUJpdG1hcCA9PSAndHJ1ZScpIE9LCitFWFBFQ1RFRCAoaW1h Z2VCaXRtYXAud2lkdGggIT0gMCA9PSAndHJ1ZScpIE9LCitFWFBFQ1RFRCAoaW1hZ2VCaXRtYXAu aGVpZ2h0ICE9IDAgPT0gJ3RydWUnKSBPSworSW1hZ2UgaXNuJ3QgYWxsIGJsYWNrIFxvLworRU5E IE9GIFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92aWRl by1obHMtY29weS1pbnRvLWNhbnZhcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRp YS92aWRlby1obHMtY29weS1pbnRvLWNhbnZhcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQzYWM3MWYxZmM0 MzYxNzZlMWZiZGYzZTI5NGI1NmUyMmIwMTE3NWUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLWhscy1jb3B5LWludG8tY2FudmFzLmh0bWwKQEAg LTAsMCArMSw2OCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAg ICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNo YXJzZXQ9dXRmLTgiIC8+CisKKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vLi4vbWVkaWEtcmVzb3Vy Y2VzL3ZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+CisKKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAg ICAgIHZhciBpbWFnZUJpdG1hcDsKKworICAgICAgICAgICAgZnVuY3Rpb24gZ2V0Q29sb3JJbmRp Y2VzRm9yQ29vcmQoeCwgeSwgd2lkdGgpIHsKKyAgICAgICAgICAgICAgICB2YXIgcmVkID0geSAq ICh3aWR0aCAqIDQpICsgeCAqIDQ7CisgICAgICAgICAgICAgICAgcmV0dXJuIFtyZWQsIHJlZCAr IDEsIHJlZCArIDIsIHJlZCArIDNdOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBhc3lu YyBmdW5jdGlvbiBjYW5wbGF5dGhyb3VnaCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgLy8gQXMgd2UgY2FuJ3QgZ3VhcmFudGVlIHdoZW4gYW4gYWN0dWFsIGltYWdlIHdpbGwgZ2V0 IHBhaW50ZWQ7CisgICAgICAgICAgICAgICAgLy8gd2UgbG9vcCB1bnRpbCB0aGUgY29uZGl0aW9u IGJlY29tZXMgdHJ1ZTogYSBwaXhlbCBpbiB0aGUgY2VudHJlIGlzIG5vIGxvbmdlciBibGFjay4K KyAgICAgICAgICAgICAgICBsZXQgZmlyc3RSdW4gPSB0cnVlOworICAgICAgICAgICAgICAgIGZv ciAoOzspIHsKKyAgICAgICAgICAgICAgICAgICAgaW1hZ2VCaXRtYXAgPSBhd2FpdCBjcmVhdGVJ bWFnZUJpdG1hcCh2aWRlbyk7CisgICAgICAgICAgICAgICAgICAgIGlmIChmaXJzdFJ1bikgewor ICAgICAgICAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJpbWFnZUJpdG1hcCBpbnN0YW5j ZW9mIEltYWdlQml0bWFwIiwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0RXhw ZWN0ZWQoImltYWdlQml0bWFwLndpZHRoICE9IDAiLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIHRlc3RFeHBlY3RlZCgiaW1hZ2VCaXRtYXAuaGVpZ2h0ICE9IDAiLCB0cnVlKTsKKyAg ICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBsZXQgY3R4ID0gYzEuZ2V0 Q29udGV4dCgiMmQiKTsKKyAgICAgICAgICAgICAgICAgICAgY3R4LmRyYXdJbWFnZShpbWFnZUJp dG1hcCwgMCwgMCk7CisgICAgICAgICAgICAgICAgICAgIGNvbnN0IGltYWdlRGF0YSA9IGN0eC5n ZXRJbWFnZURhdGEoMCwgMCwgYzEud2lkdGgsIGMxLmhlaWdodCk7CisgICAgICAgICAgICAgICAg ICAgIC8vIEF0IHRoZSBjZW50cmUgb2YgdGhlIHZpZGVvIHdlIGhhdmUgYSBjaXJjbGUsIGVuc3Vy ZSB0aGF0IGl0J3Mgbm90IGJsYWNrLgorICAgICAgICAgICAgICAgICAgICBsZXQgY29sb3JJbmRp Y2VzID0gZ2V0Q29sb3JJbmRpY2VzRm9yQ29vcmQoaW1hZ2VCaXRtYXAud2lkdGggLyAyLCBpbWFn ZUJpdG1hcC5oZWlnaHQgLyAyLCBjMS53aWR0aCk7CisgICAgICAgICAgICAgICAgICAgIGxldCBy ZWRJbmRleCA9IGNvbG9ySW5kaWNlc1swXTsKKyAgICAgICAgICAgICAgICAgICAgbGV0IGdyZWVu SW5kZXggPSBjb2xvckluZGljZXNbMV07CisgICAgICAgICAgICAgICAgICAgIGxldCBibHVlSW5k ZXggPSBjb2xvckluZGljZXNbMl07CisgICAgICAgICAgICAgICAgICAgIGxldCBhbHBoYUluZGV4 ID0gY29sb3JJbmRpY2VzWzNdOworCisgICAgICAgICAgICAgICAgICAgIGxldCByZWRGb3JDb29y ZCA9IGltYWdlRGF0YS5kYXRhW3JlZEluZGV4XTsKKyAgICAgICAgICAgICAgICAgICAgbGV0IGdy ZWVuRm9yQ29vcmQgPSBpbWFnZURhdGEuZGF0YVtncmVlbkluZGV4XTsKKyAgICAgICAgICAgICAg ICAgICAgbGV0IGJsdWVGb3JDb29yZCA9IGltYWdlRGF0YS5kYXRhW2JsdWVJbmRleF07CisgICAg ICAgICAgICAgICAgICAgIGxldCBhbHBoYUZvckNvb3JkID0gaW1hZ2VEYXRhLmRhdGFbYWxwaGFJ bmRleF07CisKKyAgICAgICAgICAgICAgICAgICAgaWYgKHJlZEZvckNvb3JkICE9IDAgJiYgZ3Jl ZW5Gb3JDb29yZCAhPSAwICYmIGJsdWVGb3JDb29yZCAhPSAwICYmIGFscGhhRm9yQ29vcmQgPT0g MjU1KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIkltYWdlIGlzbid0 IGFsbCBibGFjayBcXG8vIik7CisgICAgICAgICAgICAgICAgICAgICAgICBlbmRUZXN0KCk7Cisg ICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgICAgICBmaXJzdFJ1biA9IGZhbHNlOworICAgICAgICAgICAgICAgICAgICBh d2FpdCBzbGVlcEZvcigxMDApOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgZnVuY3Rpb24gc3RhcnQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIGNvbnNvbGVXcml0ZSgiPGJyPjxlbT4qKiBTZXQgdmlkZW8uc3JjLCB3YWl0IGZvciBtZWRp YSBkYXRhIHRvIGxvYWQ8L2VtPiIpOworICAgICAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQo KTsKKyAgICAgICAgICAgICAgICBydW4oInZpZGVvLnNyYyA9ICdodHRwOi8vMTI3LjAuMC4xOjgw MDAvbWVkaWEvcmVzb3VyY2VzL2hscy9tZXRhZGF0YS9wcm9nX2luZGV4Lm0zdTgnIik7CisgICAg ICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZl bnRPbmNlKCJjYW5wbGF5dGhyb3VnaCIsIGNhbnBsYXl0aHJvdWdoKTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ic3RhcnQo KSI+CisgICAgICAgIDx2aWRlbyBjb250cm9scz48L3ZpZGVvPgorICAgICAgICA8cD5DaGVjayB0 aGF0IGNyZWF0aW5nIGFuIEltYWdlQml0bWFwIGZyb20gYSB2aWRlbyBzdWNjZWVkcy48L3A+Cisg ICAgICAgIDxjYW52YXMgaWQ9ImMxIiB3aWR0aD0iNjQwIiBoZWlnaHQ9IjQ4MCI+PC9jYW52YXM+ CisgICAgPC9ib2R5PgorPC9odG1sPgo=