210335 2020-04-10 08:16:03 -0700 Add a timer to AVVideoCaptureSource to verify reception of frames 2020-04-14 02:37:13 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=210285 InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1640174 0 youennf 2020-04-10 08:16:03 -0700 Add a timer to AVVideoCaptureSource to verify reception of frames 1640178 1 396085 youennf 2020-04-10 08:24:54 -0700 Created attachment 396085 Patch 1640181 2 396087 youennf 2020-04-10 08:28:53 -0700 Created attachment 396087 Patch 1640615 3 396197 youennf 2020-04-11 16:25:58 -0700 Created attachment 396197 Patch 1640918 4 396197 eric.carlson 2020-04-13 09:38:20 -0700 Comment on attachment 396197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396197&action=review > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:143 > + static constexpr Seconds verifyCaptureInterval = 3_s; Is three seconds long enough? > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:144 > + static const uint64_t framesToDropWhenStarting = 4; Shouldn't this be relative to the capture rate? > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:163 > + RELEASE_LOG_ERROR(WebRTC, "AVVideoCaptureSource::verifyIsCapturing - no frame received in %d seconds, failing", static_cast<int>(m_verifyCapturingTimer.repeatInterval().value())); > + captureFailed(); Failing capture completely is quite severe. Should we try to stop and restart the camera one time? 1641288 5 youennf 2020-04-14 02:32:40 -0700 (In reply to Eric Carlson from comment #4) > Comment on attachment 396197 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=396197&action=review > > > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:143 > > + static constexpr Seconds verifyCaptureInterval = 3_s; > > Is three seconds long enough? I tried to pick something not too short but not too long either. Timer starts when session is running so frames should flow very quickly in theory. > > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:144 > > + static const uint64_t framesToDropWhenStarting = 4; > > Shouldn't this be relative to the capture rate? Might be the case. IIRC, from your testing, the first frames were bad, probably at 30 fps. I am guessing that we could reduce this number at lower frame rate. > > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:163 > > + RELEASE_LOG_ERROR(WebRTC, "AVVideoCaptureSource::verifyIsCapturing - no frame received in %d seconds, failing", static_cast<int>(m_verifyCapturingTimer.repeatInterval().value())); > > + captureFailed(); > > Failing capture completely is quite severe. Should we try to stop and > restart the camera one time? I was wondering the same thing and went this way following what we are doing for audio capture. At the same time, the application can always call getUserMedia if it wants to restart capture. Let's try that as a follow-up. 1641290 6 ews-feeder 2020-04-14 02:36:11 -0700 Committed r260064: <https://trac.webkit.org/changeset/260064> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396197. 1641291 7 webkit-bug-importer 2020-04-14 02:37:13 -0700 <rdar://problem/61762873> 396085 2020-04-10 08:24:54 -0700 2020-04-10 08:28:48 -0700 Patch bug-210335-20200410172453.patch text/plain 7380 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY3M2UxNjI2MGZhOWIx MGUyM2ExZWVmOWFhNDMzZjYwYmUxNTY0Mi4uMmU1MGQ4MDU2NjczYjNiYWM3MGY2ZWEzZWNkOGYx ZmRhZjlhZjdjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA0LTEwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSB0aW1lciB0byBB VlZpZGVvQ2FwdHVyZVNvdXJjZSB0byB2ZXJpZnkgcmVjZXB0aW9uIG9mIGZyYW1lcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMzM1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ291bnQgdGhlIG51bWJl ciBvZiBmcmFtZXMgYmVpbmcgY2FwdHVyZWQuCisgICAgICAgIEFkZCBhIHRpbWVyIHJlcGVhcnRp bmcgZXZlcnkgNCBzZWNvbmRzLgorICAgICAgICBJZiB0aGUgbnVtYmVyIG9mIGZyYW1lcyBkaWQg bm90IGluY3JlYXNlLCBmYWlsIHRoZSBzb3VyY2UuCisgICAgICAgIFRpbWVyIHN0YXJ0cy9zdG9w cyBiYXNlZCBvbiB3aGV0aGVyIHRoZSBzZXNzaW9uIGlzIHJ1bm5pbmcvaXMgaW50ZXJydXB0ZWQu CisgICAgICAgIE1hbnVhbGx5IHRlc3RlZC4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3Ry ZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVN ZWRpYVNvdXJjZTo6Y2FwdHVyZUZhaWxlZCk6CisgICAgICAgIEV4cGxpY2l0bHkgY2FsbCBzdG9w KCkgaW5zdGVhZCBvZiBqdXN0IHNldHRpbmcgbV9pc1Byb2R1Y2luZ0RhdGEuCisgICAgICAgIFRo aXMgZW5zdXJlcyB3ZSByZWxlYXNlIGFsbCByZXNvdXJjZXMgYW5kIHRoYXQgd2UgbWF5IG5vdCBy ZXN0YXJ0IGNhcHR1cmluZyBhZnRlciBjYXB0dXJlRmFpbGVkKCkuCisgICAgICAgICogcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmg6CisgICAgICAgICogcGxh dGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tOgorICAgICAgICAo V2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OkFWVmlkZW9DYXB0dXJlU291cmNlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjp2ZXJpZnlJc0NhcHR1cmluZyk6 CisgICAgICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6dXBkYXRlVmVyaWZ5Q2Fw dHVyaW5nVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNh cHR1cmVPdXRwdXREaWRPdXRwdXRTYW1wbGVCdWZmZXJGcm9tQ29ubmVjdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2FwdHVyZVNlc3Npb25Jc1J1bm5pbmdE aWRDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1 cmVTZXNzaW9uQmVnaW5JbnRlcnJ1cHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0Nh cHR1cmVTb3VyY2U6OmNhcHR1cmVTZXNzaW9uRW5kSW50ZXJydXB0aW9uKToKKwogMjAyMC0wNC0w OSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQnVtcCBwcmlv cml0eSBvZiBMaWJXZWJSVENBdWRpb01vZHVsZSB0aHJlYWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAK aW5kZXggMjk1MjkxNmQ2Y2Y5YTg2YWNlMzAyZDhlYjFhMTVkNzExMTlmNDVlZS4uMDEzNGM0NzVi MjgzYWUyZjQ2ZjM4OTMzNjMyY2RlNjgzZWNjN2ZiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAK QEAgLTI0MSw5ICsyNDEsOSBAQCB2b2lkIFJlYWx0aW1lTWVkaWFTb3VyY2U6OmNhcHR1cmVGYWls ZWQoKQogewogICAgIEVSUk9SX0xPR19JRihtX2xvZ2dlciwgTE9HSURFTlRJRklFUik7CiAKLSAg ICBtX2lzUHJvZHVjaW5nRGF0YSA9IGZhbHNlOwogICAgIG1fY2FwdHVyZURpZEZhaWxlZCA9IHRy dWU7CiAKKyAgICBzdG9wKCk7CiAgICAgZm9yRWFjaE9ic2VydmVyKFtdKGF1dG8mIG9ic2VydmVy KSB7CiAgICAgICAgIG9ic2VydmVyLnNvdXJjZVN0b3BwZWQoKTsKICAgICB9KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVy ZVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlk ZW9DYXB0dXJlU291cmNlLmgKaW5kZXggM2ZiMDE4M2FiM2E2OTU1NjA3ZjdlNGJhOGNhMGJiMDdl NzYyMWQ0ZC4uYjJmMjRhYzc2NThhMDFmYjVhYWI1Nzg5N2Q3MGUzYmM4YjY4NTdjOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0 dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0FWVmlkZW9DYXB0dXJlU291cmNlLmgKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJJbnRT aXplSGFzaC5oIgogI2luY2x1ZGUgIk9yaWVudGF0aW9uTm90aWZpZXIuaCIKICNpbmNsdWRlICJS ZWFsdGltZVZpZGVvQ2FwdHVyZVNvdXJjZS5oIgorI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVk ZSA8d3RmL0xvY2suaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+CiAKQEAgLTEx NSw2ICsxMTYsOSBAQCBwcml2YXRlOgogICAgIGNvbnN0IGNoYXIqIGxvZ0NsYXNzTmFtZSgpIGNv bnN0IG92ZXJyaWRlIHsgcmV0dXJuICJBVlZpZGVvQ2FwdHVyZVNvdXJjZSI7IH0KICNlbmRpZgog CisgICAgdm9pZCB1cGRhdGVWZXJpZnlDYXB0dXJpbmdUaW1lcigpOworICAgIHZvaWQgdmVyaWZ5 SXNDYXB0dXJpbmcoKTsKKwogICAgIFJlZlB0cjxNZWRpYVNhbXBsZT4gbV9idWZmZXI7CiAgICAg UmV0YWluUHRyPEFWQ2FwdHVyZVZpZGVvRGF0YU91dHB1dD4gbV92aWRlb091dHB1dDsKICAgICBz dGQ6OnVuaXF1ZV9wdHI8SW1hZ2VUcmFuc2ZlclNlc3Npb25WVD4gbV9pbWFnZVRyYW5zZmVyU2Vz c2lvbjsKQEAgLTEzMyw5ICsxMzcsMTUgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8QVZWaWRlb1By ZXNldD4gbV9jdXJyZW50UHJlc2V0OwogICAgIEludFNpemUgbV9jdXJyZW50U2l6ZTsKICAgICBk b3VibGUgbV9jdXJyZW50RnJhbWVSYXRlOwotICAgIGludCBtX2ZyYW1lc1RvRHJvcEF0U3RhcnR1 cCB7IDAgfTsKICAgICBib29sIG1faW50ZXJydXB0ZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9p c1J1bm5pbmcgeyBmYWxzZSB9OworCisgICAgc3RhdGljIGNvbnN0ZXhwciBTZWNvbmRzIHZlcmlm eUNhcHR1cmVJbnRlcnZhbCA9IDNfczsKKyAgICBzdGF0aWMgY29uc3QgdWludDY0X3QgZnJhbWVz VG9Ecm9wV2hlblN0YXJ0aW5nID0gNDsKKworICAgIFRpbWVyIG1fdmVyaWZ5Q2FwdHVyaW5nVGlt ZXI7CisgICAgdWludDY0X3QgbV9mcmFtZXNDb3VudCB7IDAgfTsKKyAgICB1aW50NjRfdCBtX2xh c3RGcmFtZXNDb3VudCB7IDAgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2Fw dHVyZVNvdXJjZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9B VlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQppbmRleCAxM2VkYzM1NWE1MzU4MzZhNjY4NTAxMjc4ODM5 YjI5MGY0NzgzNTJjLi40YzBkMDQwZDUxYWM5ZDgzZGVjMjUzY2EwZTAxNDBmNzVjZTQyZmVjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRl b0NhcHR1cmVTb3VyY2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCkBAIC0xMjksNiArMTI5LDcgQEAgQVZWaWRl b0NhcHR1cmVTb3VyY2U6OkFWVmlkZW9DYXB0dXJlU291cmNlKEFWQ2FwdHVyZURldmljZSogZGV2 aWNlLCBTdHJpbmcmJiBpZCwKICAgICA6IFJlYWx0aW1lVmlkZW9DYXB0dXJlU291cmNlKGRldmlj ZS5sb2NhbGl6ZWROYW1lLCBXVEZNb3ZlKGlkKSwgV1RGTW92ZShoYXNoU2FsdCkpCiAgICAgLCBt X29iamNPYnNlcnZlcihhZG9wdE5TKFtbV2ViQ29yZUFWVmlkZW9DYXB0dXJlU291cmNlT2JzZXJ2 ZXIgYWxsb2NdIGluaXRXaXRoQ2FsbGJhY2s6dGhpc10pKQogICAgICwgbV9kZXZpY2UoZGV2aWNl KQorICAgICwgbV92ZXJpZnlDYXB0dXJpbmdUaW1lcigqdGhpcywgJkFWVmlkZW9DYXB0dXJlU291 cmNlOjp2ZXJpZnlJc0NhcHR1cmluZykKIHsKICAgICBbbV9kZXZpY2UuZ2V0KCkgYWRkT2JzZXJ2 ZXI6bV9vYmpjT2JzZXJ2ZXIuZ2V0KCkgZm9yS2V5UGF0aDpAInN1c3BlbmRlZCIgb3B0aW9uczpO U0tleVZhbHVlT2JzZXJ2aW5nT3B0aW9uTmV3IGNvbnRleHQ6KHZvaWQgKiluaWxdOwogfQpAQCAt MTUwLDYgKzE1MSwzNiBAQCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6fkFWVmlkZW9DYXB0dXJlU291 cmNlKCkKICAgICBjbGVhclNlc3Npb24oKTsKIH0KIAordm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJj ZTo6dmVyaWZ5SXNDYXB0dXJpbmcoKQoreworICAgIEFTU0VSVCghbV9pbnRlcnJ1cHRlZCk7Cisg ICAgQVNTRVJUKG1faXNSdW5uaW5nKTsKKyAgICBpZiAobV9sYXN0RnJhbWVzQ291bnQgIT0gbV9m cmFtZXNDb3VudCkgeworICAgICAgICBtX2xhc3RGcmFtZXNDb3VudCA9IG1fZnJhbWVzQ291bnQ7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBSRUxFQVNFX0xPR19FUlJPUihXZWJSVEMs ICJBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6dmVyaWZ5SXNDYXB0dXJpbmcgLSBubyBmcmFtZSByZWNl aXZlZCBpbiAlZCBzZWNvbmRzLCBmYWlsaW5nIiwgc3RhdGljX2Nhc3Q8aW50PihtX3ZlcmlmeUNh cHR1cmluZ1RpbWVyLnJlcGVhdEludGVydmFsKCkudmFsdWUoKSkpOworICAgIGNhcHR1cmVGYWls ZWQoKTsKK30KKwordm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6dXBkYXRlVmVyaWZ5Q2FwdHVy aW5nVGltZXIoKQoreworICAgIGlmICghbV9pc1J1bm5pbmcgfHwgbV9pbnRlcnJ1cHRlZCkgewor ICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihXZWJSVEMsICJBVlZpZGVvQ2FwdHVyZVNvdXJjZSBz dG9wIHZlcmlmeSBjYXB0dXJpbmcgdGltZXIiKTsKKyAgICAgICAgbV92ZXJpZnlDYXB0dXJpbmdU aW1lci5zdG9wKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAobV92ZXJpZnlD YXB0dXJpbmdUaW1lci5pc0FjdGl2ZSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNF X0xPR19FUlJPUihXZWJSVEMsICJBVlZpZGVvQ2FwdHVyZVNvdXJjZSBzdGFydCB2ZXJpZnkgY2Fw dHVyaW5nIHRpbWVyIik7CisgICAgbV92ZXJpZnlDYXB0dXJpbmdUaW1lci5zdGFydFJlcGVhdGlu Zyh2ZXJpZnlDYXB0dXJlSW50ZXJ2YWwpOworICAgIG1fZnJhbWVzQ291bnQgPSAwOworICAgIG1f bGFzdEZyYW1lc0NvdW50ID0gMDsKK30KKwogdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2xl YXJTZXNzaW9uKCkKIHsKICAgICBBTFdBWVNfTE9HX0lGKGxvZ2dlclB0cigpLCBMT0dJREVOVElG SUVSKTsKQEAgLTUyNiw3ICs1NTcsNyBAQCB2b2lkIEFWVmlkZW9DYXB0dXJlU291cmNlOjpwcm9j ZXNzTmV3RnJhbWUoUmVmPE1lZGlhU2FtcGxlPiYmIHNhbXBsZSkKIAogdm9pZCBBVlZpZGVvQ2Fw dHVyZVNvdXJjZTo6Y2FwdHVyZU91dHB1dERpZE91dHB1dFNhbXBsZUJ1ZmZlckZyb21Db25uZWN0 aW9uKEFWQ2FwdHVyZU91dHB1dCosIENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZUJ1ZmZlciwgQVZD YXB0dXJlQ29ubmVjdGlvbiogY2FwdHVyZUNvbm5lY3Rpb24pCiB7Ci0gICAgaWYgKG1fZnJhbWVz VG9Ecm9wQXRTdGFydHVwICYmIG1fZnJhbWVzVG9Ecm9wQXRTdGFydHVwLS0pCisgICAgaWYgKCsr bV9mcmFtZXNDb3VudCA8PSBmcmFtZXNUb0Ryb3BXaGVuU3RhcnRpbmcpCiAgICAgICAgIHJldHVy bjsKIAogICAgIGF1dG8gc2FtcGxlID0gTWVkaWFTYW1wbGVBVkZPYmpDOjpjcmVhdGUoc2FtcGxl QnVmZmVyLCBtX3NhbXBsZVJvdGF0aW9uLCBbY2FwdHVyZUNvbm5lY3Rpb24gaXNWaWRlb01pcnJv cmVkXSk7CkBAIC01NDMsOSArNTc0LDExIEBAIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNh cHR1cmVTZXNzaW9uSXNSdW5uaW5nRGlkQ2hhbmdlKGJvb2wgc3RhdGUpCiAgICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgbV9pc1J1bm5pbmcgPSBzdGF0ZTsKLSAgICAgICAgaWYgKG1faXNS dW5uaW5nKQotICAgICAgICAgICAgbV9mcmFtZXNUb0Ryb3BBdFN0YXJ0dXAgPSA0OwotCisgICAg ICAgIGlmIChtX2lzUnVubmluZykgeworICAgICAgICAgICAgbV9mcmFtZXNDb3VudCA9IDA7Cisg ICAgICAgICAgICBtX2xhc3RGcmFtZXNDb3VudCA9IDA7CisgICAgICAgIH0KKyAgICAgICAgdXBk YXRlVmVyaWZ5Q2FwdHVyaW5nVGltZXIoKTsKICAgICAgICAgbm90aWZ5TXV0ZWRDaGFuZ2UoIW1f aXNSdW5uaW5nKTsKICAgICB9KTsKIH0KQEAgLTYxMiwxMiArNjQ1LDE0IEBAIHZvaWQgQVZWaWRl b0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVTZXNzaW9uQmVnaW5JbnRlcnJ1cHRpb24oUmV0YWluUHRy PE5TTm90aWZpY2F0CiB7CiAgICAgQUxXQVlTX0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJ RklFUiwgW25vdGlmaWNhdGlvbi5nZXQoKS51c2VySW5mb1tBVkNhcHR1cmVTZXNzaW9uSW50ZXJy dXB0aW9uUmVhc29uS2V5XSBpbnRlZ2VyVmFsdWVdKTsKICAgICBtX2ludGVycnVwdGVkID0gdHJ1 ZTsKKyAgICB1cGRhdGVWZXJpZnlDYXB0dXJpbmdUaW1lcigpOwogfQogCiB2b2lkIEFWVmlkZW9D YXB0dXJlU291cmNlOjpjYXB0dXJlU2Vzc2lvbkVuZEludGVycnVwdGlvbihSZXRhaW5QdHI8TlNO b3RpZmljYXRpb24+KQogewogICAgIEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lERU5U SUZJRVIpOwogICAgIG1faW50ZXJydXB0ZWQgPSBmYWxzZTsKKyAgICB1cGRhdGVWZXJpZnlDYXB0 dXJpbmdUaW1lcigpOwogfQogI2VuZGlmCiAK 396087 2020-04-10 08:28:53 -0700 2020-04-11 16:25:54 -0700 Patch bug-210335-20200410172851.patch text/plain 7207 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY3M2UxNjI2MGZhOWIx MGUyM2ExZWVmOWFhNDMzZjYwYmUxNTY0Mi4uMmU1MGQ4MDU2NjczYjNiYWM3MGY2ZWEzZWNkOGYx ZmRhZjlhZjdjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA0LTEwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSB0aW1lciB0byBB VlZpZGVvQ2FwdHVyZVNvdXJjZSB0byB2ZXJpZnkgcmVjZXB0aW9uIG9mIGZyYW1lcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMzM1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ291bnQgdGhlIG51bWJl ciBvZiBmcmFtZXMgYmVpbmcgY2FwdHVyZWQuCisgICAgICAgIEFkZCBhIHRpbWVyIHJlcGVhcnRp bmcgZXZlcnkgNCBzZWNvbmRzLgorICAgICAgICBJZiB0aGUgbnVtYmVyIG9mIGZyYW1lcyBkaWQg bm90IGluY3JlYXNlLCBmYWlsIHRoZSBzb3VyY2UuCisgICAgICAgIFRpbWVyIHN0YXJ0cy9zdG9w cyBiYXNlZCBvbiB3aGV0aGVyIHRoZSBzZXNzaW9uIGlzIHJ1bm5pbmcvaXMgaW50ZXJydXB0ZWQu CisgICAgICAgIE1hbnVhbGx5IHRlc3RlZC4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3Ry ZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVN ZWRpYVNvdXJjZTo6Y2FwdHVyZUZhaWxlZCk6CisgICAgICAgIEV4cGxpY2l0bHkgY2FsbCBzdG9w KCkgaW5zdGVhZCBvZiBqdXN0IHNldHRpbmcgbV9pc1Byb2R1Y2luZ0RhdGEuCisgICAgICAgIFRo aXMgZW5zdXJlcyB3ZSByZWxlYXNlIGFsbCByZXNvdXJjZXMgYW5kIHRoYXQgd2UgbWF5IG5vdCBy ZXN0YXJ0IGNhcHR1cmluZyBhZnRlciBjYXB0dXJlRmFpbGVkKCkuCisgICAgICAgICogcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmg6CisgICAgICAgICogcGxh dGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tOgorICAgICAgICAo V2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OkFWVmlkZW9DYXB0dXJlU291cmNlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjp2ZXJpZnlJc0NhcHR1cmluZyk6 CisgICAgICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6dXBkYXRlVmVyaWZ5Q2Fw dHVyaW5nVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNh cHR1cmVPdXRwdXREaWRPdXRwdXRTYW1wbGVCdWZmZXJGcm9tQ29ubmVjdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2FwdHVyZVNlc3Npb25Jc1J1bm5pbmdE aWRDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1 cmVTZXNzaW9uQmVnaW5JbnRlcnJ1cHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0Nh cHR1cmVTb3VyY2U6OmNhcHR1cmVTZXNzaW9uRW5kSW50ZXJydXB0aW9uKToKKwogMjAyMC0wNC0w OSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQnVtcCBwcmlv cml0eSBvZiBMaWJXZWJSVENBdWRpb01vZHVsZSB0aHJlYWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAK aW5kZXggMjk1MjkxNmQ2Y2Y5YTg2YWNlMzAyZDhlYjFhMTVkNzExMTlmNDVlZS4uMDEzNGM0NzVi MjgzYWUyZjQ2ZjM4OTMzNjMyY2RlNjgzZWNjN2ZiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAK QEAgLTI0MSw5ICsyNDEsOSBAQCB2b2lkIFJlYWx0aW1lTWVkaWFTb3VyY2U6OmNhcHR1cmVGYWls ZWQoKQogewogICAgIEVSUk9SX0xPR19JRihtX2xvZ2dlciwgTE9HSURFTlRJRklFUik7CiAKLSAg ICBtX2lzUHJvZHVjaW5nRGF0YSA9IGZhbHNlOwogICAgIG1fY2FwdHVyZURpZEZhaWxlZCA9IHRy dWU7CiAKKyAgICBzdG9wKCk7CiAgICAgZm9yRWFjaE9ic2VydmVyKFtdKGF1dG8mIG9ic2VydmVy KSB7CiAgICAgICAgIG9ic2VydmVyLnNvdXJjZVN0b3BwZWQoKTsKICAgICB9KTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVy ZVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlk ZW9DYXB0dXJlU291cmNlLmgKaW5kZXggM2ZiMDE4M2FiM2E2OTU1NjA3ZjdlNGJhOGNhMGJiMDdl NzYyMWQ0ZC4uYjJmMjRhYzc2NThhMDFmYjVhYWI1Nzg5N2Q3MGUzYmM4YjY4NTdjOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0 dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0FWVmlkZW9DYXB0dXJlU291cmNlLmgKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJJbnRT aXplSGFzaC5oIgogI2luY2x1ZGUgIk9yaWVudGF0aW9uTm90aWZpZXIuaCIKICNpbmNsdWRlICJS ZWFsdGltZVZpZGVvQ2FwdHVyZVNvdXJjZS5oIgorI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVk ZSA8d3RmL0xvY2suaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+CiAKQEAgLTEx NSw2ICsxMTYsOSBAQCBwcml2YXRlOgogICAgIGNvbnN0IGNoYXIqIGxvZ0NsYXNzTmFtZSgpIGNv bnN0IG92ZXJyaWRlIHsgcmV0dXJuICJBVlZpZGVvQ2FwdHVyZVNvdXJjZSI7IH0KICNlbmRpZgog CisgICAgdm9pZCB1cGRhdGVWZXJpZnlDYXB0dXJpbmdUaW1lcigpOworICAgIHZvaWQgdmVyaWZ5 SXNDYXB0dXJpbmcoKTsKKwogICAgIFJlZlB0cjxNZWRpYVNhbXBsZT4gbV9idWZmZXI7CiAgICAg UmV0YWluUHRyPEFWQ2FwdHVyZVZpZGVvRGF0YU91dHB1dD4gbV92aWRlb091dHB1dDsKICAgICBz dGQ6OnVuaXF1ZV9wdHI8SW1hZ2VUcmFuc2ZlclNlc3Npb25WVD4gbV9pbWFnZVRyYW5zZmVyU2Vz c2lvbjsKQEAgLTEzMyw5ICsxMzcsMTUgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8QVZWaWRlb1By ZXNldD4gbV9jdXJyZW50UHJlc2V0OwogICAgIEludFNpemUgbV9jdXJyZW50U2l6ZTsKICAgICBk b3VibGUgbV9jdXJyZW50RnJhbWVSYXRlOwotICAgIGludCBtX2ZyYW1lc1RvRHJvcEF0U3RhcnR1 cCB7IDAgfTsKICAgICBib29sIG1faW50ZXJydXB0ZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9p c1J1bm5pbmcgeyBmYWxzZSB9OworCisgICAgc3RhdGljIGNvbnN0ZXhwciBTZWNvbmRzIHZlcmlm eUNhcHR1cmVJbnRlcnZhbCA9IDNfczsKKyAgICBzdGF0aWMgY29uc3QgdWludDY0X3QgZnJhbWVz VG9Ecm9wV2hlblN0YXJ0aW5nID0gNDsKKworICAgIFRpbWVyIG1fdmVyaWZ5Q2FwdHVyaW5nVGlt ZXI7CisgICAgdWludDY0X3QgbV9mcmFtZXNDb3VudCB7IDAgfTsKKyAgICB1aW50NjRfdCBtX2xh c3RGcmFtZXNDb3VudCB7IDAgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2Fw dHVyZVNvdXJjZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9B VlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQppbmRleCAxM2VkYzM1NWE1MzU4MzZhNjY4NTAxMjc4ODM5 YjI5MGY0NzgzNTJjLi5mMzFmNGE2NGU4NTAwMzBhY2FiNTc3MThjMWNkMDE1NTI2NDA3MTg5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRl b0NhcHR1cmVTb3VyY2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCkBAIC0xMjksNiArMTI5LDcgQEAgQVZWaWRl b0NhcHR1cmVTb3VyY2U6OkFWVmlkZW9DYXB0dXJlU291cmNlKEFWQ2FwdHVyZURldmljZSogZGV2 aWNlLCBTdHJpbmcmJiBpZCwKICAgICA6IFJlYWx0aW1lVmlkZW9DYXB0dXJlU291cmNlKGRldmlj ZS5sb2NhbGl6ZWROYW1lLCBXVEZNb3ZlKGlkKSwgV1RGTW92ZShoYXNoU2FsdCkpCiAgICAgLCBt X29iamNPYnNlcnZlcihhZG9wdE5TKFtbV2ViQ29yZUFWVmlkZW9DYXB0dXJlU291cmNlT2JzZXJ2 ZXIgYWxsb2NdIGluaXRXaXRoQ2FsbGJhY2s6dGhpc10pKQogICAgICwgbV9kZXZpY2UoZGV2aWNl KQorICAgICwgbV92ZXJpZnlDYXB0dXJpbmdUaW1lcigqdGhpcywgJkFWVmlkZW9DYXB0dXJlU291 cmNlOjp2ZXJpZnlJc0NhcHR1cmluZykKIHsKICAgICBbbV9kZXZpY2UuZ2V0KCkgYWRkT2JzZXJ2 ZXI6bV9vYmpjT2JzZXJ2ZXIuZ2V0KCkgZm9yS2V5UGF0aDpAInN1c3BlbmRlZCIgb3B0aW9uczpO U0tleVZhbHVlT2JzZXJ2aW5nT3B0aW9uTmV3IGNvbnRleHQ6KHZvaWQgKiluaWxdOwogfQpAQCAt MTUwLDYgKzE1MSwzNCBAQCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6fkFWVmlkZW9DYXB0dXJlU291 cmNlKCkKICAgICBjbGVhclNlc3Npb24oKTsKIH0KIAordm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJj ZTo6dmVyaWZ5SXNDYXB0dXJpbmcoKQoreworICAgIEFTU0VSVCghbV9pbnRlcnJ1cHRlZCk7Cisg ICAgQVNTRVJUKG1faXNSdW5uaW5nKTsKKyAgICBpZiAobV9sYXN0RnJhbWVzQ291bnQgIT0gbV9m cmFtZXNDb3VudCkgeworICAgICAgICBtX2xhc3RGcmFtZXNDb3VudCA9IG1fZnJhbWVzQ291bnQ7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBSRUxFQVNFX0xPR19FUlJPUihXZWJSVEMs ICJBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6dmVyaWZ5SXNDYXB0dXJpbmcgLSBubyBmcmFtZSByZWNl aXZlZCBpbiAlZCBzZWNvbmRzLCBmYWlsaW5nIiwgc3RhdGljX2Nhc3Q8aW50PihtX3ZlcmlmeUNh cHR1cmluZ1RpbWVyLnJlcGVhdEludGVydmFsKCkudmFsdWUoKSkpOworICAgIGNhcHR1cmVGYWls ZWQoKTsKK30KKwordm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6dXBkYXRlVmVyaWZ5Q2FwdHVy aW5nVGltZXIoKQoreworICAgIGlmICghbV9pc1J1bm5pbmcgfHwgbV9pbnRlcnJ1cHRlZCkgewor ICAgICAgICBtX3ZlcmlmeUNhcHR1cmluZ1RpbWVyLnN0b3AoKTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKworICAgIGlmIChtX3ZlcmlmeUNhcHR1cmluZ1RpbWVyLmlzQWN0aXZlKCkpCisgICAg ICAgIHJldHVybjsKKworICAgIG1fdmVyaWZ5Q2FwdHVyaW5nVGltZXIuc3RhcnRSZXBlYXRpbmco dmVyaWZ5Q2FwdHVyZUludGVydmFsKTsKKyAgICBtX2ZyYW1lc0NvdW50ID0gMDsKKyAgICBtX2xh c3RGcmFtZXNDb3VudCA9IDA7Cit9CisKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNsZWFy U2Vzc2lvbigpCiB7CiAgICAgQUxXQVlTX0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklF Uik7CkBAIC01MjYsNyArNTU1LDcgQEAgdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6cHJvY2Vz c05ld0ZyYW1lKFJlZjxNZWRpYVNhbXBsZT4mJiBzYW1wbGUpCiAKIHZvaWQgQVZWaWRlb0NhcHR1 cmVTb3VyY2U6OmNhcHR1cmVPdXRwdXREaWRPdXRwdXRTYW1wbGVCdWZmZXJGcm9tQ29ubmVjdGlv bihBVkNhcHR1cmVPdXRwdXQqLCBDTVNhbXBsZUJ1ZmZlclJlZiBzYW1wbGVCdWZmZXIsIEFWQ2Fw dHVyZUNvbm5lY3Rpb24qIGNhcHR1cmVDb25uZWN0aW9uKQogewotICAgIGlmIChtX2ZyYW1lc1Rv RHJvcEF0U3RhcnR1cCAmJiBtX2ZyYW1lc1RvRHJvcEF0U3RhcnR1cC0tKQorICAgIGlmICgrK21f ZnJhbWVzQ291bnQgPD0gZnJhbWVzVG9Ecm9wV2hlblN0YXJ0aW5nKQogICAgICAgICByZXR1cm47 CiAKICAgICBhdXRvIHNhbXBsZSA9IE1lZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlKHNhbXBsZUJ1 ZmZlciwgbV9zYW1wbGVSb3RhdGlvbiwgW2NhcHR1cmVDb25uZWN0aW9uIGlzVmlkZW9NaXJyb3Jl ZF0pOwpAQCAtNTQzLDkgKzU3MiwxMSBAQCB2b2lkIEFWVmlkZW9DYXB0dXJlU291cmNlOjpjYXB0 dXJlU2Vzc2lvbklzUnVubmluZ0RpZENoYW5nZShib29sIHN0YXRlKQogICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgIG1faXNSdW5uaW5nID0gc3RhdGU7Ci0gICAgICAgIGlmIChtX2lzUnVu bmluZykKLSAgICAgICAgICAgIG1fZnJhbWVzVG9Ecm9wQXRTdGFydHVwID0gNDsKLQorICAgICAg ICBpZiAobV9pc1J1bm5pbmcpIHsKKyAgICAgICAgICAgIG1fZnJhbWVzQ291bnQgPSAwOworICAg ICAgICAgICAgbV9sYXN0RnJhbWVzQ291bnQgPSAwOworICAgICAgICB9CisgICAgICAgIHVwZGF0 ZVZlcmlmeUNhcHR1cmluZ1RpbWVyKCk7CiAgICAgICAgIG5vdGlmeU11dGVkQ2hhbmdlKCFtX2lz UnVubmluZyk7CiAgICAgfSk7CiB9CkBAIC02MTIsMTIgKzY0MywxNCBAQCB2b2lkIEFWVmlkZW9D YXB0dXJlU291cmNlOjpjYXB0dXJlU2Vzc2lvbkJlZ2luSW50ZXJydXB0aW9uKFJldGFpblB0cjxO U05vdGlmaWNhdAogewogICAgIEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCksIExPR0lERU5USUZJ RVIsIFtub3RpZmljYXRpb24uZ2V0KCkudXNlckluZm9bQVZDYXB0dXJlU2Vzc2lvbkludGVycnVw dGlvblJlYXNvbktleV0gaW50ZWdlclZhbHVlXSk7CiAgICAgbV9pbnRlcnJ1cHRlZCA9IHRydWU7 CisgICAgdXBkYXRlVmVyaWZ5Q2FwdHVyaW5nVGltZXIoKTsKIH0KIAogdm9pZCBBVlZpZGVvQ2Fw dHVyZVNvdXJjZTo6Y2FwdHVyZVNlc3Npb25FbmRJbnRlcnJ1cHRpb24oUmV0YWluUHRyPE5TTm90 aWZpY2F0aW9uPikKIHsKICAgICBBTFdBWVNfTE9HX0lGKGxvZ2dlclB0cigpLCBMT0dJREVOVElG SUVSKTsKICAgICBtX2ludGVycnVwdGVkID0gZmFsc2U7CisgICAgdXBkYXRlVmVyaWZ5Q2FwdHVy aW5nVGltZXIoKTsKIH0KICNlbmRpZgogCg== 396197 2020-04-11 16:25:58 -0700 2020-04-14 02:36:12 -0700 Patch bug-210335-20200412012557.patch text/plain 6770 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY3M2UxNjI2MGZhOWIx MGUyM2ExZWVmOWFhNDMzZjYwYmUxNTY0Mi4uNmY4OTAxMWY4MDFkYTUwNGU5MmNlMTUzZTExZTYy MGZmZmU1NmU1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA0LTEwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSB0aW1lciB0byBB VlZpZGVvQ2FwdHVyZVNvdXJjZSB0byB2ZXJpZnkgcmVjZXB0aW9uIG9mIGZyYW1lcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMzM1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ291bnQgdGhlIG51bWJl ciBvZiBmcmFtZXMgYmVpbmcgY2FwdHVyZWQuCisgICAgICAgIEFkZCBhIHRpbWVyIHJlcGVhdGlu ZyBldmVyeSAzIHNlY29uZHMuCisgICAgICAgIFRpbWVyIHN0YXJ0cy9zdG9wcyBiYXNlZCBvbiB3 aGV0aGVyIHRoZSBzZXNzaW9uIGlzIHJ1bm5pbmcvaXMgaW50ZXJydXB0ZWQuCisgICAgICAgIElm IHRoZSBudW1iZXIgb2YgZnJhbWVzIGRpZCBub3QgaW5jcmVhc2UsIGZhaWwgdGhlIHNvdXJjZS4K KyAgICAgICAgTWFudWFsbHkgdGVzdGVkLgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJl YW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU1l ZGlhU291cmNlOjpjYXB0dXJlRmFpbGVkKToKKyAgICAgICAgRXhwbGljaXRseSBjYWxsIHN0b3Ao KSBpbnN0ZWFkIG9mIGp1c3Qgc2V0dGluZyBtX2lzUHJvZHVjaW5nRGF0YS4KKyAgICAgICAgVGhp cyBlbnN1cmVzIHdlIHJlbGVhc2UgYWxsIHJlc291cmNlcyBhbmQgdGhhdCB3ZSBtYXkgbm90IHJl c3RhcnQgY2FwdHVyaW5nIGFmdGVyIGNhcHR1cmVGYWlsZWQoKS4KKyAgICAgICAgKiBwbGF0Zm9y bS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW06CisgICAgICAgIChX ZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2UpOgorICAg ICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OnZlcmlmeUlzQ2FwdHVyaW5nKToK KyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjp1cGRhdGVWZXJpZnlDYXB0 dXJpbmdUaW1lcik6CisgICAgICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2Fw dHVyZU91dHB1dERpZE91dHB1dFNhbXBsZUJ1ZmZlckZyb21Db25uZWN0aW9uKToKKyAgICAgICAg KFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpjYXB0dXJlU2Vzc2lvbklzUnVubmluZ0Rp ZENoYW5nZSk6CisKIDIwMjAtMDQtMDkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIEJ1bXAgcHJpb3JpdHkgb2YgTGliV2ViUlRDQXVkaW9Nb2R1bGUgdGhyZWFk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGlt ZU1lZGlhU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1Jl YWx0aW1lTWVkaWFTb3VyY2UuY3BwCmluZGV4IDI5NTI5MTZkNmNmOWE4NmFjZTMwMmQ4ZWIxYTE1 ZDcxMTE5ZjQ1ZWUuLjAxMzRjNDc1YjI4M2FlMmY0NmYzODkzMzYzMmNkZTY4M2VjYzdmYjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVk aWFTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1Jl YWx0aW1lTWVkaWFTb3VyY2UuY3BwCkBAIC0yNDEsOSArMjQxLDkgQEAgdm9pZCBSZWFsdGltZU1l ZGlhU291cmNlOjpjYXB0dXJlRmFpbGVkKCkKIHsKICAgICBFUlJPUl9MT0dfSUYobV9sb2dnZXIs IExPR0lERU5USUZJRVIpOwogCi0gICAgbV9pc1Byb2R1Y2luZ0RhdGEgPSBmYWxzZTsKICAgICBt X2NhcHR1cmVEaWRGYWlsZWQgPSB0cnVlOwogCisgICAgc3RvcCgpOwogICAgIGZvckVhY2hPYnNl cnZlcihbXShhdXRvJiBvYnNlcnZlcikgewogICAgICAgICBvYnNlcnZlci5zb3VyY2VTdG9wcGVk KCk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oCmluZGV4IDNmYjAxODNhYjNh Njk1NTYwN2Y3ZTRiYThjYTBiYjA3ZTc2MjFkNGQuLmIyZjI0YWM3NjU4YTAxZmI1YWFiNTc4OTdk NzBlM2JjOGI2ODU3YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oCkBAIC0zMCw2ICsz MCw3IEBACiAjaW5jbHVkZSAiSW50U2l6ZUhhc2guaCIKICNpbmNsdWRlICJPcmllbnRhdGlvbk5v dGlmaWVyLmgiCiAjaW5jbHVkZSAiUmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2UuaCIKKyNpbmNs dWRlICJUaW1lci5oIgogI2luY2x1ZGUgPHd0Zi9Mb2NrLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv U3RyaW5nSGFzaC5oPgogCkBAIC0xMTUsNiArMTE2LDkgQEAgcHJpdmF0ZToKICAgICBjb25zdCBj aGFyKiBsb2dDbGFzc05hbWUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiAiQVZWaWRlb0NhcHR1 cmVTb3VyY2UiOyB9CiAjZW5kaWYKIAorICAgIHZvaWQgdXBkYXRlVmVyaWZ5Q2FwdHVyaW5nVGlt ZXIoKTsKKyAgICB2b2lkIHZlcmlmeUlzQ2FwdHVyaW5nKCk7CisKICAgICBSZWZQdHI8TWVkaWFT YW1wbGU+IG1fYnVmZmVyOwogICAgIFJldGFpblB0cjxBVkNhcHR1cmVWaWRlb0RhdGFPdXRwdXQ+ IG1fdmlkZW9PdXRwdXQ7CiAgICAgc3RkOjp1bmlxdWVfcHRyPEltYWdlVHJhbnNmZXJTZXNzaW9u VlQ+IG1faW1hZ2VUcmFuc2ZlclNlc3Npb247CkBAIC0xMzMsOSArMTM3LDE1IEBAIHByaXZhdGU6 CiAgICAgUmVmUHRyPEFWVmlkZW9QcmVzZXQ+IG1fY3VycmVudFByZXNldDsKICAgICBJbnRTaXpl IG1fY3VycmVudFNpemU7CiAgICAgZG91YmxlIG1fY3VycmVudEZyYW1lUmF0ZTsKLSAgICBpbnQg bV9mcmFtZXNUb0Ryb3BBdFN0YXJ0dXAgeyAwIH07CiAgICAgYm9vbCBtX2ludGVycnVwdGVkIHsg ZmFsc2UgfTsKICAgICBib29sIG1faXNSdW5uaW5nIHsgZmFsc2UgfTsKKworICAgIHN0YXRpYyBj b25zdGV4cHIgU2Vjb25kcyB2ZXJpZnlDYXB0dXJlSW50ZXJ2YWwgPSAzX3M7CisgICAgc3RhdGlj IGNvbnN0IHVpbnQ2NF90IGZyYW1lc1RvRHJvcFdoZW5TdGFydGluZyA9IDQ7CisKKyAgICBUaW1l ciBtX3ZlcmlmeUNhcHR1cmluZ1RpbWVyOworICAgIHVpbnQ2NF90IG1fZnJhbWVzQ291bnQgeyAw IH07CisgICAgdWludDY0X3QgbV9sYXN0RnJhbWVzQ291bnQgeyAwIH07CiB9OwogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW0KaW5kZXggMTNlZGMz NTVhNTM1ODM2YTY2ODUwMTI3ODgzOWIyOTBmNDc4MzUyYy4uZTMxNGQ5ZGI1ZDQ1YmY4NGQzN2Fi OWRlMmZjYWM4OTExNzgwNjY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQpAQCAt MTI5LDYgKzEyOSw3IEBAIEFWVmlkZW9DYXB0dXJlU291cmNlOjpBVlZpZGVvQ2FwdHVyZVNvdXJj ZShBVkNhcHR1cmVEZXZpY2UqIGRldmljZSwgU3RyaW5nJiYgaWQsCiAgICAgOiBSZWFsdGltZVZp ZGVvQ2FwdHVyZVNvdXJjZShkZXZpY2UubG9jYWxpemVkTmFtZSwgV1RGTW92ZShpZCksIFdURk1v dmUoaGFzaFNhbHQpKQogICAgICwgbV9vYmpjT2JzZXJ2ZXIoYWRvcHROUyhbW1dlYkNvcmVBVlZp ZGVvQ2FwdHVyZVNvdXJjZU9ic2VydmVyIGFsbG9jXSBpbml0V2l0aENhbGxiYWNrOnRoaXNdKSkK ICAgICAsIG1fZGV2aWNlKGRldmljZSkKKyAgICAsIG1fdmVyaWZ5Q2FwdHVyaW5nVGltZXIoKnRo aXMsICZBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6dmVyaWZ5SXNDYXB0dXJpbmcpCiB7CiAgICAgW21f ZGV2aWNlLmdldCgpIGFkZE9ic2VydmVyOm1fb2JqY09ic2VydmVyLmdldCgpIGZvcktleVBhdGg6 QCJzdXNwZW5kZWQiIG9wdGlvbnM6TlNLZXlWYWx1ZU9ic2VydmluZ09wdGlvbk5ldyBjb250ZXh0 Oih2b2lkICopbmlsXTsKIH0KQEAgLTE1MCw2ICsxNTEsMzMgQEAgQVZWaWRlb0NhcHR1cmVTb3Vy Y2U6On5BVlZpZGVvQ2FwdHVyZVNvdXJjZSgpCiAgICAgY2xlYXJTZXNzaW9uKCk7CiB9CiAKK3Zv aWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnZlcmlmeUlzQ2FwdHVyaW5nKCkKK3sKKyAgICBBU1NF UlQobV9pc1J1bm5pbmcpOworICAgIGlmIChtX2xhc3RGcmFtZXNDb3VudCAhPSBtX2ZyYW1lc0Nv dW50KSB7CisgICAgICAgIG1fbGFzdEZyYW1lc0NvdW50ID0gbV9mcmFtZXNDb3VudDsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKworICAgIFJFTEVBU0VfTE9HX0VSUk9SKFdlYlJUQywgIkFWVmlk ZW9DYXB0dXJlU291cmNlOjp2ZXJpZnlJc0NhcHR1cmluZyAtIG5vIGZyYW1lIHJlY2VpdmVkIGlu ICVkIHNlY29uZHMsIGZhaWxpbmciLCBzdGF0aWNfY2FzdDxpbnQ+KG1fdmVyaWZ5Q2FwdHVyaW5n VGltZXIucmVwZWF0SW50ZXJ2YWwoKS52YWx1ZSgpKSk7CisgICAgY2FwdHVyZUZhaWxlZCgpOwor fQorCit2b2lkIEFWVmlkZW9DYXB0dXJlU291cmNlOjp1cGRhdGVWZXJpZnlDYXB0dXJpbmdUaW1l cigpCit7CisgICAgaWYgKCFtX2lzUnVubmluZykgeworICAgICAgICBtX3ZlcmlmeUNhcHR1cmlu Z1RpbWVyLnN0b3AoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChtX3Zlcmlm eUNhcHR1cmluZ1RpbWVyLmlzQWN0aXZlKCkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fdmVy aWZ5Q2FwdHVyaW5nVGltZXIuc3RhcnRSZXBlYXRpbmcodmVyaWZ5Q2FwdHVyZUludGVydmFsKTsK KyAgICBtX2ZyYW1lc0NvdW50ID0gMDsKKyAgICBtX2xhc3RGcmFtZXNDb3VudCA9IDA7Cit9CisK IHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNsZWFyU2Vzc2lvbigpCiB7CiAgICAgQUxXQVlT X0xPR19JRihsb2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUik7CkBAIC01MjYsNyArNTU0LDcgQEAg dm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6cHJvY2Vzc05ld0ZyYW1lKFJlZjxNZWRpYVNhbXBs ZT4mJiBzYW1wbGUpCiAKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVPdXRwdXRE aWRPdXRwdXRTYW1wbGVCdWZmZXJGcm9tQ29ubmVjdGlvbihBVkNhcHR1cmVPdXRwdXQqLCBDTVNh bXBsZUJ1ZmZlclJlZiBzYW1wbGVCdWZmZXIsIEFWQ2FwdHVyZUNvbm5lY3Rpb24qIGNhcHR1cmVD b25uZWN0aW9uKQogewotICAgIGlmIChtX2ZyYW1lc1RvRHJvcEF0U3RhcnR1cCAmJiBtX2ZyYW1l c1RvRHJvcEF0U3RhcnR1cC0tKQorICAgIGlmICgrK21fZnJhbWVzQ291bnQgPD0gZnJhbWVzVG9E cm9wV2hlblN0YXJ0aW5nKQogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIHNhbXBsZSA9IE1l ZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlKHNhbXBsZUJ1ZmZlciwgbV9zYW1wbGVSb3RhdGlvbiwg W2NhcHR1cmVDb25uZWN0aW9uIGlzVmlkZW9NaXJyb3JlZF0pOwpAQCAtNTM3LDE1ICs1NjUsMTQg QEAgdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2FwdHVyZU91dHB1dERpZE91dHB1dFNhbXBs ZUJ1ZmZlckZyb21Db25uZWN0aW9uKEFWQ2EKIAogdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6 Y2FwdHVyZVNlc3Npb25Jc1J1bm5pbmdEaWRDaGFuZ2UoYm9vbCBzdGF0ZSkKIHsKLSAgICBzY2hl ZHVsZURlZmVycmVkVGFzayhbdGhpcywgc3RhdGVdIHsKLSAgICAgICAgQUxXQVlTX0xPR19JRihs b2dnZXJQdHIoKSwgTE9HSURFTlRJRklFUiwgc3RhdGUpOworICAgIHNjaGVkdWxlRGVmZXJyZWRU YXNrKFt0aGlzLCBsb2dJZGVudGlmaWVyID0gTE9HSURFTlRJRklFUiwgc3RhdGVdIHsKKyAgICAg ICAgQUxXQVlTX0xPR19JRihsb2dnZXJQdHIoKSwgbG9nSWRlbnRpZmllciwgc3RhdGUpOwogICAg ICAgICBpZiAoKHN0YXRlID09IG1faXNSdW5uaW5nKSAmJiAoc3RhdGUgPT0gIW11dGVkKCkpKQog ICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIG1faXNSdW5uaW5nID0gc3RhdGU7Ci0gICAg ICAgIGlmIChtX2lzUnVubmluZykKLSAgICAgICAgICAgIG1fZnJhbWVzVG9Ecm9wQXRTdGFydHVw ID0gNDsKIAorICAgICAgICB1cGRhdGVWZXJpZnlDYXB0dXJpbmdUaW1lcigpOwogICAgICAgICBu b3RpZnlNdXRlZENoYW5nZSghbV9pc1J1bm5pbmcpOwogICAgIH0pOwogfQo=