236970 2022-02-21 05:49:30 -0800 Optimize RemoteVideoFrame handling in WebProcess WebRTC pipeline 2022-02-23 00:18:21 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble kkinnunen philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1844175 0 youennf 2022-02-21 05:49:30 -0800 Optimize RemoteVideoFrame handling in WebProcess WebRTC pipeline 1844176 1 452727 youennf 2022-02-21 05:54:15 -0800 Created attachment 452727 Patch 1845031 2 ews-feeder 2022-02-23 00:17:41 -0800 Committed r290355 (247673@main): <https://commits.webkit.org/247673@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452727. 1845032 3 webkit-bug-importer 2022-02-23 00:18:21 -0800 <rdar://problem/89341335> 452727 2022-02-21 05:54:15 -0800 2022-02-23 00:17:42 -0800 Patch bug-236970-20220221145413.patch text/plain 9837 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFlYWU2OTg2YzljOTUx NTY2OWZlYzQxNjA0YTRiYWM1NGExYTRkMS4uYWY1ZDZmMDQ0YjE1N2VhOWNlMmRhZjYwMzhjOWU3 YjUzZjczYmMxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAyLTIxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBPcHRpbWl6ZSBSZW1vdGVW aWRlb0ZyYW1lIGhhbmRsaW5nIGluIFdlYlByb2Nlc3MgV2ViUlRDIHBpcGVsaW5lCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY5NzAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjYXNlIG9mIHJlbW90 ZSB2aWRlbyBmcmFtZSwgZGlyZWN0bHkgZ2V0IHRoZSByZW1vdGUgdmlkZW8gZnJhbWUgYXMgYSBN ZWRpYVNhbXBsZSBpbiByZWNlaXZlIHNpZGUuCisgICAgICAgIE9uIHNlbmQgc2lkZSwgd3JhcCBy ZW1vdGUgdmlkZW8gZnJhbWVzIGFzIHByb3ZpZGVyLWJhc2VkIFdlYlJUQyB2aWRlbyBmcmFtZXMu CisgICAgICAgIExpYldlYlJUQ0NvZGVjcyB3aWxsIG9wdGltaXplIHRoZSBoYW5kbGluZyBvZiBy ZW1vdGUgZnJhbWVzIGZvciBoYXJkd2FyZSBlbmNvZGVycyBhbmQgbm8gY2hhbmdlIHdpbGwKKyAg ICAgICAgaGFwcGVuIGZvciBzb2Z0d2FyZSBlbmNvZGVycy4KKyAgICAgICAgQ292ZXJlZCBieSBl eGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFs dGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYS5tbToKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvUmVhbHRpbWVPdXRnb2luZ1ZpZGVvU291cmNlQ29jb2EuY3BwOgorCiAyMDIy LTAyLTIwICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIG5vbi11bmlmaWVkIGJ1aWxkIGZpeGVzIGFmdGVyIDI0NzUwOEBtYWluCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IGM2YWJkZDQ4ZGYzZmZhZmM3ZDU0MmYxODY2MjA1ZTdkNmM2MTIyNDcuLjQ2YzU3ODQ4YzVi MjZhODkxMmFmODMwMGQ2NzRmMWY0NzM5MDM5MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMjItMDItMjEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAg IE9wdGltaXplIFJlbW90ZVZpZGVvRnJhbWUgaGFuZGxpbmcgaW4gV2ViUHJvY2VzcyBXZWJSVEMg cGlwZWxpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNjk3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpeCBidWcgaW4gTGliV2ViUlRDQ29kZWNzUHJveHkgdGhhdCB3b3VsZCBtYWtlIHVzZSBvZiBz aGFyZWQgdmlkZW8gZnJhbWUgaW5zdGVhZCBvZiByZW1vdGUgdmlkZW8gZnJhbWUgd2hlbiBhIHNo YXJlZCB2aWRlbyBmcmFtZSBpcyBhdmFpbGFibGUuCisgICAgICAgIFVzZSBWaWRlb0ZyYW1lKiBh cyB3ZWJydGMgZnJhbWUgcHJvdmlkZXIgZm9yIGVuY29kaW5nIGFuZCBkZWNvZGluZy4KKworICAg ICAgICAqIEdQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0NvZGVjc1Byb3h5Lm1tOgorICAgICAg ICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZVZpZGVvRnJhbWVQcm94eS5oOgorICAgICAg ICAqIFdlYlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuY3BwOgorCiAyMDIyLTAy LTE5ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAogICAgICAgICBUdXJuIFdlYkdMIGlu IEdQVSBQcm9jZXNzIG9uIGJ5IGRlZmF1bHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYS5t bSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29t aW5nVmlkZW9Tb3VyY2VDb2NvYS5tbQppbmRleCBjZjAzODRiOTlkYjRjOWNkODlhZGFhYmM0YTU0 ZjVjYzYyMzEwOGU2Li5mMTBjZmUxZjAyOWJmNjY0Y2M4MjMyZDYxN2FmYjE2MDRiYzk3NGIwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRp bWVJbmNvbWluZ1ZpZGVvU291cmNlQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZUNvY29hLm1tCkBA IC0zMyw2ICszMyw3IEBACiAjaW1wb3J0ICJDVlV0aWxpdGllcy5oIgogI2ltcG9ydCAiTG9nZ2lu Zy5oIgogI2ltcG9ydCAiTWVkaWFTYW1wbGVBVkZPYmpDLmgiCisjaW1wb3J0ICJWaWRlb0ZyYW1l LmgiCiAjaW1wb3J0IDx3dGYvY2YvVHlwZUNhc3RzQ0YuaD4KIAogQUxMT1dfVU5VU0VEX1BBUkFN RVRFUlNfQkVHSU4KQEAgLTEyNyw3ICsxMjgsMTEgQEAgUmVmUHRyPE1lZGlhU2FtcGxlPiBSZWFs dGltZUluY29taW5nVmlkZW9Tb3VyY2VDb2NvYTo6dG9WaWRlb0ZyYW1lKGNvbnN0IHdlYnJ0YzoK ICAgICAgICAgcmV0dXJuIGNyZWF0ZU1lZGlhU2FtcGxlRnJvbUNWUGl4ZWxCdWZmZXIobV9ibGFj a0ZyYW1lLmdldCgpLCByb3RhdGlvbiwgZnJhbWUudGltZXN0YW1wX3VzKCkpOwogICAgIH0KIAot ICAgIC8vIEZJWE1FOiBEZXRlY3QgdGhlIGNhc2Ugb2YgZnJhbWUgaGF2aW5nIGEgRnJhbWVCdWZm ZXJQcm92aWRlci4KKyAgICBpZiAoYXV0byogcHJvdmlkZXIgPSB2aWRlb0ZyYW1lQnVmZmVyUHJv dmlkZXIoZnJhbWUpKSB7CisgICAgICAgIC8vIFRoZSBvbmx5IHN1cHBvcnRlZCBwcm92aWRlciBp cyBWaWRlb0ZyYW1lLgorICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VmlkZW9GcmFtZSo+KHBy b3ZpZGVyKTsKKyAgICB9CisKICAgICAvLyBJbiBjYXNlIG9mIGluIG1lbW9yeSBzYW1wbGVzLCB3 ZSBoYXZlIG5vbiBpbnRlcmxlYXZlZCBZVVYgZGF0YSB3aGlsZSBDVlBpeGVsQnVmZmVycyBwcmVm ZXIgaW50ZXJsZWF2ZWQgWVVWIGRhdGEuCiAgICAgLy8gTWF5YmUgd2Ugc2hvdWxkIGludHJvZHVj ZSBhIE1lZGlhU2FtcGxlIHRoYXQgd291bGQgcmVwcmVzZW50IG5vbiBpbnRlcmxlYXZlZCBZVVYg ZGF0YSBhcyBhbiBvcHRpbWl6YXRpb24uCiAgICAgYXV0byBwaXhlbEJ1ZmZlciA9IGFkb3B0Q0Yo d2VicnRjOjpjcmVhdGVQaXhlbEJ1ZmZlckZyb21GcmFtZShmcmFtZSwgW3RoaXNdKHNpemVfdCB3 aWR0aCwgc2l6ZV90IGhlaWdodCwgd2VicnRjOjpCdWZmZXJUeXBlIGJ1ZmZlclR5cGUpIC0+IENW UGl4ZWxCdWZmZXJSZWYgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL1JlYWx0aW1lT3V0Z29pbmdWaWRlb1NvdXJjZUNvY29hLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZU91dGdvaW5nVmlkZW9T b3VyY2VDb2NvYS5jcHAKaW5kZXggNjk1MjA1ZjUwZjkyMzJhNDJiY2E1MDBiMjQ0Yzg5OGZiYTY3 NzE3MC4uYTZlYjE5ZDMyYTI0NDQxNGQ5NTEyNTU0MTJkNTg5Y2IwNDZjNzA5OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lT3V0Z29p bmdWaWRlb1NvdXJjZUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvUmVhbHRpbWVPdXRnb2luZ1ZpZGVvU291cmNlQ29jb2EuY3BwCkBAIC0zMyw2 ICszMyw3IEBACiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlJlYWx0aW1lSW5jb21p bmdWaWRlb1NvdXJjZUNvY29hLmgiCiAjaW5jbHVkZSAiUmVhbHRpbWVWaWRlb1V0aWxpdGllcy5o IgorI2luY2x1ZGUgIlZpZGVvRnJhbWUuaCIKIAogQUxMT1dfVU5VU0VEX1BBUkFNRVRFUlNfQkVH SU4KIApAQCAtODQsNyArODUsMTcgQEAgdm9pZCBSZWFsdGltZU91dGdvaW5nVmlkZW9Tb3VyY2VD b2NvYTo6dmlkZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFTYW1wbGUmIHNhbXBsZSwKICAgICAgICAg YnJlYWs7CiAgICAgfQogCi0gICAgLy8gRklYTUU6IE9wdGltaXplIHRoZSBjYXNlIG9mIFBsYXRm b3JtU2FtcGxlOjpSZW1vdGVWaWRlb0ZyYW1lUHJveHlUeXBlLgorICAgIGJvb2wgc2hvdWxkQXBw bHlSb3RhdGlvbiA9IG1fc2hvdWxkQXBwbHlSb3RhdGlvbiAmJiBtX2N1cnJlbnRSb3RhdGlvbiAh PSB3ZWJydGM6OmtWaWRlb1JvdGF0aW9uXzA7CisgICAgaWYgKCFzaG91bGRBcHBseVJvdGF0aW9u ICYmIGlzPFZpZGVvRnJhbWU+KHNhbXBsZSkgJiYgZG93bmNhc3Q8VmlkZW9GcmFtZT4oc2FtcGxl KS5pc1JlbW90ZVByb3h5KCkpIHsKKyAgICAgICAgUmVmIHZpZGVvRnJhbWUgeyBkb3duY2FzdDxW aWRlb0ZyYW1lPihzYW1wbGUpIH07CisgICAgICAgIGF1dG8gc2l6ZSA9IHNhbXBsZS5wcmVzZW50 YXRpb25TaXplKCk7CisgICAgICAgIHNlbmRGcmFtZSh3ZWJydGM6OnRvV2ViUlRDVmlkZW9GcmFt ZUJ1ZmZlcigmdmlkZW9GcmFtZS5sZWFrUmVmKCksCisgICAgICAgICAgICBbXShhdXRvKiBwb2lu dGVyKSB7IHJldHVybiBzdGF0aWNfY2FzdDxWaWRlb0ZyYW1lKj4ocG9pbnRlciktPnBpeGVsQnVm ZmVyKCk7IH0sCisgICAgICAgICAgICBbXShhdXRvKiBwb2ludGVyKSB7IHN0YXRpY19jYXN0PFZp ZGVvRnJhbWUqPihwb2ludGVyKS0+ZGVyZWYoKTsgfSwKKyAgICAgICAgICAgIHN0YXRpY19jYXN0 PGludD4oc2l6ZS53aWR0aCgpKSwgc3RhdGljX2Nhc3Q8aW50PihzaXplLmhlaWdodCgpKSkpOwor ICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgYXV0byBwaXhlbEJ1ZmZlciA9IHNhbXBsZS5w aXhlbEJ1ZmZlcigpOwogICAgIGF1dG8gcGl4ZWxGb3JtYXRUeXBlID0gQ1ZQaXhlbEJ1ZmZlckdl dFBpeGVsRm9ybWF0VHlwZShwaXhlbEJ1ZmZlcik7CiAKQEAgLTkyLDcgKzEwMyw3IEBAIHZvaWQg UmVhbHRpbWVPdXRnb2luZ1ZpZGVvU291cmNlQ29jb2E6OnZpZGVvU2FtcGxlQXZhaWxhYmxlKE1l ZGlhU2FtcGxlJiBzYW1wbGUsCiAgICAgaWYgKHBpeGVsRm9ybWF0VHlwZSAhPSBwcmVmZXJlZFBp eGVsQnVmZmVyRm9ybWF0KCkpCiAgICAgICAgIGNvbnZlcnRlZEJ1ZmZlciA9IGNvbnZlcnRUb1lV VihwaXhlbEJ1ZmZlcik7CiAKLSAgICBpZiAobV9zaG91bGRBcHBseVJvdGF0aW9uICYmIG1fY3Vy cmVudFJvdGF0aW9uICE9IHdlYnJ0Yzo6a1ZpZGVvUm90YXRpb25fMCkKKyAgICBpZiAoc2hvdWxk QXBwbHlSb3RhdGlvbikKICAgICAgICAgY29udmVydGVkQnVmZmVyID0gcm90YXRlUGl4ZWxCdWZm ZXIoY29udmVydGVkQnVmZmVyLmdldCgpLCBtX2N1cnJlbnRSb3RhdGlvbik7CiAKICAgICBzZW5k RnJhbWUod2VicnRjOjpwaXhlbEJ1ZmZlclRvRnJhbWUoY29udmVydGVkQnVmZmVyLmdldCgpKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0Nv ZGVjc1Byb3h5Lm1tIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVEND b2RlY3NQcm94eS5tbQppbmRleCBlZGM2ZDY2NjY3YmRiM2ZhYWEwNzljYzM4YWU1YmU0Njk2MGQx N2ViLi43ODQ2MTQ5ZTg1MDg0MjRlZDA4YzIwM2ZmODA4MWJlMjFlM2JkNjc4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0NvZGVjc1Byb3h5Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDQ29kZWNzUHJv eHkubW0KQEAgLTI0OSwxNCArMjQ5LDE2IEBAIHZvaWQgTGliV2ViUlRDQ29kZWNzUHJveHk6OmVu Y29kZUZyYW1lKFJUQ0VuY29kZXJJZGVudGlmaWVyIGlkZW50aWZpZXIsIFdlYkNvcmU6CiAgICAg ICAgIHJldHVybjsKIAogI2lmICFQTEFURk9STShNQUNDQVRBTFlTVCkKLSAgICBpZiAoc2FtcGxl LnN1cmZhY2UoKSkgewotICAgICAgICBpZiAoYXV0byBidWZmZXIgPSBXZWJDb3JlOjpjcmVhdGVD VlBpeGVsQnVmZmVyKHNhbXBsZS5zdXJmYWNlKCkpKQotICAgICAgICAgICAgcGl4ZWxCdWZmZXIg PSBXVEZNb3ZlKCpidWZmZXIpOwotICAgIH0gZWxzZSBpZiAoZW5jb2Rlci0+ZnJhbWVSZWFkZXIp Ci0gICAgICAgIHBpeGVsQnVmZmVyID0gZW5jb2Rlci0+ZnJhbWVSZWFkZXItPnJlYWQoKTsKLQot ICAgIGlmICghcGl4ZWxCdWZmZXIpCi0gICAgICAgIHJldHVybjsKKyAgICBpZiAoIXBpeGVsQnVm ZmVyKSB7CisgICAgICAgIGlmIChzYW1wbGUuc3VyZmFjZSgpKSB7CisgICAgICAgICAgICBpZiAo YXV0byBidWZmZXIgPSBXZWJDb3JlOjpjcmVhdGVDVlBpeGVsQnVmZmVyKHNhbXBsZS5zdXJmYWNl KCkpKQorICAgICAgICAgICAgICAgIHBpeGVsQnVmZmVyID0gV1RGTW92ZSgqYnVmZmVyKTsKKyAg ICAgICAgfSBlbHNlIGlmIChlbmNvZGVyLT5mcmFtZVJlYWRlcikKKyAgICAgICAgICAgIHBpeGVs QnVmZmVyID0gZW5jb2Rlci0+ZnJhbWVSZWFkZXItPnJlYWQoKTsKKworICAgICAgICBpZiAoIXBp eGVsQnVmZmVyKQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIHdlYnJ0Yzo6ZW5j b2RlTG9jYWxFbmNvZGVyRnJhbWUoZW5jb2Rlci0+d2VicnRjRW5jb2RlciwgcGl4ZWxCdWZmZXIu Z2V0KCksIHNhbXBsZS50aW1lKCkudG9UaW1lU2NhbGUoMTAwMDAwMCkudGltZVZhbHVlKCksIHRp bWVTdGFtcCwgdG9XZWJSVENWaWRlb1JvdGF0aW9uKHNhbXBsZS5yb3RhdGlvbigpKSwgc2hvdWxk RW5jb2RlQXNLZXlGcmFtZSk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlVmlkZW9GcmFtZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZVZpZGVvRnJhbWVQcm94eS5oCmluZGV4IDBlZWM3 Y2M0YmI1NjE2YmQyZWMyZmNmNjhhOWJkYjkzZDZkNjIwM2IuLmRhY2Q4ODY0OGIxMmJhNjE3ZDcw MzhmODZkNDk0MmQ0OGJkOGIzYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvbWVkaWEvUmVtb3RlVmlkZW9GcmFtZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0dQVS9tZWRpYS9SZW1vdGVWaWRlb0ZyYW1lUHJveHkuaApAQCAtODEsNyArODEs NyBAQCBwdWJsaWM6CiAgICAgUmVtb3RlVmlkZW9GcmFtZVdyaXRlUmVmZXJlbmNlIHdyaXRlKCkg Y29uc3Q7CiAgICAgUmVtb3RlVmlkZW9GcmFtZVJlYWRSZWZlcmVuY2UgcmVhZCgpIGNvbnN0Owog Ci0gICAgV2ViQ29yZTo6SW50U2l6ZSBzaXplKCkgY29uc3Q7CisgICAgV2ViQ29yZTo6SW50U2l6 ZSBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9zaXplOyB9CiAKICAgICAvLyBXZWJDb3JlOjpWaWRl b0ZyYW1lIG92ZXJyaWRlcy4KICAgICBXZWJDb3JlOjpGbG9hdFNpemUgcHJlc2VudGF0aW9uU2l6 ZSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1fc2l6ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0xpYldlYlJUQ0NvZGVjcy5jcHAKaW5kZXggZDA3 MGMyYjc5ZGY0MGNhY2I0MThmMDY3ODI2N2U0YzNiNGE1NDYxYy4uN2UyMTllODg3NmFiMDQ2OWJh N2MzMmUzZjc2MmIyNGNlNjUxNDJhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0dQVS93ZWJydGMvTGliV2ViUlRDQ29kZWNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3MuY3BwCkBAIC0zNDMsOSArMzQzLDEw IEBAIHZvaWQgTGliV2ViUlRDQ29kZWNzOjpjb21wbGV0ZWREZWNvZGluZyhSVENEZWNvZGVySWRl bnRpZmllciBkZWNvZGVySWRlbnRpZmllciwKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKHJl bW90ZVZpZGVvRnJhbWUpIHsKLSAgICAgICAgd2VicnRjOjp2aWRlb0RlY29kZXJUYXNrQ29tcGxl dGUoZGVjb2Rlci0+ZGVjb2RlZEltYWdlQ2FsbGJhY2ssIHRpbWVTdGFtcCwgcmVtb3RlU2FtcGxl LnRpbWUoKS50b0RvdWJsZSgpLCByZW1vdGVWaWRlb0ZyYW1lLmxlYWtSZWYoKSwKLSAgICAgICAg ICAgIFtdKGF1dG8qIHBvaW50ZXIpIHsgcmV0dXJuIHN0YXRpY19jYXN0PFJlbW90ZVZpZGVvRnJh bWVQcm94eSo+KHBvaW50ZXIpLT5waXhlbEJ1ZmZlcigpOyB9LAotICAgICAgICAgICAgW10oYXV0 byogcG9pbnRlcikgeyBzdGF0aWNfY2FzdDxSZW1vdGVWaWRlb0ZyYW1lUHJveHkqPihwb2ludGVy KS0+ZGVyZWYoKTsgfSwKKyAgICAgICAgUmVmIHZpZGVvRnJhbWUgeyBzdGF0aWNfY2FzdDxWaWRl b0ZyYW1lJj4oKnJlbW90ZVZpZGVvRnJhbWUpIH07CisgICAgICAgIHdlYnJ0Yzo6dmlkZW9EZWNv ZGVyVGFza0NvbXBsZXRlKGRlY29kZXItPmRlY29kZWRJbWFnZUNhbGxiYWNrLCB0aW1lU3RhbXAs IHJlbW90ZVNhbXBsZS50aW1lKCkudG9Eb3VibGUoKSwgJnZpZGVvRnJhbWUubGVha1JlZigpLAor ICAgICAgICAgICAgW10oYXV0byogcG9pbnRlcikgeyByZXR1cm4gc3RhdGljX2Nhc3Q8VmlkZW9G cmFtZSo+KHBvaW50ZXIpLT5waXhlbEJ1ZmZlcigpOyB9LAorICAgICAgICAgICAgW10oYXV0byog cG9pbnRlcikgeyBzdGF0aWNfY2FzdDxWaWRlb0ZyYW1lKj4ocG9pbnRlciktPmRlcmVmKCk7IH0s CiAgICAgICAgICAgICByZW1vdGVTYW1wbGUuc2l6ZSgpLndpZHRoKCksIHJlbW90ZVNhbXBsZS5z aXplKCkuaGVpZ2h0KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNDU3LDEwICs0NTgs MTAgQEAgaW50MzJfdCBMaWJXZWJSVENDb2RlY3M6OmVuY29kZUZyYW1lKEVuY29kZXImIGVuY29k ZXIsIGNvbnN0IHdlYnJ0Yzo6VmlkZW9GcmFtZSYKICAgICAgICAgcmV0dXJuIFdFQlJUQ19WSURF T19DT0RFQ19FUlJPUjsKIAogICAgIHN0ZDo6b3B0aW9uYWw8UmVtb3RlVmlkZW9GcmFtZVJlYWRS ZWZlcmVuY2U+IHJlbW90ZVZpZGVvRnJhbWVSZWFkUmVmZXJlbmNlOwotICAgIGlmIChhdXRvIHBy b3ZpZGVyID0gd2VicnRjOjp2aWRlb0ZyYW1lQnVmZmVyUHJvdmlkZXIoZnJhbWUpKSB7Ci0gICAg ICAgIGF1dG8mIG1lZGlhU2FtcGxlID0gKnN0YXRpY19jYXN0PE1lZGlhU2FtcGxlKj4ocHJvdmlk ZXIpOwotICAgICAgICBpZiAoaXM8UmVtb3RlVmlkZW9GcmFtZVByb3h5PihtZWRpYVNhbXBsZSkp Ci0gICAgICAgICAgICByZW1vdGVWaWRlb0ZyYW1lUmVhZFJlZmVyZW5jZSA9IGRvd25jYXN0PFJl bW90ZVZpZGVvRnJhbWVQcm94eT4obWVkaWFTYW1wbGUpLnJlYWQoKTsKKyAgICBpZiAoYXV0byog cHJvdmlkZXIgPSB3ZWJydGM6OnZpZGVvRnJhbWVCdWZmZXJQcm92aWRlcihmcmFtZSkpIHsKKyAg ICAgICAgYXV0byogdmlkZW9GcmFtZSA9IHN0YXRpY19jYXN0PFZpZGVvRnJhbWUqPihwcm92aWRl cik7CisgICAgICAgIGlmIChpczxSZW1vdGVWaWRlb0ZyYW1lUHJveHk+KHZpZGVvRnJhbWUpKQor ICAgICAgICAgICAgcmVtb3RlVmlkZW9GcmFtZVJlYWRSZWZlcmVuY2UgPSBkb3duY2FzdDxSZW1v dGVWaWRlb0ZyYW1lUHJveHk+KHZpZGVvRnJhbWUpLT5yZWFkKCk7CiAgICAgfQogCiAgICAgUmV0 YWluUHRyPENWUGl4ZWxCdWZmZXJSZWY+IGJ1ZmZlcjsK