215127 2020-08-04 08:49:57 -0700 Update AudioSampleDataSource offset computation 2020-09-23 16:27:05 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 215125 216703 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1677628 0 youennf 2020-08-04 08:49:57 -0700 Update AudioSampleDataSource offset computation 1677629 1 youennf 2020-08-04 08:50:37 -0700 <rdar://problem/65938265> 1677639 2 405924 youennf 2020-08-04 09:19:46 -0700 Created attachment 405924 Patch 1677901 3 ews-feeder 2020-08-05 01:11:54 -0700 Committed r265280: <https://trac.webkit.org/changeset/265280> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405924. 405924 2020-08-04 09:19:46 -0700 2020-08-05 01:11:55 -0700 Patch bug-215127-20200804181944.patch text/plain 12421 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM4MmQ1YjIxNDljYzdk NDhkNDMwMGNjZDhlZDI4NjhiMjNjOTUwNC4uNzc0YmM3OTRlMmRhMDRkNWJlYzc5YzczMmIxNDAz YzVkODM2ZjdjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA4LTA0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgQXVkaW9TYW1w bGVEYXRhU291cmNlIG9mZnNldCBjb21wdXRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1MTI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82 NTkzODI2NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBcyBwZXIgbG9ncywgaXQgc29tZXRpbWVzIGhhcHBlbnMgdGhhdCB0aGUgb2Zmc2V0IGlzIHNv IGJpZyB0aGF0IHRoZSB0aW1lc3RhbXAgaXMgYmVsb3cgdGhlIHN0YXJ0IG9mIHRoZSB3aW5kb3cu CisgICAgICAgIEluIHRoYXQgY2FzZSwgb3VyIGxvZ2ljIGlzIG5vdCBhYmxlIHRvIGNhdGNoIHVw IGFuZCByZWR1Y2UgdGhlIG9mZnNldC4KKyAgICAgICAgVG8gaGFuZGxlIHRoaXMsIHdlIHNwZWNp YWwgY2FzZSBpZiB0aGUgdGltZXN0YW1wIGlzIGJlbG93IHRoZSBzdGFydCBmcmFtZSBhbmQgZG8g YXMgaWYgd2Ugd2VyZSBzdGFydGluZyBmcm9tIHNjcmF0Y2guCisgICAgICAgIE90aGVyd2lzZSwg d2UgY29udGludWUgb3VyIGxvZ2ljIHRvIGZpbmUgdHVuZSB0aGUgb2Zmc2V0IGJ5IHNsb3dseSBt YWtpbmcgaXQgYmlnZ2VyIHRvIG5vdCBoaXQgdGhlIGVuZCBvZiB0aGUgd2luZG93IGJ1dCBzdGls bCBiZSBjbG9zZSB0byBpdC4KKyAgICAgICAgVXBkYXRlZCBsb2dnaW5nIHRvIGhlbHAgZnVydGhl ciBkZWJ1Z2dpbmcgdGhpcyBpc3N1ZSBpZiBuZWVkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9h dWRpby9tYWMvQXVkaW9TYW1wbGVEYXRhU291cmNlLmg6CisgICAgICAgICogcGxhdGZvcm0vYXVk aW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlv U2FtcGxlRGF0YVNvdXJjZTo6cHVzaFNhbXBsZXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3Jl Ojpjb21wdXRlT2Zmc2V0RGVsYXkpOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9TYW1wbGVEYXRh U291cmNlOjpwdWxsU2FtcGxlc0ludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU2Ft cGxlRGF0YVNvdXJjZTo6cHVsbEF2YWxhaWJsZVNhbXBsZXNBc0NodW5rcyk6CisgICAgICAgICog cGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29h LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29h OjpPbkRhdGEpOgorCiAyMDIwLTA4LTA0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpzZXRQYXVzZWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb1NhbXBsZURh dGFTb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb1NhbXBs ZURhdGFTb3VyY2UuaAppbmRleCBhZmM0YjgzZWM5Y2U3OGExNmNmNTdkNWU2ZjhkYjdhOGRhZGVh NTg5Li4yNmJhZWU2MzI4MjYyYzQyYzQ0NjdjZWVkM2Q5ZGE4MGE3NzdmZGZhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9TYW1wbGVEYXRhU291cmNl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0 YVNvdXJjZS5oCkBAIC0xMTMsNyArMTEzLDcgQEAgcHJpdmF0ZToKIAogICAgIGZsb2F0IG1fdm9s dW1lIHsgMS4wIH07CiAgICAgYm9vbCBtX211dGVkIHsgZmFsc2UgfTsKLSAgICBib29sIG1fdHJh bnNpdGlvbmluZ0Zyb21QYXVzZWQgeyB0cnVlIH07CisgICAgYm9vbCBtX3Nob3VsZENvbXB1dGVP dXRwdXRTYW1wbGVPZmZzZXQgeyB0cnVlIH07CiAKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQK ICAgICBSZWY8Y29uc3QgTG9nZ2VyPiBtX2xvZ2dlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9BdWRpb1NhbXBsZURhdGFTb3VyY2UubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMvQXVkaW9TYW1wbGVEYXRhU291cmNlLm1tCmluZGV4 IGY2ZWQyMDFkNWZlZDk0OTJjZWY3NjM2YjY0Mzk3OGY4ZTk5ZmRmNzIuLjk5ODg5ZWVjYTBjYmJl MmU4NjRhNDc1YTM2NzJiMTRkYmNiYmU1YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2F1ZGlvL21hYy9BdWRpb1NhbXBsZURhdGFTb3VyY2UubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYXVkaW8vbWFjL0F1ZGlvU2FtcGxlRGF0YVNvdXJjZS5tbQpAQCAtMTYz LDggKzE2Myw4IEBAIHZvaWQgQXVkaW9TYW1wbGVEYXRhU291cmNlOjpwdXNoU2FtcGxlc0ludGVy bmFsKGNvbnN0IEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyTGlzCiAKICAgICBpZiAobV9pbnB1dFNh bXBsZU9mZnNldCA9PSBNZWRpYVRpbWU6OmludmFsaWRUaW1lKCkpIHsKICAgICAgICAgbV9pbnB1 dFNhbXBsZU9mZnNldCA9IE1lZGlhVGltZSgxIC0gc2FtcGxlVGltZS50aW1lVmFsdWUoKSwgc2Ft cGxlVGltZS50aW1lU2NhbGUoKSk7Ci0gICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dl dF9tYWluX3F1ZXVlKCksIFtpbnB1dFNhbXBsZU9mZnNldCA9IG1faW5wdXRTYW1wbGVPZmZzZXQu dGltZVZhbHVlKCksIG1heGltdW1TYW1wbGVDb3VudCA9IG1fbWF4aW11bVNhbXBsZUNvdW50LCB0 aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cigqdGhpcyldIHsKLSAgICAgICAgICAgIEVS Uk9SX0xPRygicHVzaFNhbXBsZXM6IGlucHV0IHNhbXBsZSBvZmZzZXQgaXMgIiwgaW5wdXRTYW1w bGVPZmZzZXQsICIsIG1heGltdW1TYW1wbGVDb3VudCA9ICIsIG1heGltdW1TYW1wbGVDb3VudCk7 CisgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFtsb2dJ ZGVudGlmaWVyID0gTE9HSURFTlRJRklFUiwgaW5wdXRTYW1wbGVPZmZzZXQgPSBtX2lucHV0U2Ft cGxlT2Zmc2V0LnRpbWVWYWx1ZSgpLCBtYXhpbXVtU2FtcGxlQ291bnQgPSBtX21heGltdW1TYW1w bGVDb3VudCwgdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWZQdHIoKnRoaXMpXSB7CisgICAg ICAgICAgICBBTFdBWVNfTE9HKGxvZ0lkZW50aWZpZXIsICJpbnB1dCBzYW1wbGUgb2Zmc2V0IGlz ICIsIGlucHV0U2FtcGxlT2Zmc2V0LCAiLCBtYXhpbXVtU2FtcGxlQ291bnQgaXMgIiwgbWF4aW11 bVNhbXBsZUNvdW50KTsKICAgICAgICAgfSk7CiAgICAgfQogICAgIHNhbXBsZVRpbWUgKz0gbV9p bnB1dFNhbXBsZU9mZnNldDsKQEAgLTE3NywxNiArMTc3LDYgQEAgdm9pZCBBdWRpb1NhbXBsZURh dGFTb3VyY2U6OnB1c2hTYW1wbGVzSW50ZXJuYWwoY29uc3QgQXVkaW9CdWZmZXJMaXN0JiBidWZm ZXJMaXMKIAogICAgIG1fcmluZ0J1ZmZlci0+c3RvcmUoc2FtcGxlQnVmZmVyTGlzdCwgc2FtcGxl Q291bnQsIHNhbXBsZVRpbWUudGltZVZhbHVlKCkpOwogICAgIG1fbGFzdFB1c2hlZFNhbXBsZUNv dW50ID0gc2FtcGxlQ291bnQ7Ci0KLSNpZiAhTE9HX0RJU0FCTEVECi0gICAgdWludDY0X3Qgc3Rh cnRGcmFtZTIgPSAwOwotICAgIHVpbnQ2NF90IGVuZEZyYW1lMiA9IDA7Ci0gICAgbV9yaW5nQnVm ZmVyLT5nZXRDdXJyZW50RnJhbWVCb3VuZHMoc3RhcnRGcmFtZTIsIGVuZEZyYW1lMik7Ci0gICAg ZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3NhbXBsZUNvdW50LCBz YW1wbGVUaW1lLCBwcmVzZW50YXRpb25UaW1lLCBhYnNvbHV0ZVRpbWUgPSBtYWNoX2Fic29sdXRl X3RpbWUoKSwgc3RhcnRGcmFtZTEsIGVuZEZyYW1lMSwgc3RhcnRGcmFtZTIsIGVuZEZyYW1lMl0g ewotICAgICAgICBMT0coTWVkaWFDYXB0dXJlU2FtcGxlcywgIkBAIHB1c2hTYW1wbGVzOiBhZGRl ZCAlbGQgc2FtcGxlcyBmb3IgdGltZSA9ICVzICh3YXMgJXMpLCBtYWNoIHRpbWUgPSAlbGxkIiwg c2FtcGxlQ291bnQsIHRvU3RyaW5nKHNhbXBsZVRpbWUpLnV0ZjgoKS5kYXRhKCksIHRvU3RyaW5n KHByZXNlbnRhdGlvblRpbWUpLnV0ZjgoKS5kYXRhKCksIGFic29sdXRlVGltZSk7Ci0gICAgICAg IExPRyhNZWRpYUNhcHR1cmVTYW1wbGVzLCAiQEAgcHVzaFNhbXBsZXM6IGJ1ZmZlcmVkIHJhbmdl IHdhcyBbJWxsZCAuLiAlbGxkXSwgaXMgWyVsbGQgLi4gJWxsZF0iLCBzdGFydEZyYW1lMSwgZW5k RnJhbWUxLCBzdGFydEZyYW1lMiwgZW5kRnJhbWUyKTsKLSAgICB9KTsKLSNlbmRpZgogfQogCiB2 b2lkIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVzaFNhbXBsZXMoY29uc3QgQXVkaW9TdHJlYW1C YXNpY0Rlc2NyaXB0aW9uJiBzYW1wbGVEZXNjcmlwdGlvbiwgQ01TYW1wbGVCdWZmZXJSZWYgc2Ft cGxlQnVmZmVyKQpAQCAtMjA0LDYgKzE5NCwyMSBAQCB2b2lkIEF1ZGlvU2FtcGxlRGF0YVNvdXJj ZTo6cHVzaFNhbXBsZXMoY29uc3QgTWVkaWFUaW1lJiBzYW1wbGVUaW1lLCBjb25zdCBQbGF0Zgog ICAgIHB1c2hTYW1wbGVzSW50ZXJuYWwoKmRvd25jYXN0PFdlYkF1ZGlvQnVmZmVyTGlzdD4oYXVk aW9EYXRhKS5saXN0KCksIHNhbXBsZVRpbWUsIHNhbXBsZUNvdW50KTsKIH0KIAorc3RhdGljIGlu bGluZSBpbnQ2NF90IGNvbXB1dGVPZmZzZXREZWxheShkb3VibGUgc2FtcGxlUmF0ZSwgdWludDY0 X3QgbGFzdFB1c2hlZFNhbXBsZUNvdW50KQoreworICAgIGNvbnN0IGRvdWJsZSB0d2VudHlNUyA9 IC4wMjsKKyAgICBjb25zdCBkb3VibGUgdGVuTVMgPSAuMDE7CisgICAgY29uc3QgZG91YmxlIGZp dmVNUyA9IC4wMDU7CisKKyAgICBpZiAobGFzdFB1c2hlZFNhbXBsZUNvdW50ID4gc2FtcGxlUmF0 ZSAqIHR3ZW50eU1TKQorICAgICAgICByZXR1cm4gc2FtcGxlUmF0ZSAqIHR3ZW50eU1TOworICAg IGlmIChsYXN0UHVzaGVkU2FtcGxlQ291bnQgPiBzYW1wbGVSYXRlICogdGVuTVMpCisgICAgICAg IHJldHVybiBzYW1wbGVSYXRlICogdGVuTVM7CisgICAgaWYgKGxhc3RQdXNoZWRTYW1wbGVDb3Vu dCA+IHNhbXBsZVJhdGUgKiBmaXZlTVMpCisgICAgICAgIHJldHVybiBzYW1wbGVSYXRlICogZml2 ZU1TOworICAgIHJldHVybiAwOworfQorCiBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVs bFNhbXBsZXNJbnRlcm5hbChBdWRpb0J1ZmZlckxpc3QmIGJ1ZmZlciwgc2l6ZV90JiBzYW1wbGVD b3VudCwgdWludDY0X3QgdGltZVN0YW1wLCBkb3VibGUgLypob3N0VGltZSovLCBQdWxsTW9kZSBt b2RlKQogewogICAgIHNpemVfdCBieXRlQ291bnQgPSBzYW1wbGVDb3VudCAqIG1fb3V0cHV0RGVz Y3JpcHRpb24tPmJ5dGVzUGVyRnJhbWUoKTsKQEAgLTIyNSw3ICsyMzAsNyBAQCBib29sIEF1ZGlv U2FtcGxlRGF0YVNvdXJjZTo6cHVsbFNhbXBsZXNJbnRlcm5hbChBdWRpb0J1ZmZlckxpc3QmIGJ1 ZmZlciwgc2l6ZV90JgogICAgIHVpbnQ2NF90IGVuZEZyYW1lID0gMDsKICAgICBtX3JpbmdCdWZm ZXItPmdldEN1cnJlbnRGcmFtZUJvdW5kcyhzdGFydEZyYW1lLCBlbmRGcmFtZSk7CiAKLSAgICBp ZiAobV90cmFuc2l0aW9uaW5nRnJvbVBhdXNlZCkgeworICAgIGlmIChtX3Nob3VsZENvbXB1dGVP dXRwdXRTYW1wbGVPZmZzZXQpIHsKICAgICAgICAgdWludDY0X3QgYnVmZmVyZWQgPSBlbmRGcmFt ZSAtIHN0YXJ0RnJhbWU7CiAgICAgICAgIGlmIChidWZmZXJlZCA8IHNhbXBsZUNvdW50ICogMikg ewogICAgICAgICAgICAgQXVkaW9TYW1wbGVCdWZmZXJMaXN0Ojp6ZXJvQUJMKGJ1ZmZlciwgYnl0 ZUNvdW50KTsKQEAgLTIzMyw1MSArMjM4LDM1IEBAIGJvb2wgQXVkaW9TYW1wbGVEYXRhU291cmNl OjpwdWxsU2FtcGxlc0ludGVybmFsKEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyLCBzaXplX3QmCiAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KIAotICAgICAgICBjb25zdCBkb3Vi bGUgdHdlbnR5TVMgPSAuMDI7Ci0gICAgICAgIGNvbnN0IGRvdWJsZSB0ZW5NUyA9IC4wMTsKLSAg ICAgICAgY29uc3QgZG91YmxlIGZpdmVNUyA9IC4wMDU7Ci0gICAgICAgIGRvdWJsZSBzYW1wbGVS YXRlID0gbV9vdXRwdXREZXNjcmlwdGlvbi0+c2FtcGxlUmF0ZSgpOworICAgICAgICBtX3Nob3Vs ZENvbXB1dGVPdXRwdXRTYW1wbGVPZmZzZXQgPSBmYWxzZTsKKwogICAgICAgICBtX291dHB1dFNh bXBsZU9mZnNldCA9IChlbmRGcmFtZSAtIHNhbXBsZUNvdW50KSAtIHRpbWVTdGFtcDsKLSAgICAg ICAgaWYgKG1fbGFzdFB1c2hlZFNhbXBsZUNvdW50ID4gc2FtcGxlUmF0ZSAqIHR3ZW50eU1TKQot ICAgICAgICAgICAgbV9vdXRwdXRTYW1wbGVPZmZzZXQgLT0gc2FtcGxlUmF0ZSAqIHR3ZW50eU1T OwotICAgICAgICBlbHNlIGlmIChtX2xhc3RQdXNoZWRTYW1wbGVDb3VudCA+IHNhbXBsZVJhdGUg KiB0ZW5NUykKLSAgICAgICAgICAgIG1fb3V0cHV0U2FtcGxlT2Zmc2V0IC09IHNhbXBsZVJhdGUg KiB0ZW5NUzsKLSAgICAgICAgZWxzZSBpZiAobV9sYXN0UHVzaGVkU2FtcGxlQ291bnQgPiBzYW1w bGVSYXRlICogZml2ZU1TKQotICAgICAgICAgICAgbV9vdXRwdXRTYW1wbGVPZmZzZXQgLT0gc2Ft cGxlUmF0ZSAqIGZpdmVNUzsKLQotICAgICAgICBtX3RyYW5zaXRpb25pbmdGcm9tUGF1c2VkID0g ZmFsc2U7CisgICAgICAgIG1fb3V0cHV0U2FtcGxlT2Zmc2V0IC09IGNvbXB1dGVPZmZzZXREZWxh eShtX291dHB1dERlc2NyaXB0aW9uLT5zYW1wbGVSYXRlKCksIG1fbGFzdFB1c2hlZFNhbXBsZUNv dW50KTsKKyAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwg W2xvZ0lkZW50aWZpZXIgPSBMT0dJREVOVElGSUVSLCBvdXRwdXRTYW1wbGVPZmZzZXQgPSBtX291 dHB1dFNhbXBsZU9mZnNldCwgdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWZQdHIoKnRoaXMp XSB7CisgICAgICAgICAgICBBTFdBWVNfTE9HKGxvZ0lkZW50aWZpZXIsICJzZXR0aW5nIG5ldyBv ZmZzZXQgdG8gIiwgb3V0cHV0U2FtcGxlT2Zmc2V0KTsKKyAgICAgICAgfSk7CiAgICAgfQogCiAg ICAgdGltZVN0YW1wICs9IG1fb3V0cHV0U2FtcGxlT2Zmc2V0OwogCi0jaWYgIUxPR19ESVNBQkxF RAotICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFtzYW1wbGVD b3VudCwgdGltZVN0YW1wLCBzYW1wbGVPZmZzZXQgPSBtX291dHB1dFNhbXBsZU9mZnNldF0gewot ICAgICAgICBMT0coTWVkaWFDYXB0dXJlU2FtcGxlcywgIioqIHB1bGxTYW1wbGVzSW50ZXJuYWw6 IGFza2luZyBmb3IgJWxkIHNhbXBsZXMgYXQgdGltZSA9ICVsbGQgKHdhcyAlbGxkKSIsIHNhbXBs ZUNvdW50LCB0aW1lU3RhbXAsIHRpbWVTdGFtcCAtIHNhbXBsZU9mZnNldCk7Ci0gICAgfSk7Ci0j ZW5kaWYKLQotICAgIHVpbnQ2NF90IGZyYW1lc0F2YWlsYWJsZSA9IHNhbXBsZUNvdW50OwogICAg IGlmICh0aW1lU3RhbXAgPCBzdGFydEZyYW1lIHx8IHRpbWVTdGFtcCArIHNhbXBsZUNvdW50ID4g ZW5kRnJhbWUpIHsKLSAgICAgICAgaWYgKHRpbWVTdGFtcCArIHNhbXBsZUNvdW50IDwgc3RhcnRG cmFtZSB8fCB0aW1lU3RhbXAgPj0gZW5kRnJhbWUpCi0gICAgICAgICAgICBmcmFtZXNBdmFpbGFi bGUgPSAwOwotICAgICAgICBlbHNlIGlmICh0aW1lU3RhbXAgPCBzdGFydEZyYW1lKQotICAgICAg ICAgICAgZnJhbWVzQXZhaWxhYmxlID0gdGltZVN0YW1wICsgc2FtcGxlQ291bnQgLSBzdGFydEZy YW1lOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBmcmFtZXNBdmFpbGFibGUgPSB0aW1lU3Rh bXAgKyBzYW1wbGVDb3VudCAtIGVuZEZyYW1lOwotCi0jaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVE Ci0gICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFt0aW1l U3RhbXAsIHN0YXJ0RnJhbWUsIGVuZEZyYW1lLCBmcmFtZXNBdmFpbGFibGUsIHNhbXBsZUNvdW50 LCB0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cigqdGhpcyldIHsKLSAgICAgICAgICAg IEFMV0FZU19MT0coInNhbXBsZSAiLCB0aW1lU3RhbXAsICIgaXMgbm90IGNvbXBsZXRlbHkgaW4g cmFuZ2UgWyIsIHN0YXJ0RnJhbWUsICIgLi4gIiwgZW5kRnJhbWUsICJdLCByZXR1cm5pbmcgIiwg ZnJhbWVzQXZhaWxhYmxlLCAiIGZyYW1lcyIpOwotICAgICAgICAgICAgaWYgKGZyYW1lc0F2YWls YWJsZSA8IHNhbXBsZUNvdW50KQotICAgICAgICAgICAgICAgIEVSUk9SX0xPRygibm90IGVub3Vn aCBkYXRhIGF2YWlsYWJsZSwgcmV0dXJuaW5nIHplcm9lcyIpOworICAgICAgICBkaXNwYXRjaF9h c3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbbG9nSWRlbnRpZmllciA9IExPR0lERU5U SUZJRVIsIHRpbWVTdGFtcCwgc3RhcnRGcmFtZSwgZW5kRnJhbWUsIHNhbXBsZUNvdW50LCBvdXRw dXRTYW1wbGVPZmZzZXQgPSBtX291dHB1dFNhbXBsZU9mZnNldCwgdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWZQdHIoKnRoaXMpXSB7CisgICAgICAgICAgICBFUlJPUl9MT0cobG9nSWRlbnRp ZmllciwgIm5vdCBlbm91Z2ggZGF0YSwgc2FtcGxlICIsIHRpbWVTdGFtcCwgIiB3aXRoIG9mZnNl dCAiLCBvdXRwdXRTYW1wbGVPZmZzZXQsICIsIHRyeWluZyB0byBnZXQgIiwgc2FtcGxlQ291bnQs ICIgc2FtcGxlcywgYnV0IG5vdCBjb21wbGV0ZWx5IGluIHJhbmdlIFsiLCBzdGFydEZyYW1lLCAi IC4uICIsIGVuZEZyYW1lLCAiXSIpOwogICAgICAgICB9KTsKLSNlbmRpZgogCi0gICAgICAgIGlm IChmcmFtZXNBdmFpbGFibGUgPCBzYW1wbGVDb3VudCkgeworICAgICAgICBpZiAodGltZVN0YW1w IDwgc3RhcnRGcmFtZSB8fCB0aW1lU3RhbXAgPj0gZW5kRnJhbWUpIHsKKyAgICAgICAgICAgIC8v IFdlIGFyZSBvdXQgb2YgdGhlIHdpbmRvdywgbGV0J3MgcmVzdGFydCB0aGUgb2Zmc2V0IGNvbXB1 dGF0aW9uLgorICAgICAgICAgICAgbV9zaG91bGRDb21wdXRlT3V0cHV0U2FtcGxlT2Zmc2V0ID0g dHJ1ZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIFdlIGFyZSB0b28gY2xvc2Ug ZnJvbSBlbmRGcmFtZSwgbGV0J3MgYmFjayB1cCBhIGxpdHRsZSBiaXQuCisgICAgICAgICAgICB1 aW50NjRfdCBmcmFtZXNBdmFpbGFibGUgPSBlbmRGcmFtZSAtIHRpbWVTdGFtcDsKICAgICAgICAg ICAgIG1fb3V0cHV0U2FtcGxlT2Zmc2V0IC09IHNhbXBsZUNvdW50IC0gZnJhbWVzQXZhaWxhYmxl OwotICAgICAgICAgICAgQXVkaW9TYW1wbGVCdWZmZXJMaXN0Ojp6ZXJvQUJMKGJ1ZmZlciwgYnl0 ZUNvdW50KTsKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIGRpc3BhdGNo X2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFtsb2dJZGVudGlmaWVyID0gTE9HSURF TlRJRklFUiwgb3V0cHV0U2FtcGxlT2Zmc2V0ID0gbV9vdXRwdXRTYW1wbGVPZmZzZXQsIHRoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmUHRyKCp0aGlzKV0geworICAgICAgICAgICAgICAgIEFM V0FZU19MT0cobG9nSWRlbnRpZmllciwgInVwZGF0aW5nIG9mZnNldCB0byAiLCBvdXRwdXRTYW1w bGVPZmZzZXQpOworICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KKyAgICAgICAgQXVkaW9TYW1w bGVCdWZmZXJMaXN0Ojp6ZXJvQUJMKGJ1ZmZlciwgYnl0ZUNvdW50KTsKKyAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIH0KIAogICAgIGlmIChtb2RlID09IENvcHkpIHsKQEAgLTMxNSw5ICszMDQs OSBAQCBib29sIEF1ZGlvU2FtcGxlRGF0YVNvdXJjZTo6cHVsbEF2YWxhaWJsZVNhbXBsZXNBc0No dW5rcyhBdWRpb0J1ZmZlckxpc3QmIGJ1ZmZlcgogICAgIHVpbnQ2NF90IHN0YXJ0RnJhbWUgPSAw OwogICAgIHVpbnQ2NF90IGVuZEZyYW1lID0gMDsKICAgICBtX3JpbmdCdWZmZXItPmdldEN1cnJl bnRGcmFtZUJvdW5kcyhzdGFydEZyYW1lLCBlbmRGcmFtZSk7Ci0gICAgaWYgKG1fdHJhbnNpdGlv bmluZ0Zyb21QYXVzZWQpIHsKKyAgICBpZiAobV9zaG91bGRDb21wdXRlT3V0cHV0U2FtcGxlT2Zm c2V0KSB7CiAgICAgICAgIG1fb3V0cHV0U2FtcGxlT2Zmc2V0ID0gdGltZVN0YW1wICsgKGVuZEZy YW1lIC0gc2FtcGxlQ291bnRQZXJDaHVuayk7Ci0gICAgICAgIG1fdHJhbnNpdGlvbmluZ0Zyb21Q YXVzZWQgPSBmYWxzZTsKKyAgICAgICAgbV9zaG91bGRDb21wdXRlT3V0cHV0U2FtcGxlT2Zmc2V0 ID0gZmFsc2U7CiAgICAgfQogCiAgICAgdGltZVN0YW1wICs9IG1fb3V0cHV0U2FtcGxlT2Zmc2V0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1Jl YWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29hLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VDb2NvYS5jcHAK aW5kZXggYmQzYmFhOGQ5MThmMzlmNDRiN2E0N2E3ZDRlYmE5YjcyMDUzMjgwYi4uNWUwYjAyOTgw MGYzYmM4Y2UyMmUwMTcwZWY1MzBmOTQxODI2NDRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNv Y29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVh bHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2EuY3BwCkBAIC03NSwxMCArNzUsNiBAQCB2b2lk IFJlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29hOjpPbkRhdGEoY29uc3Qgdm9pZCogYXVk aW9EYXRhLCBpbnQgYml0c1BlcgogICAgIH0KICNlbmRpZgogCi0gICAgQ01UaW1lIHN0YXJ0VGlt ZSA9IENNVGltZU1ha2UobV9udW1iZXJPZkZyYW1lcywgc2FtcGxlUmF0ZSk7Ci0gICAgYXV0byBt ZWRpYVRpbWUgPSBQQUw6OnRvTWVkaWFUaW1lKHN0YXJ0VGltZSk7Ci0gICAgbV9udW1iZXJPZkZy YW1lcyArPSBudW1iZXJPZkZyYW1lczsKLQogICAgIGlmICghbV9hdWRpb0J1ZmZlckxpc3QgfHwg bV9zYW1wbGVSYXRlICE9IHNhbXBsZVJhdGUgfHwgbV9udW1iZXJPZkNoYW5uZWxzICE9IG51bWJl ck9mQ2hhbm5lbHMpIHsKICAgICAgICAgY2FsbE9uTWFpblRocmVhZChbaWRlbnRpZmllciA9IExP R0lERU5USUZJRVIsIHRoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgc2FtcGxl UmF0ZSwgbnVtYmVyT2ZDaGFubmVsc10gewogICAgICAgICAgICAgQUxXQVlTX0xPR19JRihsb2dn ZXJQdHIoKSwgaWRlbnRpZmllciwgIm5ldyBhdWRpbyBidWZmZXIgbGlzdCBmb3Igc2FtcGxlUmF0 ZSAiLCBzYW1wbGVSYXRlLCAiIGFuZCAiLCBudW1iZXJPZkNoYW5uZWxzLCAiIGNoYW5uZWwocyki KTsKQEAgLTg4LDggKzg0LDE2IEBAIHZvaWQgUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29j b2E6Ok9uRGF0YShjb25zdCB2b2lkKiBhdWRpb0RhdGEsIGludCBiaXRzUGVyCiAgICAgICAgIG1f bnVtYmVyT2ZDaGFubmVscyA9IG51bWJlck9mQ2hhbm5lbHM7CiAgICAgICAgIG1fc3RyZWFtRGVz Y3JpcHRpb24gPSBzdHJlYW1EZXNjcmlwdGlvbihzYW1wbGVSYXRlLCBudW1iZXJPZkNoYW5uZWxz KTsKICAgICAgICAgbV9hdWRpb0J1ZmZlckxpc3QgPSBtYWtlVW5pcXVlPFdlYkF1ZGlvQnVmZmVy TGlzdD4obV9zdHJlYW1EZXNjcmlwdGlvbik7CisgICAgICAgIGlmIChtX3NhbXBsZVJhdGUgJiYg bV9udW1iZXJPZkZyYW1lcykKKyAgICAgICAgICAgIG1fbnVtYmVyT2ZGcmFtZXMgPSBtX251bWJl ck9mRnJhbWVzICogc2FtcGxlUmF0ZSAvIG1fc2FtcGxlUmF0ZTsKKyAgICAgICAgZWxzZQorICAg ICAgICAgICAgbV9udW1iZXJPZkZyYW1lcyA9IDA7CiAgICAgfQogCisgICAgQ01UaW1lIHN0YXJ0 VGltZSA9IENNVGltZU1ha2UobV9udW1iZXJPZkZyYW1lcywgc2FtcGxlUmF0ZSk7CisgICAgYXV0 byBtZWRpYVRpbWUgPSBQQUw6OnRvTWVkaWFUaW1lKHN0YXJ0VGltZSk7CisgICAgbV9udW1iZXJP ZkZyYW1lcyArPSBudW1iZXJPZkZyYW1lczsKKwogICAgIGF1dG8mIGJ1ZmZlckxpc3QgPSAqbV9h dWRpb0J1ZmZlckxpc3QtPmJ1ZmZlcigwKTsKICAgICBidWZmZXJMaXN0Lm1EYXRhQnl0ZVNpemUg PSBudW1iZXJPZkNoYW5uZWxzICogbnVtYmVyT2ZGcmFtZXMgKiBiaXRzUGVyU2FtcGxlIC8gODsK ICAgICBidWZmZXJMaXN0Lm1OdW1iZXJDaGFubmVscyA9IG51bWJlck9mQ2hhbm5lbHM7Cg==