176281 2017-09-02 13:10:23 -0700 track.onmute isn't called for a remote MediaStreamTrack when its counter part track is removed from the peer connection 2018-09-17 15:22:26 -0700 1 1 1 Unclassified WebKit WebRTC Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ben.browitt youennf commit-queue cwehrung eric.carlson jer.noble webkit-bug-importer youennf oldest_to_newest 1344851 0 319733 ben.browitt 2017-09-02 13:10:23 -0700 Created attachment 319733 Test There is no way to detect when a remote peer removes a track in a WebRTC call. I've tried track.onended, track.onmute, stream.onremovetrack: pc.ontrack = function(e) { var track = e.track; var stream = e.streams[0]; // try to detect when a remote track is removed track.onended = function() {console.log('onended')}; track.onmute = function() {console.log('onmute')}; stream.onremovetrack = function() {console.log('onremovetrack')}; } In the attached track.html example you should see "video ended" and "audio ended" in Chrome and Firefox but not in Safari 11.1 Release 38. 1460140 1 cwehrung 2018-09-17 05:14:13 -0700 Hitting the same issue. There doesn't seem to be any good workaround. Ideas? 1460225 2 webkit-bug-importer 2018-09-17 10:53:14 -0700 <rdar://problem/44525674> 1460226 3 youennf 2018-09-17 10:53:43 -0700 Hi Ben, Clement, thanks for the report and test case. As per spec, the track should be muted so an unmute event should probably happen. 1460248 4 349915 youennf 2018-09-17 11:30:22 -0700 Created attachment 349915 Patch 1460253 5 cwehrung 2018-09-17 11:48:03 -0700 Happy to test further tomorrow but I did set onmute to the same callback in doubt and it didn't work. Only testing for remote stream. Thanks for looking into it! 1460254 6 cwehrung 2018-09-17 11:49:47 -0700 The proposed workaround from the webrtc-discuss thread works but it's less than ideal: check setRemoteDescription and cache previous media IDs to compare later if one has disappeared 1460260 7 youennf 2018-09-17 12:19:13 -0700 (In reply to Clement Wehrung from comment #5) > Happy to test further tomorrow but I did set onmute to the same callback in > doubt and it didn't work. Only testing for remote stream. Thanks for looking > into it! Right, WebKit is not currently doing so and the posted patch should fix it. 1460313 8 349915 eric.carlson 2018-09-17 13:49:41 -0700 Comment on attachment 349915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349915&action=review > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:489 > + auto* backend = static_cast<LibWebRTCRtpSenderBackend*>(transceiver->sender().backend()); Nit: downcast<LibWebRTCRtpSenderBackend> would be better, although it is probably a big enough change that you may want to do it in a separate patch. 1460335 9 youennf 2018-09-17 14:55:59 -0700 (In reply to Eric Carlson from comment #8) > Comment on attachment 349915 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=349915&action=review > > > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:489 > > + auto* backend = static_cast<LibWebRTCRtpSenderBackend*>(transceiver->sender().backend()); > > Nit: downcast<LibWebRTCRtpSenderBackend> would be better, although it is > probably a big enough change that you may want to do it in a separate patch. Right, let's do that in a follow-up patch 1460360 10 349915 commit-queue 2018-09-17 15:22:24 -0700 Comment on attachment 349915 Patch Clearing flags on attachment: 349915 Committed r236090: <https://trac.webkit.org/changeset/236090> 1460361 11 commit-queue 2018-09-17 15:22:26 -0700 All reviewed patches have been landed. Closing bug. 319733 2017-09-02 13:10:23 -0700 2017-09-02 13:10:23 -0700 Test track.html text/html 1856 ben.browitt PCFkb2N0eXBlIGh0bWw+DQo8aHRtbCBsYW5nPSJlbiI+DQo8aGVhZD4NCiAgPG1ldGEgY2hhcnNl dD0idXRmLTgiPg0KICA8dGl0bGU+PC90aXRsZT4NCjwvaGVhZD4NCjxib2R5Pg0KCTx2aWRlbyBp ZD0idmlkZW8xIiBoZWlnaHQ9IjEyMCIgd2lkdGg9IjE2MCIgYXV0b3BsYXkgbXV0ZWQ+PC92aWRl bz4NCgk8dmlkZW8gaWQ9InZpZGVvMiIgaGVpZ2h0PSIxMjAiIHdpZHRoPSIxNjAiIGF1dG9wbGF5 IG11dGVkPjwvdmlkZW8+PGJyPg0KCTxidXR0b24gaWQ9InJlbW92ZSI+UmVtb3ZlIHRyYWNrczwv YnV0dG9uPjxicj4NCgk8ZGl2IGlkPSJsb2ciPjwvZGl2Pg0KCTxzY3JpcHQgc3JjPSJodHRwczov L3dlYnJ0Yy5naXRodWIuaW8vYWRhcHRlci9hZGFwdGVyLWxhdGVzdC5qcyI+PC9zY3JpcHQ+DQoJ PHNjcmlwdD4NCgkJdmFyICB2aWRlbzEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndmlkZW8x JyksDQoJCQkgdmlkZW8yID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3ZpZGVvMicpLA0KCQkg ICAgIHJlbW92ZUJ0biA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZW1vdmUnKSwNCgkJCSBw YzEgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKSwNCgkJICAgICBwYzIgPSBuZXcgUlRDUGVlckNv bm5lY3Rpb24oKTsNCgkJIA0KCXZhciBsb2cgPSBmdW5jdGlvbihtc2cpIHsNCgkgIHZhciBlbCA9 IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdsb2cnKTsNCgkgIGVsLmlubmVySFRNTCArPSBtc2cg KyAiPGJyPiI7DQoJfSAgICAgDQoJCSANCgl2YXIgbmVnb3RpYXRlID0gZnVuY3Rpb24oKSB7DQoJ ICBwYzEuY3JlYXRlT2ZmZXIoKS50aGVuKGQgPT4gcGMxLnNldExvY2FsRGVzY3JpcHRpb24oZCkp DQoJICAudGhlbigoKSA9PiBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24ocGMxLmxvY2FsRGVzY3Jp cHRpb24pKQ0KCSAgLnRoZW4oKCkgPT4gcGMyLmNyZWF0ZUFuc3dlcigpKS50aGVuKGQgPT4gcGMy LnNldExvY2FsRGVzY3JpcHRpb24oZCkpDQoJICAudGhlbigoKSA9PiBwYzEuc2V0UmVtb3RlRGVz Y3JpcHRpb24ocGMyLmxvY2FsRGVzY3JpcHRpb24pKQ0KCSAgLmNhdGNoKGxvZyk7DQoJfQ0KDQoJ cmVtb3ZlQnRuLm9uY2xpY2sgPSBmdW5jdGlvbigpIHsNCgkgIHBjMS5nZXRTZW5kZXJzKCkuZm9y RWFjaChmdW5jdGlvbihzZW5kZXIpIHsNCgkJc2VuZGVyLnRyYWNrLnN0b3AoKTsNCgkJcGMxLnJl bW92ZVRyYWNrKHNlbmRlcik7DQoJICB9KTsNCgkgIG5lZ290aWF0ZSgpOw0KCX0NCg0KCW5hdmln YXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHt2aWRlbzogdHJ1ZSwgYXVkaW86IHRydWV9 KQ0KCS50aGVuKHN0cmVhbSA9PiB7DQoJICBwYzEuYWRkVHJhY2soc3RyZWFtLmdldEF1ZGlvVHJh Y2tzKClbMF0sIHN0cmVhbSk7DQoJICBwYzEuYWRkVHJhY2soc3RyZWFtLmdldFZpZGVvVHJhY2tz KClbMF0sIHN0cmVhbSk7DQoJICB2aWRlbzEuc3JjT2JqZWN0ID0gc3RyZWFtOw0KCSAgbmVnb3Rp YXRlKCkNCgl9KQ0KCS5jYXRjaChlID0+IGxvZyhlKSk7DQoNCglwYzEub25pY2VjYW5kaWRhdGUg PSBlID0+IHBjMi5hZGRJY2VDYW5kaWRhdGUoZS5jYW5kaWRhdGUpOw0KCXBjMi5vbmljZWNhbmRp ZGF0ZSA9IGUgPT4gcGMxLmFkZEljZUNhbmRpZGF0ZShlLmNhbmRpZGF0ZSk7DQoNCglwYzIub250 cmFjayA9IGZ1bmN0aW9uKGUpIHsNCgkgIHZhciB0cmFjayA9IGUudHJhY2s7DQoJICB2YXIgc3Ry ZWFtID0gZS5zdHJlYW1zWzBdOw0KCSAgdmlkZW8yLnNyY09iamVjdCA9IHN0cmVhbTsNCgkgIHRy YWNrLm9uZW5kZWQgPSBmdW5jdGlvbigpIHsgbG9nKHRyYWNrLmtpbmQgKyAnIGVuZGVkJyl9Ow0K CX0NCgk8L3NjcmlwdD4NCjwvYm9keT4NCjwvaHRtbD4= 349915 2018-09-17 11:30:22 -0700 2018-09-17 15:22:24 -0700 Patch bug-176281-20180917113022.patch text/plain 9940 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M0NjAxMTNmY2M2ZWM0 MjEwOTg5NjE0ZWQzMWZiOGJjMDc1N2I2Yy4uMTAwYmM1ZDUxYTlhZmJkMTljMzdiODdiZjRiNWQ3 OWI3NGJiYWM3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA5LTE3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICB0cmFjay5vbm11dGUgaXNu J3QgY2FsbGVkIGZvciBhIHJlbW90ZSBNZWRpYVN0cmVhbVRyYWNrIHdoZW4gaXRzIGNvdW50ZXIg cGFydCB0cmFjayBpcyByZW1vdmVkIGZyb20gdGhlIHBlZXIgY29ubmVjdGlvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2MjgxCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS80NDUyNTY3ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMaXN0ZW4gdG8gbGlid2VicnRjIHJlbW92ZSB0cmFjayBjYWxsYmFj a3MuCisgICAgICAgIEltcGxlbWVudCBoYW5kbGluZyBhcyBwZXIgaHR0cHM6Ly93M2MuZ2l0aHVi LmlvL3dlYnJ0Yy1wYy8jcHJvY2Vzcy1yZW1vdGUtdHJhY2stcmVtb3ZhbC4KKyAgICAgICAgVGhp cyB0cmlnZ2VycyBhIG11dGUgZXZlbnQgb24gdGhlIHRyYWNrLgorCisgICAgICAgIFRlc3Q6IHdl YnJ0Yy9yZW1vdmUtdHJhY2suaHRtbAorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9s aWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM aWJXZWJSVENNZWRpYUVuZHBvaW50OjpyZW1vdmVSZW1vdGVUcmFjayk6CisgICAgICAgIChXZWJD b3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpPblJlbW92ZVRyYWNrKToKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50Lmg6Cisg ICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5l Y3Rpb25CYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ1BlZXJDb25uZWN0 aW9uQmFja2VuZDo6c2hvdWxkT2ZmZXJBbGxvd1RvUmVjZWl2ZSBjb25zdCk6CisgICAgICAgIERy aXZlIGJ5IGZpeDogUGxhbiBCIGNvZGUgcGF0aCBkb2VzIG5vdCBtYW5kYXRlIGhhdmluZyBhbiBy dGMgYmFja2VuZCBmb3IgZWFjaCBzZW5kZXIuCisKIDIwMTgtMDktMTcgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBWQ1AgZm9yIGlPUyBhbmQgcmVl bmFibGUgaXQgZm9yIE1hY09TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9p bnQuY3BwCmluZGV4IDg1MzVkMmI3MmJjMTZlNjdmZTFkMGY5NTI1MmNhY2Y3MzhkZWIyMDIuLmIy NWI1NjRmMmJlNzFhZTJlYTVkYjBlOWQzOWZiZGZkYjhlMDdlMjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5k cG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCkBAIC00NDUsNiArNDQ1LDIyIEBAIHZvaWQg TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6bmV3VHJhbnNjZWl2ZXIocnRjOjpzY29wZWRfcmVmcHRy PHdlYnJ0Yzo6UnRwVHJhbnNjCiAgICAgZmlyZVRyYWNrRXZlbnQobWFrZVJlZihuZXdUcmFuc2Nl aXZlci5yZWNlaXZlcigpKSwgbmV3VHJhbnNjZWl2ZXIucmVjZWl2ZXIoKS50cmFjaygpLCBydGNS ZWNlaXZlci0+c3RyZWFtcygpLCBtYWtlUmVmKG5ld1RyYW5zY2VpdmVyKSk7CiB9CiAKK3ZvaWQg TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6cmVtb3ZlUmVtb3RlVHJhY2socnRjOjpzY29wZWRfcmVm cHRyPHdlYnJ0Yzo6UnRwUmVjZWl2ZXJJbnRlcmZhY2U+JiYgcmVjZWl2ZXIpCit7CisgICAgLy8g RklYTUU6IFN1cHBvcnQgcGxhbiBCIGNvZGUgcGF0aC4KKyAgICBpZiAoIVJ1bnRpbWVFbmFibGVk RmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkud2ViUlRDVW5pZmllZFBsYW5FbmFibGVkKCkpCisg ICAgICAgIHJldHVybjsKKworICAgIGF1dG8qIHRyYW5zY2VpdmVyID0gbV9wZWVyQ29ubmVjdGlv bkJhY2tlbmQuZXhpc3RpbmdUcmFuc2NlaXZlcihbJnJlY2VpdmVyXShhdXRvJiB0cmFuc2NlaXZl ckJhY2tlbmQpIHsKKyAgICAgICAgYXV0byogcnRjVHJhbnNjZWl2ZXIgPSB0cmFuc2NlaXZlckJh Y2tlbmQucnRjVHJhbnNjZWl2ZXIoKTsKKyAgICAgICAgcmV0dXJuIHJ0Y1RyYW5zY2VpdmVyICYm IHJlY2VpdmVyLmdldCgpID09IHJ0Y1RyYW5zY2VpdmVyLT5yZWNlaXZlcigpLmdldCgpOworICAg IH0pOworICAgIGlmICghdHJhbnNjZWl2ZXIpCisgICAgICAgIHJldHVybjsKKworICAgIHRyYW5z Y2VpdmVyLT5yZWNlaXZlcigpLnRyYWNrKCkuc291cmNlKCkuc2V0TXV0ZWQodHJ1ZSk7Cit9CisK IHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiBzdGQ6Om9wdGlvbmFsPExpYldlYlJUQ01lZGlhRW5kcG9p bnQ6OkJhY2tlbmRzPiBMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpjcmVhdGVUcmFuc2NlaXZlckJh Y2tlbmRzKFQmJiB0cmFja09yS2luZCwgY29uc3QgUlRDUnRwVHJhbnNjZWl2ZXJJbml0JiBpbml0 LCBMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kOjpTb3VyY2UmJiBzb3VyY2UpCiB7CkBAIC01NDYs NiArNTYyLDE0IEBAIHZvaWQgTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6T25UcmFjayhydGM6OnNj b3BlZF9yZWZwdHI8d2VicnRjOjpSdHBUcmFuc2NlaXZlckluCiAgICAgfSk7CiB9CiAKK3ZvaWQg TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6T25SZW1vdmVUcmFjayhydGM6OnNjb3BlZF9yZWZwdHI8 d2VicnRjOjpSdHBSZWNlaXZlckludGVyZmFjZT4gcmVjZWl2ZXIpCit7CisgICAgY2FsbE9uTWFp blRocmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCByZWNlaXZlciA9IFdURk1v dmUocmVjZWl2ZXIpXSgpIG11dGFibGUgeworICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+aXNT dG9wcGVkKCkpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHByb3RlY3RlZFRoaXMtPnJl bW92ZVJlbW90ZVRyYWNrKFdURk1vdmUocmVjZWl2ZXIpKTsKKyAgICB9KTsKK30KIAogc3RkOjp1 bmlxdWVfcHRyPFJUQ0RhdGFDaGFubmVsSGFuZGxlcj4gTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6 Y3JlYXRlRGF0YUNoYW5uZWwoY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgUlRDRGF0YUNoYW5u ZWxJbml0JiBvcHRpb25zKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2lu dC5oCmluZGV4IDU4MDZhODMwNTgyZDUwZGE3YmM2MWE2NDQxZDgwZTVjNjU0MjJlZjQuLjE3N2U3 YWExNDNmNjdkOWMyNjk3NTE3MGU3ODVjNDM2NDBkYzM5Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9p bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9M aWJXZWJSVENNZWRpYUVuZHBvaW50LmgKQEAgLTExOCw2ICsxMTgsNyBAQCBwcml2YXRlOgogICAg IHZvaWQgT25EYXRhQ2hhbm5lbChydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpEYXRhQ2hhbm5l bEludGVyZmFjZT4pIGZpbmFsOwogICAgIHZvaWQgT25BZGRUcmFjayhydGM6OnNjb3BlZF9yZWZw dHI8d2VicnRjOjpSdHBSZWNlaXZlckludGVyZmFjZT4sIGNvbnN0IHN0ZDo6dmVjdG9yPHJ0Yzo6 c2NvcGVkX3JlZnB0cjx3ZWJydGM6Ok1lZGlhU3RyZWFtSW50ZXJmYWNlPj4mKSBmaW5hbDsKICAg ICB2b2lkIE9uVHJhY2socnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwVHJhbnNjZWl2ZXJJ bnRlcmZhY2U+KSBmaW5hbDsKKyAgICB2b2lkIE9uUmVtb3ZlVHJhY2socnRjOjpzY29wZWRfcmVm cHRyPHdlYnJ0Yzo6UnRwUmVjZWl2ZXJJbnRlcmZhY2U+KSBmaW5hbDsKIAogICAgIHZvaWQgT25S ZW5lZ290aWF0aW9uTmVlZGVkKCkgZmluYWw7CiAgICAgdm9pZCBPbkljZUNvbm5lY3Rpb25DaGFu Z2Uod2VicnRjOjpQZWVyQ29ubmVjdGlvbkludGVyZmFjZTo6SWNlQ29ubmVjdGlvblN0YXRlKSBm aW5hbDsKQEAgLTEzNSw2ICsxMzYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkUmVtb3RlVHJh Y2socnRjOjpzY29wZWRfcmVmcHRyPHdlYnJ0Yzo6UnRwUmVjZWl2ZXJJbnRlcmZhY2U+JiYsIGNv bnN0IHN0ZDo6dmVjdG9yPHJ0Yzo6c2NvcGVkX3JlZnB0cjx3ZWJydGM6Ok1lZGlhU3RyZWFtSW50 ZXJmYWNlPj4mKTsKICAgICB2b2lkIHJlbW92ZVJlbW90ZVN0cmVhbSh3ZWJydGM6Ok1lZGlhU3Ry ZWFtSW50ZXJmYWNlJik7CiAgICAgdm9pZCBuZXdUcmFuc2NlaXZlcihydGM6OnNjb3BlZF9yZWZw dHI8d2VicnRjOjpSdHBUcmFuc2NlaXZlckludGVyZmFjZT4mJik7CisgICAgdm9pZCByZW1vdmVS ZW1vdGVUcmFjayhydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRjOjpSdHBSZWNlaXZlckludGVyZmFj ZT4mJik7CiAKICAgICB2b2lkIGZpcmVUcmFja0V2ZW50KFJlZjxSVENSdHBSZWNlaXZlcj4mJiwg UmVmPE1lZGlhU3RyZWFtVHJhY2s+JiYsIGNvbnN0IHN0ZDo6dmVjdG9yPHJ0Yzo6c2NvcGVkX3Jl ZnB0cjx3ZWJydGM6Ok1lZGlhU3RyZWFtSW50ZXJmYWNlPj4mLCBSZWZQdHI8UlRDUnRwVHJhbnNj ZWl2ZXI+JiYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5l Y3Rpb25CYWNrZW5kLmNwcAppbmRleCBjMjFkMjZiYjBjYTgyY2U2MDVkYTQ4YzExNDk4ODAyMTgy YjYwMTIxLi4zYzRmOTlhNWIzMmY2ZmFmZDhhZjM1NDJjNGVhYmUyYmUwMTM0OTc4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAK QEAgLTQ4Niw4ICs0ODYsOCBAQCBib29sIExpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZDo6 c2hvdWxkT2ZmZXJBbGxvd1RvUmVjZWl2ZShjb25zdCBjaGFyKiBraW5kKQogICAgICAgICBpZiAo dHJhbnNjZWl2ZXItPmRpcmVjdGlvbigpICE9IFJUQ1J0cFRyYW5zY2VpdmVyRGlyZWN0aW9uOjpT ZW5kcmVjdikKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGF1dG8mIGJhY2tlbmQg PSBzdGF0aWNfY2FzdDxMaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kJj4oKnRyYW5zY2VpdmVyLT5z ZW5kZXIoKS5iYWNrZW5kKCkpOwotICAgICAgICBpZiAoIWJhY2tlbmQucnRjU2VuZGVyKCkpCisg ICAgICAgIGF1dG8qIGJhY2tlbmQgPSBzdGF0aWNfY2FzdDxMaWJXZWJSVENSdHBTZW5kZXJCYWNr ZW5kKj4odHJhbnNjZWl2ZXItPnNlbmRlcigpLmJhY2tlbmQoKSk7CisgICAgICAgIGlmIChiYWNr ZW5kICYmICFiYWNrZW5kLT5ydGNTZW5kZXIoKSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgIH0KICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjNkOWUwZTRhNzdkOTA1MTIwMTMxOGVm MThhMzlhZjBmODIyNTNjOC4uM2VkYjFhOGY0Zjk1NWYzMTNmODU2NWVhNTcwODI0ZmMyYTdjOTdh MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE4LTA5LTE3ICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICB0cmFjay5vbm11dGUgaXNuJ3QgY2FsbGVkIGZvciBh IHJlbW90ZSBNZWRpYVN0cmVhbVRyYWNrIHdoZW4gaXRzIGNvdW50ZXIgcGFydCB0cmFjayBpcyBy ZW1vdmVkIGZyb20gdGhlIHBlZXIgY29ubmVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2MjgxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80 NDUyNTY3ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHdlYnJ0Yy9yZW1vdmUtdHJhY2stZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3 ZWJydGMvcmVtb3ZlLXRyYWNrLmh0bWw6IEFkZGVkLgorCiAyMDE4LTA5LTE3ICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgVkNQIGZvciBpT1MgYW5k IHJlZW5hYmxlIGl0IGZvciBNYWNPUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3Jl bW92ZS10cmFjay1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy93ZWJydGMvcmVtb3ZlLXRyYWNr LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZTZjM2MyNjA1ODc3MzJjNzYxOWRmNWRiMGI3Yjdj Y2YwMTRhODZhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL3JlbW92ZS10 cmFjay1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACisKK1BBU1MgU2V0dXAgYXVkaW8gdmlk ZW8gZXhjaGFuZ2UgCitQQVNTIFJlbW92ZSB2aWRlbyB0cmFjayAKK1BBU1MgUmVtb3ZlIGF1ZGlv IHRyYWNrIAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvcmVtb3ZlLXRyYWNrLmh0 bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvcmVtb3ZlLXRyYWNrLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODI3 ZjUyMmU0MjI0MjgwMTY5MmJiOTQ0MDg3NjZkZDE3M2VkNmZkOAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL3dlYnJ0Yy9yZW1vdmUtdHJhY2suaHRtbApAQCAtMCwwICsxLDcyIEBACis8 IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0 PSJ1dGYtOCI+CisgICAgICAgIDx0aXRsZT5UZXN0aW5nIGJhc2ljIHZpZGVvIGV4Y2hhbmdlIGZy b20gb2ZmZXJlciB0byByZWNlaXZlcjwvdGl0bGU+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9y ZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0i Li4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKyAgICA8L2hlYWQ+ CisgICAgPGJvZHk+CisgICAgICAgIDxzY3JpcHQgc3JjID0icm91dGluZXMuanMiPjwvc2NyaXB0 PgorICAgICAgICA8c2NyaXB0PgorbGV0IGZpcnN0Q29ubmVjdGlvbiwgc2Vjb25kQ29ubmVjdGlv bjsKK2xldCBzdHJlYW07CitsZXQgcmVtb3RlQXVkaW9UcmFjaywgcmVtb3RlVmlkZW9UcmFjazsK K3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAgIGlmICh3aW5kb3cudGVzdFJ1bm5l cikKKyAgICAgICAgdGVzdFJ1bm5lci5zZXRVc2VyTWVkaWFQZXJtaXNzaW9uKHRydWUpOworCisg ICAgc3RyZWFtID0gYXdhaXQgbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoeyB2 aWRlbzogdHJ1ZSwgYXVkaW86IHRydWUgfSk7CisgICAgYXdhaXQgbmV3IFByb21pc2UoKHJlc29s dmUsIHJlamVjdCkgPT4geworICAgICAgICBjcmVhdGVDb25uZWN0aW9ucygoY29ubmVjdGlvbikg PT4geworICAgICAgICAgICAgZmlyc3RDb25uZWN0aW9uID0gY29ubmVjdGlvbjsKKyAgICAgICAg ICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayhzdHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXSwg c3RyZWFtKTsKKyAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayhzdHJlYW0uZ2V0 QXVkaW9UcmFja3MoKVswXSwgc3RyZWFtKTsKKyAgICAgICAgfSwgKGNvbm5lY3Rpb24pID0+IHsK KyAgICAgICAgICAgIHNlY29uZENvbm5lY3Rpb24gPSBjb25uZWN0aW9uOworICAgICAgICAgICAg c2Vjb25kQ29ubmVjdGlvbi5vbnRyYWNrID0gKHRyYWNrRXZlbnQpID0+IHsKKyAgICAgICAgICAg ICAgICBpZiAoIXJlbW90ZVZpZGVvVHJhY2spIHsKKyAgICAgICAgICAgICAgICAgICAgcmVtb3Rl VmlkZW9UcmFjayA9IHRyYWNrRXZlbnQudHJhY2s7CisgICAgICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgcmVtb3RlQXVkaW9UcmFjayA9 IHRyYWNrRXZlbnQudHJhY2s7CisgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAg ICAgfTsKKyAgICAgICAgfSk7CisgICAgICAgIHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJUZXN0 IHRpbWVkIG91dCIpLCA1MDAwKTsKKyAgICB9KTsKK30sICJTZXR1cCBhdWRpbyB2aWRlbyBleGNo YW5nZSIpOworCithc3luYyBmdW5jdGlvbiByZW5lZ290aWF0ZSgpCit7CisgICAgbGV0IGQgPSBh d2FpdCBmaXJzdENvbm5lY3Rpb24uY3JlYXRlT2ZmZXIoKTsKKyAgICBhd2FpdCBmaXJzdENvbm5l Y3Rpb24uc2V0TG9jYWxEZXNjcmlwdGlvbihkKTsKKyAgICBhd2FpdCBzZWNvbmRDb25uZWN0aW9u LnNldFJlbW90ZURlc2NyaXB0aW9uKGZpcnN0Q29ubmVjdGlvbi5sb2NhbERlc2NyaXB0aW9uKTsK KyAgICBkID0gYXdhaXQgc2Vjb25kQ29ubmVjdGlvbi5jcmVhdGVBbnN3ZXIoKTsKKyAgICBhd2Fp dCBzZWNvbmRDb25uZWN0aW9uLnNldExvY2FsRGVzY3JpcHRpb24oZCk7Cit9CisKK3Byb21pc2Vf dGVzdCgodGVzdCkgPT4geworICAgIGNvbnN0IHByb21pc2UgPSBuZXcgUHJvbWlzZSgocmVzb2x2 ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgIHJlbW90ZVZpZGVvVHJhY2sub25tdXRlID0gcmVzb2x2 ZTsKKyAgICAgICAgc2V0VGltZW91dCgoKSA9PiByZWplY3QoIlRlc3QgdGltZWQgb3V0IiksIDUw MDApOworICAgIH0pOworICAgICAKKyAgICBmaXJzdENvbm5lY3Rpb24ucmVtb3ZlVHJhY2soZmly c3RDb25uZWN0aW9uLmdldFNlbmRlcnMoKVswXSk7CisgICAgcmVuZWdvdGlhdGUoKTsKKyAgICBy ZXR1cm4gcHJvbWlzZTsKK30sICJSZW1vdmUgdmlkZW8gdHJhY2siKTsKKworcHJvbWlzZV90ZXN0 KCh0ZXN0KSA9PiB7CisgICAgY29uc3QgcHJvbWlzZSA9IG5ldyBQcm9taXNlKChyZXNvbHZlLCBy ZWplY3QpID0+IHsKKyAgICAgICAgcmVtb3RlQXVkaW9UcmFjay5vbm11dGUgPSByZXNvbHZlOwor ICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHJlamVjdCgiVGVzdCB0aW1lZCBvdXQiKSwgNTAwMCk7 CisgICAgfSk7CisgICAgIAorICAgIGZpcnN0Q29ubmVjdGlvbi5yZW1vdmVUcmFjayhmaXJzdENv bm5lY3Rpb24uZ2V0U2VuZGVycygpWzFdKTsKKyAgICByZW5lZ290aWF0ZSgpOworICAgIHJldHVy biBwcm9taXNlOworfSwgIlJlbW92ZSBhdWRpbyB0cmFjayIpOworICAgICAgICA8L3NjcmlwdD4K KyAgICA8L2JvZHk+Cis8L2h0bWw+Cg==