164482 2016-11-07 08:03:32 -0800 [MediaStream][Mac] Mark captured video frames as ready for display immediately 2017-01-12 09:24:07 -0800 1 1 1 Unclassified WebKit WebCore Misc. Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue dino jer.noble thiago.lacerda webkit-bug-importer youennf oldest_to_newest 1248748 0 eric.carlson 2016-11-07 08:03:32 -0800 Flag frames captured from a video device to be displayed immediately. Also enqueue frames when the sample buffer display layer isn't ready for new frames instead of discarding them. 1248749 1 webkit-bug-importer 2016-11-07 08:06:22 -0800 <rdar://problem/29139073> 1248752 2 294064 eric.carlson 2016-11-07 08:29:33 -0800 Created attachment 294064 Proposed patch. 1248753 3 commit-queue 2016-11-07 08:32:16 -0800 Attachment 294064 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:133: No space between ^ and block definition. [whitespace/brackets] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1248761 4 294064 jer.noble 2016-11-07 09:28:00 -0800 Comment on attachment 294064 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=294064&action=review > Source/WebCore/platform/cf/CoreMediaSoftLink.cpp:107 > +SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreMedia, kCMSampleAttachmentKey_IsDependedOnByOthers, CFStringRef) Unnecessary? > Source/WebCore/platform/cf/CoreMediaSoftLink.h:170 > +SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreMedia, kCMSampleAttachmentKey_IsDependedOnByOthers, CFStringRef) > +#define kCMSampleAttachmentKey_IsDependedOnByOthers get_CoreMedia_kCMSampleAttachmentKey_IsDependedOnByOthers() Ditto. 1249030 5 eric.carlson 2016-11-08 06:15:27 -0800 (In reply to comment #4) > Comment on attachment 294064 [details] > Proposed patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=294064&action=review > > > Source/WebCore/platform/cf/CoreMediaSoftLink.cpp:107 > > +SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreMedia, kCMSampleAttachmentKey_IsDependedOnByOthers, CFStringRef) > > Unnecessary? > > > Source/WebCore/platform/cf/CoreMediaSoftLink.h:170 > > +SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreMedia, kCMSampleAttachmentKey_IsDependedOnByOthers, CFStringRef) > > +#define kCMSampleAttachmentKey_IsDependedOnByOthers get_CoreMedia_kCMSampleAttachmentKey_IsDependedOnByOthers() > > Ditto. Both removed. Thanks for the review! 1249031 6 294156 eric.carlson 2016-11-08 06:17:51 -0800 Created attachment 294156 Patch for landing. 1249322 7 294156 commit-queue 2016-11-09 10:30:41 -0800 Comment on attachment 294156 Patch for landing. Clearing flags on attachment: 294156 Committed r208444: <http://trac.webkit.org/changeset/208444> 294064 2016-11-07 08:29:33 -0800 2016-11-07 09:28:00 -0800 Proposed patch. display_video_frames_immediately_patch_1.txt text/plain 11957 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODQyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE2LTExLTA3ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV1b TWFjXSBNYXJrIGNhcHR1cmVkIHZpZGVvIGZyYW1lcyBhcyByZWFkeSBmb3IgZGlzcGxheSBpbW1l ZGlhdGVseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY0NDgyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTEzOTA3Mz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2NmL0NvcmVNZWRp YVNvZnRMaW5rLmNwcDogQWRkIG5ldyBjb25zdGFudHMuCisgICAgICAgICogcGxhdGZvcm0vY2Yv Q29yZU1lZGlhU29mdExpbmsuaDoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cmVxdWVzdE5vdGlmaWNhdGlvbldoZW5SZWFkeUZv ck1lZGlhRGF0YSk6CisgICAgICAgICAgTmV3LCBhc2sgcmVnaXN0ZXIgZm9yIGEgY2FsbGJhY2sg d2hlbiB0aGUgc2FtcGxlIGJ1ZmZlciBkaXNwbGF5IGxheWVyIGlzIHJlYWR5CisgICAgICAgICAg Zm9yIG1vcmUgbWVkaWEgZGF0YS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVyKTogRG9uJ3QgY2hh bmdlCisgICAgICAgICAgdGhlIHNhbXBsZSB0aW1lc3RhbXBzLCBhc3N1bWUgdGhlIGNhbGxlciBo YXMgY29uZmlndXJlZCB0aGUgc2FtcGxlIGNvcnJlY3RseS4KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cHJlcGFyZVZpZGVvU2FtcGxlQnVm ZmVyRnJvbVRyYWNrKTogRG9uJ3QKKyAgICAgICAgICBkcm9wIGZyYW1lcyB3aGVuIHRoZSBkaXNw bGF5IGxheWVyIGlzbid0IHJlYWR5LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpkZXN0cm95TGF5ZXIpOiBDYWxsIHN0b3BSZXF1ZXN0aW5n TWVkaWFEYXRhLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmpDOjpzYW1wbGVCdWZmZXJVcGRhdGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVy RnJvbVRyYWNrKTogRGVsZXRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21h Yy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0 dXJlU291cmNlOjpzZXR1cENhcHR1cmVTZXNzaW9uKTogVGVsbCB0aGUgdmlkZW8gb3V0cHV0IHRv IGFsd2F5cyBkaXNjYXJkCisgICAgICAgICAgbGF0ZSB2aWRlbyBmcmFtZXMsIHdlIGRvbid0IG5l ZWQgdGhlbS4KKyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpwcm9jZXNz TmV3RnJhbWUpOiBBZGQgYSBrQ01TYW1wbGVBdHRhY2htZW50S2V5X0Rpc3BsYXlJbW1lZGlhdGVs eQorICAgICAgICAgIGF0dGFjaG1lbnQuCisKIDIwMTYtMTEtMDcgIFJ5YW4gSGFkZGFkICA8cnlh bmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIw ODM4Mi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NvcmVNZWRpYVNvZnRMaW5r LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9Db3JlTWVkaWFT b2Z0TGluay5jcHAJKHJldmlzaW9uIDIwNzc2NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2NmL0NvcmVNZWRpYVNvZnRMaW5rLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA0LDYgKzEwNCw5 IEBAIFNPRlRfTElOS19DT05TVEFOVF9GT1JfU09VUkNFKFdlYkNvcmUsIEMKIFNPRlRfTElOS19D T05TVEFOVF9GT1JfU09VUkNFKFdlYkNvcmUsIENvcmVNZWRpYSwga0NNU2FtcGxlQnVmZmVyQXR0 YWNobWVudEtleV9EcmFpbkFmdGVyRGVjb2RpbmcsIENGU3RyaW5nUmVmKQogU09GVF9MSU5LX0NP TlNUQU5UX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZU1lZGlhLCBrQ01TYW1wbGVCdWZmZXJBdHRh Y2htZW50S2V5X0VtcHR5TWVkaWEsIENGU3RyaW5nUmVmKQogU09GVF9MSU5LX0NPTlNUQU5UX0ZP Ul9TT1VSQ0UoV2ViQ29yZSwgQ29yZU1lZGlhLCBrQ01TYW1wbGVCdWZmZXJBdHRhY2htZW50S2V5 X1Jlc2V0RGVjb2RlckJlZm9yZURlY29kaW5nLCBDRlN0cmluZ1JlZikKK1NPRlRfTElOS19DT05T VEFOVF9GT1JfU09VUkNFKFdlYkNvcmUsIENvcmVNZWRpYSwga0NNU2FtcGxlQXR0YWNobWVudEtl eV9Jc0RlcGVuZGVkT25CeU90aGVycywgQ0ZTdHJpbmdSZWYpCitTT0ZUX0xJTktfQ09OU1RBTlRf Rk9SX1NPVVJDRShXZWJDb3JlLCBDb3JlTWVkaWEsIGtDTVNhbXBsZUF0dGFjaG1lbnRLZXlfRGlz cGxheUltbWVkaWF0ZWx5LCBDRlN0cmluZ1JlZikKKwogU09GVF9MSU5LX0NPTlNUQU5UX0ZPUl9T T1VSQ0UoV2ViQ29yZSwgQ29yZU1lZGlhLCBrQ01UaW1lYmFzZU5vdGlmaWNhdGlvbl9FZmZlY3Rp dmVSYXRlQ2hhbmdlZCwgQ0ZTdHJpbmdSZWYpCiBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX1NPVVJD RShXZWJDb3JlLCBDb3JlTWVkaWEsIGtDTVRpbWViYXNlTm90aWZpY2F0aW9uX1RpbWVKdW1wZWQs IENGU3RyaW5nUmVmKQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29y ZU1lZGlhLCBDTUF1ZGlvRm9ybWF0RGVzY3JpcHRpb25HZXRTdHJlYW1CYXNpY0Rlc2NyaXB0aW9u LCBjb25zdCBBdWRpb1N0cmVhbUJhc2ljRGVzY3JpcHRpb24gKiwgKENNQXVkaW9Gb3JtYXREZXNj cmlwdGlvblJlZiBkZXNjKSwgKGRlc2MpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2YvQ29yZU1lZGlhU29mdExpbmsuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9jZi9Db3JlTWVkaWFTb2Z0TGluay5oCShyZXZpc2lvbiAyMDc3NjUpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jZi9Db3JlTWVkaWFTb2Z0TGluay5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNjYsNiArMTY2LDEwIEBAIFNPRlRfTElOS19DT05TVEFOVF9GT1JfSEVBREVSKFdlYkNvcmUs IEMKICNkZWZpbmUga0NNU2FtcGxlQXR0YWNobWVudEtleV9Eb05vdERpc3BsYXkgZ2V0X0NvcmVN ZWRpYV9rQ01TYW1wbGVBdHRhY2htZW50S2V5X0RvTm90RGlzcGxheSgpCiBTT0ZUX0xJTktfQ09O U1RBTlRfRk9SX0hFQURFUihXZWJDb3JlLCBDb3JlTWVkaWEsIGtDTVNhbXBsZUF0dGFjaG1lbnRL ZXlfTm90U3luYywgQ0ZTdHJpbmdSZWYpCiAjZGVmaW5lIGtDTVNhbXBsZUF0dGFjaG1lbnRLZXlf Tm90U3luYyBnZXRfQ29yZU1lZGlhX2tDTVNhbXBsZUF0dGFjaG1lbnRLZXlfTm90U3luYygpCitT T0ZUX0xJTktfQ09OU1RBTlRfRk9SX0hFQURFUihXZWJDb3JlLCBDb3JlTWVkaWEsIGtDTVNhbXBs ZUF0dGFjaG1lbnRLZXlfSXNEZXBlbmRlZE9uQnlPdGhlcnMsIENGU3RyaW5nUmVmKQorI2RlZmlu ZSBrQ01TYW1wbGVBdHRhY2htZW50S2V5X0lzRGVwZW5kZWRPbkJ5T3RoZXJzIGdldF9Db3JlTWVk aWFfa0NNU2FtcGxlQXR0YWNobWVudEtleV9Jc0RlcGVuZGVkT25CeU90aGVycygpCitTT0ZUX0xJ TktfQ09OU1RBTlRfRk9SX0hFQURFUihXZWJDb3JlLCBDb3JlTWVkaWEsIGtDTVNhbXBsZUF0dGFj aG1lbnRLZXlfRGlzcGxheUltbWVkaWF0ZWx5LCBDRlN0cmluZ1JlZikKKyNkZWZpbmUga0NNU2Ft cGxlQXR0YWNobWVudEtleV9EaXNwbGF5SW1tZWRpYXRlbHkgZ2V0X0NvcmVNZWRpYV9rQ01TYW1w bGVBdHRhY2htZW50S2V5X0Rpc3BsYXlJbW1lZGlhdGVseSgpCiBTT0ZUX0xJTktfQ09OU1RBTlRf Rk9SX0hFQURFUihXZWJDb3JlLCBDb3JlTWVkaWEsIGtDTVNhbXBsZUJ1ZmZlckF0dGFjaG1lbnRL ZXlfRGlzcGxheUVtcHR5TWVkaWFJbW1lZGlhdGVseSwgQ0ZTdHJpbmdSZWYpCiAjZGVmaW5lIGtD TVNhbXBsZUJ1ZmZlckF0dGFjaG1lbnRLZXlfRGlzcGxheUVtcHR5TWVkaWFJbW1lZGlhdGVseSBn ZXRfQ29yZU1lZGlhX2tDTVNhbXBsZUJ1ZmZlckF0dGFjaG1lbnRLZXlfRGlzcGxheUVtcHR5TWVk aWFJbW1lZGlhdGVseSgpCiBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX0hFQURFUihXZWJDb3JlLCBD b3JlTWVkaWEsIGtDTVNhbXBsZUJ1ZmZlckF0dGFjaG1lbnRLZXlfRHJhaW5BZnRlckRlY29kaW5n LCBDRlN0cmluZ1JlZikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCShyZXZpc2lvbiAy MDc3NjUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaAkod29ya2luZyBjb3B5 KQpAQCAtMTIzLDkgKzEyMywxMiBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0U2l6ZShjb25zdCBJ bnRTaXplJikgb3ZlcnJpZGUgeyAvKiBOby1vcCAqLyB9CiAKICAgICB2b2lkIGVucXVldWVBdWRp b1NhbXBsZUJ1ZmZlckZyb21UcmFjayhNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYsIE1lZGlhU2Ft cGxlJik7Ci0gICAgdm9pZCBlbnF1ZXVlVmlkZW9TYW1wbGVCdWZmZXJGcm9tVHJhY2soTWVkaWFT dHJlYW1UcmFja1ByaXZhdGUmLCBNZWRpYVNhbXBsZSYpOworCisgICAgdm9pZCBwcmVwYXJlVmlk ZW9TYW1wbGVCdWZmZXJGcm9tVHJhY2soTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmLCBNZWRpYVNh bXBsZSYpOworICAgIHZvaWQgZW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVyKE1lZGlhU2FtcGxlJik7 CiAgICAgYm9vbCBzaG91bGRFbnF1ZXVlVmlkZW9TYW1wbGVCdWZmZXIoKSBjb25zdDsKICAgICB2 b2lkIGZsdXNoQW5kUmVtb3ZlVmlkZW9TYW1wbGVCdWZmZXJzKCk7CisgICAgdm9pZCByZXF1ZXN0 Tm90aWZpY2F0aW9uV2hlblJlYWR5Rm9yTWVkaWFEYXRhKCk7CiAKICAgICB2b2lkIHBhaW50KEdy YXBoaWNzQ29udGV4dCYsIGNvbnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRlOwogICAgIHZvaWQgcGFp bnRDdXJyZW50RnJhbWVJbkNvbnRleHQoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRmxvYXRSZWN0 Jikgb3ZlcnJpZGU7CkBAIC0xOTQsNiArMTk3LDcgQEAgcHJpdmF0ZToKIAogICAgIEhhc2hNYXA8 U3RyaW5nLCBSZWZQdHI8QXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbT4+IG1fYXVkaW9UcmFj a01hcDsKICAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPFZpZGVvVHJhY2tQcml2YXRlTWVkaWFT dHJlYW0+PiBtX3ZpZGVvVHJhY2tNYXA7CisgICAgRGVxdWU8UmVmPE1lZGlhU2FtcGxlPj4gbV9z YW1wbGVRdWV1ZTsKIAogICAgIE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgbV9uZXR3b3JrU3Rh dGUgeyBNZWRpYVBsYXllcjo6RW1wdHkgfTsKICAgICBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZSBt X3JlYWR5U3RhdGUgeyBNZWRpYVBsYXllcjo6SGF2ZU5vdGhpbmcgfTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakMubW0JKHJldmlzaW9uIDIwNzc2NSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTI4LDEyICsxMjgsMjcgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iagogICAgIC8vIEZJWE1FOiBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5ODM2CiB9CiAKLXZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjplbnF1ZXVlVmlkZW9TYW1wbGVCdWZm ZXJGcm9tVHJhY2soTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmIHRyYWNrLCBNZWRpYVNhbXBsZSYg c2FtcGxlKQordm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnJlcXVl c3ROb3RpZmljYXRpb25XaGVuUmVhZHlGb3JNZWRpYURhdGEoKQogewotICAgIGlmICgmdHJhY2sg IT0gbV9tZWRpYVN0cmVhbVByaXZhdGUtPmFjdGl2ZVZpZGVvVHJhY2soKSB8fCAhc2hvdWxkRW5x dWV1ZVZpZGVvU2FtcGxlQnVmZmVyKCkpCi0gICAgICAgIHJldHVybjsKKyAgICBbbV9zYW1wbGVC dWZmZXJEaXNwbGF5TGF5ZXIgcmVxdWVzdE1lZGlhRGF0YVdoZW5SZWFkeU9uUXVldWU6ZGlzcGF0 Y2hfZ2V0X21haW5fcXVldWUoKSB1c2luZ0Jsb2NrOl57CisgICAgICAgIFttX3NhbXBsZUJ1ZmZl ckRpc3BsYXlMYXllciBzdG9wUmVxdWVzdGluZ01lZGlhRGF0YV07CisKKyAgICAgICAgd2hpbGUg KCFtX3NhbXBsZVF1ZXVlLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgaWYgKCFbbV9zYW1wbGVC dWZmZXJEaXNwbGF5TGF5ZXIgaXNSZWFkeUZvck1vcmVNZWRpYURhdGFdKSB7CisgICAgICAgICAg ICAgICAgcmVxdWVzdE5vdGlmaWNhdGlvbldoZW5SZWFkeUZvck1lZGlhRGF0YSgpOworICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgYXV0byBzYW1w bGUgPSBtX3NhbXBsZVF1ZXVlLnRha2VGaXJzdCgpOworICAgICAgICAgICAgZW5xdWV1ZVZpZGVv U2FtcGxlQnVmZmVyKHNhbXBsZS5nZXQoKSk7CisgICAgICAgIH0KKyAgICB9XTsKK30KKwordm9p ZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OmVucXVldWVWaWRlb1NhbXBs ZUJ1ZmZlcihNZWRpYVNhbXBsZSYgc2FtcGxlKQoreworICAgIEFTU0VSVChbbV9zYW1wbGVCdWZm ZXJEaXNwbGF5TGF5ZXIgaXNSZWFkeUZvck1vcmVNZWRpYURhdGFdKTsKIAotICAgIHNhbXBsZS5z ZXRUaW1lc3RhbXBzKHRvTWVkaWFUaW1lKENNVGltZWJhc2VHZXRUaW1lKFttX3N5bmNocm9uaXpl ciB0aW1lYmFzZV0pKSwgTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpKTsKICAgICBbbV9zYW1wbGVC dWZmZXJEaXNwbGF5TGF5ZXIgZW5xdWV1ZVNhbXBsZUJ1ZmZlcjpzYW1wbGUucGxhdGZvcm1TYW1w bGUoKS5zYW1wbGUuY21TYW1wbGVCdWZmZXJdOwogICAgIG1faXNGcmFtZURpc3BsYXllZCA9IHRy dWU7CiAKQEAgLTE0NCwxMSArMTU5LDIyIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT dHJlYW1BVkZPYmoKICAgICB9CiB9CiAKLWJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmpDOjpzaG91bGRFbnF1ZXVlVmlkZW9TYW1wbGVCdWZmZXIoKSBjb25zdAordm9pZCBN ZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnByZXBhcmVWaWRlb1NhbXBsZUJ1 ZmZlckZyb21UcmFjayhNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYgdHJhY2ssIE1lZGlhU2FtcGxl JiBzYW1wbGUpCiB7Ci0gICAgaWYgKCFbbV9zYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIgaXNSZWFk eUZvck1vcmVNZWRpYURhdGFdKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCZ0cmFj ayAhPSBtX21lZGlhU3RyZWFtUHJpdmF0ZS0+YWN0aXZlVmlkZW9UcmFjaygpIHx8ICFzaG91bGRF bnF1ZXVlVmlkZW9TYW1wbGVCdWZmZXIoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFb bV9zYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIgaXNSZWFkeUZvck1vcmVNZWRpYURhdGFdKSB7Cisg ICAgICAgIG1fc2FtcGxlUXVldWUuYXBwZW5kKHNhbXBsZSk7CisgICAgICAgIHJlcXVlc3ROb3Rp ZmljYXRpb25XaGVuUmVhZHlGb3JNZWRpYURhdGEoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIGVucXVldWVWaWRlb1NhbXBsZUJ1ZmZlcihzYW1wbGUpOworfQogCitib29sIE1lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6c2hvdWxkRW5xdWV1ZVZpZGVvU2FtcGxl QnVmZmVyKCkgY29uc3QKK3sKICAgICBpZiAobV9kaXNwbGF5TW9kZSA9PSBMaXZlUHJldmlldykK ICAgICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTE4OSw2ICsyMTUsNyBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqCiAgICAgaWYgKCFtX3NhbXBsZUJ1ZmZlckRpc3Bs YXlMYXllcikKICAgICAgICAgcmV0dXJuOwogICAgIAorICAgIFttX3NhbXBsZUJ1ZmZlckRpc3Bs YXlMYXllciBzdG9wUmVxdWVzdGluZ01lZGlhRGF0YV07CiAgICAgW21fc2FtcGxlQnVmZmVyRGlz cGxheUxheWVyIGZsdXNoXTsKICAgICBDTVRpbWUgY3VycmVudFRpbWUgPSBDTVRpbWViYXNlR2V0 VGltZShbbV9zeW5jaHJvbml6ZXIgdGltZWJhc2VdKTsKICAgICBbbV9zeW5jaHJvbml6ZXIgcmVt b3ZlUmVuZGVyZXI6bV9zYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIuZ2V0KCkgYXRUaW1lOmN1cnJl bnRUaW1lIHdpdGhDb21wbGV0aW9uSGFuZGxlcjpeKEJPT0wpewpAQCAtNTI1LDcgKzU1Miw3IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmoKICAgICAgICAgLy8gRklY TUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk4MzYKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBSZWFsdGltZU1lZGlhU291cmNlOjpWaWRlbzoKLSAgICAgICAg ZW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVyRnJvbVRyYWNrKHRyYWNrLCBtZWRpYVNhbXBsZSk7Cisg ICAgICAgIHByZXBhcmVWaWRlb1NhbXBsZUJ1ZmZlckZyb21UcmFjayh0cmFjaywgbWVkaWFTYW1w bGUpOwogICAgICAgICBtX2hhc1JlY2VpdmVkTWVkaWEgPSB0cnVlOwogICAgICAgICBzY2hlZHVs ZURlZmVycmVkVGFzayhbdGhpc10gewogICAgICAgICAgICAgdXBkYXRlUmVhZHlTdGF0ZSgpOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0 dXJlU291cmNlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQkocmV2aXNpb24gMjA3NzY1KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291 cmNlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMDUsNiArMjA1LDcgQEAgdm9pZCBBVlZpZGVvQ2Fw dHVyZVNvdXJjZTo6c2V0dXBDYXB0dXJlUwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhJbnQ6a0NWUGl4 ZWxGb3JtYXRUeXBlXzMyQkdSQV0sIGtDVlBpeGVsQnVmZmVyUGl4ZWxGb3JtYXRUeXBlS2V5CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAs IG5pbF0pOwogICAgIFt2aWRlb091dHB1dCBzZXRWaWRlb1NldHRpbmdzOnNldHRpbmdzRGljdGlv bmFyeS5nZXQoKV07CisgICAgW3ZpZGVvT3V0cHV0IHNldEFsd2F5c0Rpc2NhcmRzTGF0ZVZpZGVv RnJhbWVzOllFU107CiAgICAgc2V0VmlkZW9TYW1wbGVCdWZmZXJEZWxlZ2F0ZSh2aWRlb091dHB1 dC5nZXQoKSk7CiAKICAgICBpZiAoIVtzZXNzaW9uKCkgY2FuQWRkT3V0cHV0OnZpZGVvT3V0cHV0 LmdldCgpXSkgewpAQCAtMjU4LDExICsyNTksMjAgQEAgdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJj ZTo6cHJvY2Vzc05ld0ZyYQogCiAgICAgdXBkYXRlRnJhbWVyYXRlKHNhbXBsZUJ1ZmZlci5nZXQo KSk7CiAKLSAgICBib29sIHNldHRpbmdzQ2hhbmdlZCA9IGZhbHNlOworICAgIENNU2FtcGxlQnVm ZmVyUmVmIG5ld1NhbXBsZUJ1ZmZlciA9IDA7CisgICAgQ01TYW1wbGVCdWZmZXJDcmVhdGVDb3B5 KGtDRkFsbG9jYXRvckRlZmF1bHQsIHNhbXBsZUJ1ZmZlci5nZXQoKSwgJm5ld1NhbXBsZUJ1ZmZl cik7CisgICAgQVNTRVJUKG5ld1NhbXBsZUJ1ZmZlcik7CisKKyAgICBDRkFycmF5UmVmIGF0dGFj aG1lbnRzQXJyYXkgPSBDTVNhbXBsZUJ1ZmZlckdldFNhbXBsZUF0dGFjaG1lbnRzQXJyYXkobmV3 U2FtcGxlQnVmZmVyLCB0cnVlKTsKKyAgICBmb3IgKENGSW5kZXggaSA9IDA7IGkgPCBDRkFycmF5 R2V0Q291bnQoYXR0YWNobWVudHNBcnJheSk7ICsraSkgeworICAgICAgICBDRk11dGFibGVEaWN0 aW9uYXJ5UmVmIGF0dGFjaG1lbnRzID0gKENGTXV0YWJsZURpY3Rpb25hcnlSZWYpQ0ZBcnJheUdl dFZhbHVlQXRJbmRleChhdHRhY2htZW50c0FycmF5LCBpKTsKKyAgICAgICAgQ0ZEaWN0aW9uYXJ5 U2V0VmFsdWUoYXR0YWNobWVudHMsIGtDTVNhbXBsZUF0dGFjaG1lbnRLZXlfRGlzcGxheUltbWVk aWF0ZWx5LCBrQ0ZCb29sZWFuVHJ1ZSk7CisgICAgfQogCi0gICAgbV9idWZmZXIgPSBzYW1wbGVC dWZmZXI7CisgICAgbV9idWZmZXIgPSBuZXdTYW1wbGVCdWZmZXI7CiAgICAgbV9sYXN0SW1hZ2Ug PSBudWxscHRyOwogCisgICAgYm9vbCBzZXR0aW5nc0NoYW5nZWQgPSBmYWxzZTsKICAgICBDTVZp ZGVvRGltZW5zaW9ucyBkaW1lbnNpb25zID0gQ01WaWRlb0Zvcm1hdERlc2NyaXB0aW9uR2V0RGlt ZW5zaW9ucyhmb3JtYXREZXNjcmlwdGlvbik7CiAgICAgaWYgKGRpbWVuc2lvbnMud2lkdGggIT0g bV93aWR0aCB8fCBkaW1lbnNpb25zLmhlaWdodCAhPSBtX2hlaWdodCkgewogICAgICAgICBtX3dp ZHRoID0gZGltZW5zaW9ucy53aWR0aDsKQEAgLTI3Myw3ICsyODMsNyBAQCB2b2lkIEFWVmlkZW9D YXB0dXJlU291cmNlOjpwcm9jZXNzTmV3RnJhCiAgICAgaWYgKHNldHRpbmdzQ2hhbmdlZCkKICAg ICAgICAgc2V0dGluZ3NEaWRDaGFuZ2UoKTsKIAotICAgIG1lZGlhRGF0YVVwZGF0ZWQoTWVkaWFT YW1wbGVBVkZPYmpDOjpjcmVhdGUoc2FtcGxlQnVmZmVyLmdldCgpKSk7CisgICAgbWVkaWFEYXRh VXBkYXRlZChNZWRpYVNhbXBsZUFWRk9iakM6OmNyZWF0ZShtX2J1ZmZlci5nZXQoKSkpOwogfQog CiB2b2lkIEFWVmlkZW9DYXB0dXJlU291cmNlOjpjYXB0dXJlT3V0cHV0RGlkT3V0cHV0U2FtcGxl QnVmZmVyRnJvbUNvbm5lY3Rpb24oQVZDYXB0dXJlT3V0cHV0VHlwZSosIENNU2FtcGxlQnVmZmVy UmVmIHNhbXBsZUJ1ZmZlciwgQVZDYXB0dXJlQ29ubmVjdGlvblR5cGUqKQo= 294156 2016-11-08 06:17:51 -0800 2016-11-09 10:30:41 -0800 Patch for landing. display_video_frames_immediately_patch_3.txt text/plain 11620 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODQyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE2LTExLTA3ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV1b TWFjXSBNYXJrIGNhcHR1cmVkIHZpZGVvIGZyYW1lcyBhcyByZWFkeSBmb3IgZGlzcGxheSBpbW1l ZGlhdGVseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY0NDgyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTEzOTA3Mz4KKworICAgICAgICBSZXZp ZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jZi9Db3JlTWVkaWFTb2Z0 TGluay5jcHA6IEFkZCBuZXcgY29uc3RhbnQuCisgICAgICAgICogcGxhdGZvcm0vY2YvQ29yZU1l ZGlhU29mdExpbmsuaDoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU3RyZWFtQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cmVxdWVzdE5vdGlmaWNhdGlvbldoZW5SZWFkeUZvck1lZGlh RGF0YSk6CisgICAgICAgICAgTmV3LCBhc2sgcmVnaXN0ZXIgZm9yIGEgY2FsbGJhY2sgd2hlbiB0 aGUgc2FtcGxlIGJ1ZmZlciBkaXNwbGF5IGxheWVyIGlzIHJlYWR5CisgICAgICAgICAgZm9yIG1v cmUgbWVkaWEgZGF0YS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQzo6ZW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVyKTogRG9uJ3QgY2hhbmdlCisg ICAgICAgICAgdGhlIHNhbXBsZSB0aW1lc3RhbXBzLCBhc3N1bWUgdGhlIGNhbGxlciBoYXMgY29u ZmlndXJlZCB0aGUgc2FtcGxlIGNvcnJlY3RseS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cHJlcGFyZVZpZGVvU2FtcGxlQnVmZmVyRnJv bVRyYWNrKTogRG9uJ3QKKyAgICAgICAgICBkcm9wIGZyYW1lcyB3aGVuIHRoZSBkaXNwbGF5IGxh eWVyIGlzbid0IHJlYWR5LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVk aWFTdHJlYW1BVkZPYmpDOjpkZXN0cm95TGF5ZXIpOiBDYWxsIHN0b3BSZXF1ZXN0aW5nTWVkaWFE YXRhLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZP YmpDOjpzYW1wbGVCdWZmZXJVcGRhdGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVyRnJvbVRy YWNrKTogRGVsZXRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZp ZGVvQ2FwdHVyZVNvdXJjZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291 cmNlOjpzZXR1cENhcHR1cmVTZXNzaW9uKTogVGVsbCB0aGUgdmlkZW8gb3V0cHV0IHRvIGFsd2F5 cyBkaXNjYXJkCisgICAgICAgICAgbGF0ZSB2aWRlbyBmcmFtZXMsIHdlIGRvbid0IG5lZWQgdGhl bS4KKyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpwcm9jZXNzTmV3RnJh bWUpOiBBZGQgYSBrQ01TYW1wbGVBdHRhY2htZW50S2V5X0Rpc3BsYXlJbW1lZGlhdGVseQorICAg ICAgICAgIGF0dGFjaG1lbnQuCisKIDIwMTYtMTEtMDcgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRh ZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIwODM4Mi4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0NvcmVNZWRpYVNvZnRMaW5rLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jZi9Db3JlTWVkaWFTb2Z0TGlu ay5jcHAJKHJldmlzaW9uIDIwNzc2NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NmL0Nv cmVNZWRpYVNvZnRMaW5rLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA0LDYgKzEwNCw4IEBAIFNP RlRfTElOS19DT05TVEFOVF9GT1JfU09VUkNFKFdlYkNvcmUsIEMKIFNPRlRfTElOS19DT05TVEFO VF9GT1JfU09VUkNFKFdlYkNvcmUsIENvcmVNZWRpYSwga0NNU2FtcGxlQnVmZmVyQXR0YWNobWVu dEtleV9EcmFpbkFmdGVyRGVjb2RpbmcsIENGU3RyaW5nUmVmKQogU09GVF9MSU5LX0NPTlNUQU5U X0ZPUl9TT1VSQ0UoV2ViQ29yZSwgQ29yZU1lZGlhLCBrQ01TYW1wbGVCdWZmZXJBdHRhY2htZW50 S2V5X0VtcHR5TWVkaWEsIENGU3RyaW5nUmVmKQogU09GVF9MSU5LX0NPTlNUQU5UX0ZPUl9TT1VS Q0UoV2ViQ29yZSwgQ29yZU1lZGlhLCBrQ01TYW1wbGVCdWZmZXJBdHRhY2htZW50S2V5X1Jlc2V0 RGVjb2RlckJlZm9yZURlY29kaW5nLCBDRlN0cmluZ1JlZikKK1NPRlRfTElOS19DT05TVEFOVF9G T1JfU09VUkNFKFdlYkNvcmUsIENvcmVNZWRpYSwga0NNU2FtcGxlQXR0YWNobWVudEtleV9EaXNw bGF5SW1tZWRpYXRlbHksIENGU3RyaW5nUmVmKQorCiBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX1NP VVJDRShXZWJDb3JlLCBDb3JlTWVkaWEsIGtDTVRpbWViYXNlTm90aWZpY2F0aW9uX0VmZmVjdGl2 ZVJhdGVDaGFuZ2VkLCBDRlN0cmluZ1JlZikKIFNPRlRfTElOS19DT05TVEFOVF9GT1JfU09VUkNF KFdlYkNvcmUsIENvcmVNZWRpYSwga0NNVGltZWJhc2VOb3RpZmljYXRpb25fVGltZUp1bXBlZCwg Q0ZTdHJpbmdSZWYpCiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX1NPVVJDRShXZWJDb3JlLCBDb3Jl TWVkaWEsIENNQXVkaW9Gb3JtYXREZXNjcmlwdGlvbkdldFN0cmVhbUJhc2ljRGVzY3JpcHRpb24s IGNvbnN0IEF1ZGlvU3RyZWFtQmFzaWNEZXNjcmlwdGlvbiAqLCAoQ01BdWRpb0Zvcm1hdERlc2Ny aXB0aW9uUmVmIGRlc2MpLCAoZGVzYykpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9j Zi9Db3JlTWVkaWFTb2Z0TGluay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NmL0NvcmVNZWRpYVNvZnRMaW5rLmgJKHJldmlzaW9uIDIwNzc2NSkKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2NmL0NvcmVNZWRpYVNvZnRMaW5rLmgJKHdvcmtpbmcgY29weSkKQEAg LTE2Niw2ICsxNjYsOCBAQCBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX0hFQURFUihXZWJDb3JlLCBD CiAjZGVmaW5lIGtDTVNhbXBsZUF0dGFjaG1lbnRLZXlfRG9Ob3REaXNwbGF5IGdldF9Db3JlTWVk aWFfa0NNU2FtcGxlQXR0YWNobWVudEtleV9Eb05vdERpc3BsYXkoKQogU09GVF9MSU5LX0NPTlNU QU5UX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29yZU1lZGlhLCBrQ01TYW1wbGVBdHRhY2htZW50S2V5 X05vdFN5bmMsIENGU3RyaW5nUmVmKQogI2RlZmluZSBrQ01TYW1wbGVBdHRhY2htZW50S2V5X05v dFN5bmMgZ2V0X0NvcmVNZWRpYV9rQ01TYW1wbGVBdHRhY2htZW50S2V5X05vdFN5bmMoKQorU09G VF9MSU5LX0NPTlNUQU5UX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29yZU1lZGlhLCBrQ01TYW1wbGVB dHRhY2htZW50S2V5X0Rpc3BsYXlJbW1lZGlhdGVseSwgQ0ZTdHJpbmdSZWYpCisjZGVmaW5lIGtD TVNhbXBsZUF0dGFjaG1lbnRLZXlfRGlzcGxheUltbWVkaWF0ZWx5IGdldF9Db3JlTWVkaWFfa0NN U2FtcGxlQXR0YWNobWVudEtleV9EaXNwbGF5SW1tZWRpYXRlbHkoKQogU09GVF9MSU5LX0NPTlNU QU5UX0ZPUl9IRUFERVIoV2ViQ29yZSwgQ29yZU1lZGlhLCBrQ01TYW1wbGVCdWZmZXJBdHRhY2ht ZW50S2V5X0Rpc3BsYXlFbXB0eU1lZGlhSW1tZWRpYXRlbHksIENGU3RyaW5nUmVmKQogI2RlZmlu ZSBrQ01TYW1wbGVCdWZmZXJBdHRhY2htZW50S2V5X0Rpc3BsYXlFbXB0eU1lZGlhSW1tZWRpYXRl bHkgZ2V0X0NvcmVNZWRpYV9rQ01TYW1wbGVCdWZmZXJBdHRhY2htZW50S2V5X0Rpc3BsYXlFbXB0 eU1lZGlhSW1tZWRpYXRlbHkoKQogU09GVF9MSU5LX0NPTlNUQU5UX0ZPUl9IRUFERVIoV2ViQ29y ZSwgQ29yZU1lZGlhLCBrQ01TYW1wbGVCdWZmZXJBdHRhY2htZW50S2V5X0RyYWluQWZ0ZXJEZWNv ZGluZywgQ0ZTdHJpbmdSZWYpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaAkocmV2aXNp b24gMjA3NzY1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmgJKHdvcmtpbmcg Y29weSkKQEAgLTEyMyw5ICsxMjMsMTIgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldFNpemUoY29u c3QgSW50U2l6ZSYpIG92ZXJyaWRlIHsgLyogTm8tb3AgKi8gfQogCiAgICAgdm9pZCBlbnF1ZXVl QXVkaW9TYW1wbGVCdWZmZXJGcm9tVHJhY2soTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmLCBNZWRp YVNhbXBsZSYpOwotICAgIHZvaWQgZW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVyRnJvbVRyYWNrKE1l ZGlhU3RyZWFtVHJhY2tQcml2YXRlJiwgTWVkaWFTYW1wbGUmKTsKKworICAgIHZvaWQgcHJlcGFy ZVZpZGVvU2FtcGxlQnVmZmVyRnJvbVRyYWNrKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJiwgTWVk aWFTYW1wbGUmKTsKKyAgICB2b2lkIGVucXVldWVWaWRlb1NhbXBsZUJ1ZmZlcihNZWRpYVNhbXBs ZSYpOwogICAgIGJvb2wgc2hvdWxkRW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVyKCkgY29uc3Q7CiAg ICAgdm9pZCBmbHVzaEFuZFJlbW92ZVZpZGVvU2FtcGxlQnVmZmVycygpOworICAgIHZvaWQgcmVx dWVzdE5vdGlmaWNhdGlvbldoZW5SZWFkeUZvck1lZGlhRGF0YSgpOwogCiAgICAgdm9pZCBwYWlu dChHcmFwaGljc0NvbnRleHQmLCBjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlkZTsKICAgICB2b2lk IHBhaW50Q3VycmVudEZyYW1lSW5Db250ZXh0KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IEZsb2F0 UmVjdCYpIG92ZXJyaWRlOwpAQCAtMTk0LDYgKzE5Nyw3IEBAIHByaXZhdGU6CiAKICAgICBIYXNo TWFwPFN0cmluZywgUmVmUHRyPEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0+PiBtX2F1ZGlv VHJhY2tNYXA7CiAgICAgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxWaWRlb1RyYWNrUHJpdmF0ZU1l ZGlhU3RyZWFtPj4gbV92aWRlb1RyYWNrTWFwOworICAgIERlcXVlPFJlZjxNZWRpYVNhbXBsZT4+ IG1fc2FtcGxlUXVldWU7CiAKICAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIG1fbmV0d29y a1N0YXRlIHsgTWVkaWFQbGF5ZXI6OkVtcHR5IH07CiAgICAgTWVkaWFQbGF5ZXI6OlJlYWR5U3Rh dGUgbV9yZWFkeVN0YXRlIHsgTWVkaWFQbGF5ZXI6OkhhdmVOb3RoaW5nIH07CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXll clByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTdHJlYW1BVkZPYmpDLm1tCShyZXZpc2lvbiAyMDc3NjUpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakMubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyOCwxMiArMTI4LDI3IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmoKICAgICAvLyBGSVhNRTog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTgzNgogfQogCi12b2lk IE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZW5xdWV1ZVZpZGVvU2FtcGxl QnVmZmVyRnJvbVRyYWNrKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJiB0cmFjaywgTWVkaWFTYW1w bGUmIHNhbXBsZSkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpy ZXF1ZXN0Tm90aWZpY2F0aW9uV2hlblJlYWR5Rm9yTWVkaWFEYXRhKCkKIHsKLSAgICBpZiAoJnRy YWNrICE9IG1fbWVkaWFTdHJlYW1Qcml2YXRlLT5hY3RpdmVWaWRlb1RyYWNrKCkgfHwgIXNob3Vs ZEVucXVldWVWaWRlb1NhbXBsZUJ1ZmZlcigpKQotICAgICAgICByZXR1cm47CisgICAgW21fc2Ft cGxlQnVmZmVyRGlzcGxheUxheWVyIHJlcXVlc3RNZWRpYURhdGFXaGVuUmVhZHlPblF1ZXVlOmRp c3BhdGNoX2dldF9tYWluX3F1ZXVlKCkgdXNpbmdCbG9jazpeIHsKKyAgICAgICAgW21fc2FtcGxl QnVmZmVyRGlzcGxheUxheWVyIHN0b3BSZXF1ZXN0aW5nTWVkaWFEYXRhXTsKKworICAgICAgICB3 aGlsZSAoIW1fc2FtcGxlUXVldWUuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBpZiAoIVttX3Nh bXBsZUJ1ZmZlckRpc3BsYXlMYXllciBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YV0pIHsKKyAgICAg ICAgICAgICAgICByZXF1ZXN0Tm90aWZpY2F0aW9uV2hlblJlYWR5Rm9yTWVkaWFEYXRhKCk7Cisg ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBhdXRv IHNhbXBsZSA9IG1fc2FtcGxlUXVldWUudGFrZUZpcnN0KCk7CisgICAgICAgICAgICBlbnF1ZXVl VmlkZW9TYW1wbGVCdWZmZXIoc2FtcGxlLmdldCgpKTsKKyAgICAgICAgfQorICAgIH1dOworfQor Cit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZW5xdWV1ZVZpZGVv U2FtcGxlQnVmZmVyKE1lZGlhU2FtcGxlJiBzYW1wbGUpCit7CisgICAgQVNTRVJUKFttX3NhbXBs ZUJ1ZmZlckRpc3BsYXlMYXllciBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YV0pOwogCi0gICAgc2Ft cGxlLnNldFRpbWVzdGFtcHModG9NZWRpYVRpbWUoQ01UaW1lYmFzZUdldFRpbWUoW21fc3luY2hy b25pemVyIHRpbWViYXNlXSkpLCBNZWRpYVRpbWU6OmludmFsaWRUaW1lKCkpOwogICAgIFttX3Nh bXBsZUJ1ZmZlckRpc3BsYXlMYXllciBlbnF1ZXVlU2FtcGxlQnVmZmVyOnNhbXBsZS5wbGF0Zm9y bVNhbXBsZSgpLnNhbXBsZS5jbVNhbXBsZUJ1ZmZlcl07CiAgICAgbV9pc0ZyYW1lRGlzcGxheWVk ID0gdHJ1ZTsKIApAQCAtMTQ0LDExICsxNTksMjIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iagogICAgIH0KIH0KIAotYm9vbCBNZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakM6OnNob3VsZEVucXVldWVWaWRlb1NhbXBsZUJ1ZmZlcigpIGNvbnN0Cit2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cHJlcGFyZVZpZGVvU2Ft cGxlQnVmZmVyRnJvbVRyYWNrKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJiB0cmFjaywgTWVkaWFT YW1wbGUmIHNhbXBsZSkKIHsKLSAgICBpZiAoIVttX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciBp c1JlYWR5Rm9yTW9yZU1lZGlhRGF0YV0pCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAo JnRyYWNrICE9IG1fbWVkaWFTdHJlYW1Qcml2YXRlLT5hY3RpdmVWaWRlb1RyYWNrKCkgfHwgIXNo b3VsZEVucXVldWVWaWRlb1NhbXBsZUJ1ZmZlcigpKQorICAgICAgICByZXR1cm47CisKKyAgICBp ZiAoIVttX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YV0p IHsKKyAgICAgICAgbV9zYW1wbGVRdWV1ZS5hcHBlbmQoc2FtcGxlKTsKKyAgICAgICAgcmVxdWVz dE5vdGlmaWNhdGlvbldoZW5SZWFkeUZvck1lZGlhRGF0YSgpOworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgZW5xdWV1ZVZpZGVvU2FtcGxlQnVmZmVyKHNhbXBsZSk7Cit9CiAKK2Jvb2wg TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzaG91bGRFbnF1ZXVlVmlkZW9T YW1wbGVCdWZmZXIoKSBjb25zdAorewogICAgIGlmIChtX2Rpc3BsYXlNb2RlID09IExpdmVQcmV2 aWV3KQogICAgICAgICByZXR1cm4gdHJ1ZTsKIApAQCAtMTg5LDYgKzIxNSw3IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmoKICAgICBpZiAoIW1fc2FtcGxlQnVmZmVy RGlzcGxheUxheWVyKQogICAgICAgICByZXR1cm47CiAgICAgCisgICAgW21fc2FtcGxlQnVmZmVy RGlzcGxheUxheWVyIHN0b3BSZXF1ZXN0aW5nTWVkaWFEYXRhXTsKICAgICBbbV9zYW1wbGVCdWZm ZXJEaXNwbGF5TGF5ZXIgZmx1c2hdOwogICAgIENNVGltZSBjdXJyZW50VGltZSA9IENNVGltZWJh c2VHZXRUaW1lKFttX3N5bmNocm9uaXplciB0aW1lYmFzZV0pOwogICAgIFttX3N5bmNocm9uaXpl ciByZW1vdmVSZW5kZXJlcjptX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKSBhdFRpbWU6 Y3VycmVudFRpbWUgd2l0aENvbXBsZXRpb25IYW5kbGVyOl4oQk9PTCl7CkBAIC01MjUsNyArNTUy LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iagogICAgICAgICAv LyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTgzNgog ICAgICAgICBicmVhazsKICAgICBjYXNlIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlZpZGVvOgotICAg ICAgICBlbnF1ZXVlVmlkZW9TYW1wbGVCdWZmZXJGcm9tVHJhY2sodHJhY2ssIG1lZGlhU2FtcGxl KTsKKyAgICAgICAgcHJlcGFyZVZpZGVvU2FtcGxlQnVmZmVyRnJvbVRyYWNrKHRyYWNrLCBtZWRp YVNhbXBsZSk7CiAgICAgICAgIG1faGFzUmVjZWl2ZWRNZWRpYSA9IHRydWU7CiAgICAgICAgIHNj aGVkdWxlRGVmZXJyZWRUYXNrKFt0aGlzXSB7CiAgICAgICAgICAgICB1cGRhdGVSZWFkeVN0YXRl KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRl b0NhcHR1cmVTb3VyY2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCShyZXZpc2lvbiAyMDc3NjUp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1 cmVTb3VyY2UubW0JKHdvcmtpbmcgY29weSkKQEAgLTIwNSw2ICsyMDUsNyBAQCB2b2lkIEFWVmlk ZW9DYXB0dXJlU291cmNlOjpzZXR1cENhcHR1cmVTCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEludDpr Q1ZQaXhlbEZvcm1hdFR5cGVfMzJCR1JBXSwga0NWUGl4ZWxCdWZmZXJQaXhlbEZvcm1hdFR5cGVL ZXkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICwgbmlsXSk7CiAgICAgW3ZpZGVvT3V0cHV0IHNldFZpZGVvU2V0dGluZ3M6c2V0dGluZ3NE aWN0aW9uYXJ5LmdldCgpXTsKKyAgICBbdmlkZW9PdXRwdXQgc2V0QWx3YXlzRGlzY2FyZHNMYXRl VmlkZW9GcmFtZXM6WUVTXTsKICAgICBzZXRWaWRlb1NhbXBsZUJ1ZmZlckRlbGVnYXRlKHZpZGVv T3V0cHV0LmdldCgpKTsKIAogICAgIGlmICghW3Nlc3Npb24oKSBjYW5BZGRPdXRwdXQ6dmlkZW9P dXRwdXQuZ2V0KCldKSB7CkBAIC0yNTgsMTEgKzI1OSwyMCBAQCB2b2lkIEFWVmlkZW9DYXB0dXJl U291cmNlOjpwcm9jZXNzTmV3RnJhCiAKICAgICB1cGRhdGVGcmFtZXJhdGUoc2FtcGxlQnVmZmVy LmdldCgpKTsKIAotICAgIGJvb2wgc2V0dGluZ3NDaGFuZ2VkID0gZmFsc2U7CisgICAgQ01TYW1w bGVCdWZmZXJSZWYgbmV3U2FtcGxlQnVmZmVyID0gMDsKKyAgICBDTVNhbXBsZUJ1ZmZlckNyZWF0 ZUNvcHkoa0NGQWxsb2NhdG9yRGVmYXVsdCwgc2FtcGxlQnVmZmVyLmdldCgpLCAmbmV3U2FtcGxl QnVmZmVyKTsKKyAgICBBU1NFUlQobmV3U2FtcGxlQnVmZmVyKTsKKworICAgIENGQXJyYXlSZWYg YXR0YWNobWVudHNBcnJheSA9IENNU2FtcGxlQnVmZmVyR2V0U2FtcGxlQXR0YWNobWVudHNBcnJh eShuZXdTYW1wbGVCdWZmZXIsIHRydWUpOworICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IENG QXJyYXlHZXRDb3VudChhdHRhY2htZW50c0FycmF5KTsgKytpKSB7CisgICAgICAgIENGTXV0YWJs ZURpY3Rpb25hcnlSZWYgYXR0YWNobWVudHMgPSAoQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZilDRkFy cmF5R2V0VmFsdWVBdEluZGV4KGF0dGFjaG1lbnRzQXJyYXksIGkpOworICAgICAgICBDRkRpY3Rp b25hcnlTZXRWYWx1ZShhdHRhY2htZW50cywga0NNU2FtcGxlQXR0YWNobWVudEtleV9EaXNwbGF5 SW1tZWRpYXRlbHksIGtDRkJvb2xlYW5UcnVlKTsKKyAgICB9CiAKLSAgICBtX2J1ZmZlciA9IHNh bXBsZUJ1ZmZlcjsKKyAgICBtX2J1ZmZlciA9IG5ld1NhbXBsZUJ1ZmZlcjsKICAgICBtX2xhc3RJ bWFnZSA9IG51bGxwdHI7CiAKKyAgICBib29sIHNldHRpbmdzQ2hhbmdlZCA9IGZhbHNlOwogICAg IENNVmlkZW9EaW1lbnNpb25zIGRpbWVuc2lvbnMgPSBDTVZpZGVvRm9ybWF0RGVzY3JpcHRpb25H ZXREaW1lbnNpb25zKGZvcm1hdERlc2NyaXB0aW9uKTsKICAgICBpZiAoZGltZW5zaW9ucy53aWR0 aCAhPSBtX3dpZHRoIHx8IGRpbWVuc2lvbnMuaGVpZ2h0ICE9IG1faGVpZ2h0KSB7CiAgICAgICAg IG1fd2lkdGggPSBkaW1lbnNpb25zLndpZHRoOwpAQCAtMjczLDcgKzI4Myw3IEBAIHZvaWQgQVZW aWRlb0NhcHR1cmVTb3VyY2U6OnByb2Nlc3NOZXdGcmEKICAgICBpZiAoc2V0dGluZ3NDaGFuZ2Vk KQogICAgICAgICBzZXR0aW5nc0RpZENoYW5nZSgpOwogCi0gICAgbWVkaWFEYXRhVXBkYXRlZChN ZWRpYVNhbXBsZUFWRk9iakM6OmNyZWF0ZShzYW1wbGVCdWZmZXIuZ2V0KCkpKTsKKyAgICBtZWRp YURhdGFVcGRhdGVkKE1lZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlKG1fYnVmZmVyLmdldCgpKSk7 CiB9CiAKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVPdXRwdXREaWRPdXRwdXRT YW1wbGVCdWZmZXJGcm9tQ29ubmVjdGlvbihBVkNhcHR1cmVPdXRwdXRUeXBlKiwgQ01TYW1wbGVC dWZmZXJSZWYgc2FtcGxlQnVmZmVyLCBBVkNhcHR1cmVDb25uZWN0aW9uVHlwZSopCg==