125304 2013-12-05 06:31:57 -0800 [GStreamer] Audio/Video sink management is incoherent 2013-12-06 01:04:08 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned commit-queue eric.carlson glenn gustavo jer.noble menard mrobinson pnormand oldest_to_newest 956886 0 pnormand 2013-12-05 06:31:57 -0800 The API in the base class to configure the sinks is incoherent, a video-sink accessor is also missing. 956945 1 218521 pnormand 2013-12-05 10:10:42 -0800 Created attachment 218521 patch 956961 2 218521 gustavo 2013-12-05 10:50:56 -0800 Comment on attachment 218521 patch View in context: https://bugs.webkit.org/attachment.cgi?id=218521&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:505 > +GstElement* MediaPlayerPrivateGStreamerBase::videoSink() const > +{ > + return m_fpsSink ? m_fpsSink.get() : m_webkitVideoSink.get(); > +} This looks unused, will be used in a follow-up patch I guess? 957176 3 pnormand 2013-12-06 00:33:36 -0800 Well I added it for consistency mainly, it's indeed unused. I guess I'll remove it till one day its existence can no longer be avoided :) 957179 4 pnormand 2013-12-06 01:04:08 -0800 Committed r160214: <http://trac.webkit.org/changeset/160214> 218521 2013-12-05 10:10:42 -0800 2013-12-05 10:50:56 -0800 patch patch.patch text/plain 9358 pnormand RnJvbSBmOTQyYzcyMGZmMzlmN2MxMGE4NDJlNzJhYTViNTZhODkzZDMzOWUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDUgRGVjIDIwMTMgMTY6MTA6MTIgKzAxMDAKU3ViamVjdDogW1BBVENIXSBw YXRjaAoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICB8IDI3ICsrKysrKysrKysKIC4uLi9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcCAgICAgIHwgNjEgKysrKysrKystLS0tLS0tLS0tLS0tLQogLi4uL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaCAgICAgICAgfCAgNCArLQogLi4uL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcCAgfCAgNSArKwogLi4uL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmggICAgfCAgNyArKy0KIDUg ZmlsZXMgY2hhbmdlZCwgNTkgaW5zZXJ0aW9ucygrKSwgNDUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGRiMWQ2NzQuLjNhMjMyMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAx My0xMi0wNSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAg ICAgW0dTdHJlYW1lcl0gQXVkaW8vVmlkZW8gc2luayBtYW5hZ2VtZW50IGlzIGluY29oZXJlbnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTMwNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IHN1 YmNsYXNzZXMgb2YgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZSB0byBjcmVhdGUKKyAg ICAgICAgY3VzdG9tIGF1ZGlvL3ZpZGVvIHNpbmtzIGluIGEgY29oZXJlbnQgbWFubmVyIHVzaW5n CisgICAgICAgIGNyZWF0ZXtBdWRpbyxWaWRlb31TaW5rIG1ldGhvZHMuIENvbnZlbmllbmNlIGdl dHRlcnMgYXJlIGFsc28KKyAgICAgICAgYXZhaWxhYmxlLiBBbHNvIHJlbW92ZWQgc29tZSB1bi1u ZWVkZWQgbWVtYmVyIHZhcmlhYmxlcyBpbiB0aGUKKyAgICAgICAgcGxheWJpbi1iYXNlZCBwbGF5 ZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBleGlzdGluZyBtZWRpYSB0ZXN0cyBjb3ZlciB0 aGlzIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIpOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVBdWRp b1NpbmspOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjph dWRpb1NpbmspOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy OjpjcmVhdGVHU1RQbGF5QmluKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6dmlkZW9TaW5r KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyQmFzZTo6Y3JlYXRlQXVkaW9TaW5rKToKKwogMjAxMy0xMi0wNSAgQWxvaXNpbyBB bG1laWRhIEpyICA8YWxvaXNpby5hbG1laWRhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW0Nh aXJvXSBBdm9pZCBleHRyYSBjb3B5IHdoZW4gZHJhd2luZyBpbWFnZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggMDlkOTNiNi4uMWM5MGU4 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK QEAgLTI2OCw3ICsyNjgsNiBAQCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcihNZWRpYVBsYXllciogcGxheWVyKQogICAgICwgbV92aWRlb1Rp bWVySGFuZGxlcigwKQogICAgICwgbV92aWRlb0NhcHNUaW1lckhhbmRsZXIoMCkKICAgICAsIG1f cmVhZHlUaW1lckhhbmRsZXIoMCkKLSAgICAsIG1fd2Via2l0QXVkaW9TaW5rKDApCiAgICAgLCBt X3RvdGFsQnl0ZXMoLTEpCiAgICAgLCBtX3ByZXNlcnZlc1BpdGNoKGZhbHNlKQogICAgICwgbV9y ZXF1ZXN0ZWRTdGF0ZShHU1RfU1RBVEVfVk9JRF9QRU5ESU5HKQpAQCAtMTI1MiwyMCArMTI1MSw2 IEBAIHVuc2lnbmVkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dG90YWxCeXRlcygpIGNv bnN0CiAgICAgcmV0dXJuIG1fdG90YWxCeXRlczsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnVwZGF0ZUF1ZGlvU2luaygpCi17Ci0gICAgaWYgKCFtX3BsYXlCaW4pCi0g ICAgICAgIHJldHVybjsKLQotICAgIG1fd2Via2l0QXVkaW9TaW5rLmNsZWFyKCk7Ci0gICAgZ19v YmplY3RfZ2V0KG1fcGxheUJpbi5nZXQoKSwgImF1ZGlvLXNpbmsiLCAmbV93ZWJraXRBdWRpb1Np bmsub3V0UHRyKCksIE5VTEwpOwotfQotCi1Hc3RFbGVtZW50KiBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OmF1ZGlvU2luaygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fd2Via2l0QXVkaW9T aW5rLmdldCgpOwotfQotCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c291cmNl Q2hhbmdlZCgpCiB7CiAgICAgbV9zb3VyY2UuY2xlYXIoKTsKQEAgLTEzOTAsOSArMTM3NSw2IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQogCiAgICAg ICAgIC8vIFN5bmMgc3RhdGVzIHdoZXJlIG5lZWRlZC4KICAgICAgICAgaWYgKHN0YXRlID09IEdT VF9TVEFURV9QQVVTRUQpIHsKLSAgICAgICAgICAgIGlmICghbV93ZWJraXRBdWRpb1NpbmspCi0g ICAgICAgICAgICAgICAgdXBkYXRlQXVkaW9TaW5rKCk7Ci0KICAgICAgICAgICAgIGlmICghbV92 b2x1bWVBbmRNdXRlSW5pdGlhbGl6ZWQpIHsKICAgICAgICAgICAgICAgICBub3RpZnlQbGF5ZXJP ZlZvbHVtZUNoYW5nZSgpOwogICAgICAgICAgICAgICAgIG5vdGlmeVBsYXllck9mTXV0ZSgpOwpA QCAtMTgxMyw0MiArMTc5NSw0MyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 c2V0UHJlbG9hZChNZWRpYVBsYXllcjo6UHJlbG9hZCBwcmVsb2FkKQogICAgIH0KIH0KIAotdm9p ZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0ZUF1ZGlvU2luaygpCitHc3RFbGVt ZW50KiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0ZUF1ZGlvU2luaygpCiB7Ci0g ICAgLy8gQ29uc3RydWN0IGF1ZGlvIHNpbmsgaWYgcGl0Y2ggcHJlc2VydmluZyBpcyBlbmFibGVk LgotICAgIGlmICghbV9wcmVzZXJ2ZXNQaXRjaCkKLSAgICAgICAgcmV0dXJuOworICAgIG1fYXV0 b0F1ZGlvU2luayA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFrZSgiYXV0b2F1ZGlvc2luayIsIDAp OworICAgIGdfc2lnbmFsX2Nvbm5lY3QobV9hdXRvQXVkaW9TaW5rLmdldCgpLCAiY2hpbGQtYWRk ZWQiLCBHX0NBTExCQUNLKHNldEF1ZGlvU3RyZWFtUHJvcGVydGllc0NhbGxiYWNrKSwgdGhpcyk7 CiAKLSAgICBpZiAoIW1fcGxheUJpbikKLSAgICAgICAgcmV0dXJuOworICAgIC8vIENvbnN0cnVj dCBhdWRpbyBzaW5rIG9ubHkgaWYgcGl0Y2ggcHJlc2VydmluZyBpcyBlbmFibGVkLgorICAgIGlm ICghbV9wcmVzZXJ2ZXNQaXRjaCkKKyAgICAgICAgcmV0dXJuIG1fYXV0b0F1ZGlvU2luay5nZXQo KTsKIAogICAgIEdzdEVsZW1lbnQqIHNjYWxlID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJz Y2FsZXRlbXBvIiwgMCk7CiAgICAgaWYgKCFzY2FsZSkgewogICAgICAgICBHU1RfV0FSTklORygi RmFpbGVkIHRvIGNyZWF0ZSBzY2FsZXRlbXBvIik7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAg cmV0dXJuIG1fYXV0b0F1ZGlvU2luay5nZXQoKTsKICAgICB9CiAKKyAgICBHc3RFbGVtZW50KiBh dWRpb1NpbmtCaW4gPSBnc3RfYmluX25ldygiYXVkaW8tc2luayIpOwogICAgIEdzdEVsZW1lbnQq IGNvbnZlcnQgPSBnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoImF1ZGlvY29udmVydCIsIDApOwog ICAgIEdzdEVsZW1lbnQqIHJlc2FtcGxlID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJhdWRp b3Jlc2FtcGxlIiwgMCk7Ci0gICAgR3N0RWxlbWVudCogc2luayA9IGdzdF9lbGVtZW50X2ZhY3Rv cnlfbWFrZSgiYXV0b2F1ZGlvc2luayIsIDApOwotCi0gICAgbV9hdXRvQXVkaW9TaW5rID0gc2lu azsKIAotICAgIGdfc2lnbmFsX2Nvbm5lY3Qoc2luaywgImNoaWxkLWFkZGVkIiwgR19DQUxMQkFD SyhzZXRBdWRpb1N0cmVhbVByb3BlcnRpZXNDYWxsYmFjayksIHRoaXMpOworICAgIGdzdF9iaW5f YWRkX21hbnkoR1NUX0JJTihhdWRpb1NpbmtCaW4pLCBzY2FsZSwgY29udmVydCwgcmVzYW1wbGUs IG1fYXV0b0F1ZGlvU2luay5nZXQoKSwgTlVMTCk7CiAKLSAgICBHc3RFbGVtZW50KiBhdWRpb1Np bmsgPSBnc3RfYmluX25ldygiYXVkaW8tc2luayIpOwotICAgIGdzdF9iaW5fYWRkX21hbnkoR1NU X0JJTihhdWRpb1NpbmspLCBzY2FsZSwgY29udmVydCwgcmVzYW1wbGUsIHNpbmssIE5VTEwpOwot Ci0gICAgaWYgKCFnc3RfZWxlbWVudF9saW5rX21hbnkoc2NhbGUsIGNvbnZlcnQsIHJlc2FtcGxl LCBzaW5rLCBOVUxMKSkgeworICAgIGlmICghZ3N0X2VsZW1lbnRfbGlua19tYW55KHNjYWxlLCBj b252ZXJ0LCByZXNhbXBsZSwgbV9hdXRvQXVkaW9TaW5rLmdldCgpLCBOVUxMKSkgewogICAgICAg ICBHU1RfV0FSTklORygiRmFpbGVkIHRvIGxpbmsgYXVkaW8gc2luayBlbGVtZW50cyIpOwotICAg ICAgICBnc3Rfb2JqZWN0X3VucmVmKGF1ZGlvU2luayk7Ci0gICAgICAgIHJldHVybjsKKyAgICAg ICAgZ3N0X29iamVjdF91bnJlZihhdWRpb1NpbmtCaW4pOworICAgICAgICByZXR1cm4gbV9hdXRv QXVkaW9TaW5rLmdldCgpOwogICAgIH0KIAogICAgIEdSZWZQdHI8R3N0UGFkPiBwYWQgPSBhZG9w dEdSZWYoZ3N0X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQoc2NhbGUsICJzaW5rIikpOwotICAgIGdz dF9lbGVtZW50X2FkZF9wYWQoYXVkaW9TaW5rLCBnc3RfZ2hvc3RfcGFkX25ldygic2luayIsIHBh ZC5nZXQoKSkpOworICAgIGdzdF9lbGVtZW50X2FkZF9wYWQoYXVkaW9TaW5rQmluLCBnc3RfZ2hv c3RfcGFkX25ldygic2luayIsIHBhZC5nZXQoKSkpOworICAgIHJldHVybiBhdWRpb1NpbmtCaW47 Cit9CiAKLSAgICBnX29iamVjdF9zZXQobV9wbGF5QmluLmdldCgpLCAiYXVkaW8tc2luayIsIGF1 ZGlvU2luaywgTlVMTCk7CitHc3RFbGVtZW50KiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OmF1ZGlvU2luaygpIGNvbnN0Cit7CisgICAgR3N0RWxlbWVudCogc2luazsKKyAgICBnX29iamVj dF9nZXQobV9wbGF5QmluLmdldCgpLCAiYXVkaW8tc2luayIsICZzaW5rLCBudWxscHRyKTsKKyAg ICByZXR1cm4gc2luazsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNy ZWF0ZUdTVFBsYXlCaW4oKQpAQCAtMTg5MCwxMyArMTg3MywxMSBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlR1NUUGxheUJpbigpCiAgICAgfQogI2VuZGlmCiAKLSAg ICBnX29iamVjdF9zZXQobV9wbGF5QmluLmdldCgpLCAidmlkZW8tc2luayIsIGNyZWF0ZVZpZGVv U2luaygpLCBudWxscHRyKTsKKyAgICBnX29iamVjdF9zZXQobV9wbGF5QmluLmdldCgpLCAidmlk ZW8tc2luayIsIGNyZWF0ZVZpZGVvU2luaygpLCAiYXVkaW8tc2luayIsIGNyZWF0ZUF1ZGlvU2lu aygpLCBudWxscHRyKTsKIAogICAgIEdSZWZQdHI8R3N0UGFkPiB2aWRlb1NpbmtQYWQgPSBhZG9w dEdSZWYoZ3N0X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQobV93ZWJraXRWaWRlb1NpbmsuZ2V0KCks ICJzaW5rIikpOwogICAgIGlmICh2aWRlb1NpbmtQYWQpCiAgICAgICAgIGdfc2lnbmFsX2Nvbm5l Y3QodmlkZW9TaW5rUGFkLmdldCgpLCAibm90aWZ5OjpjYXBzIiwgR19DQUxMQkFDSyhtZWRpYVBs YXllclByaXZhdGVWaWRlb1NpbmtDYXBzQ2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7Ci0KLSAgICBj cmVhdGVBdWRpb1NpbmsoKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OnNpbXVsYXRlQXVkaW9JbnRlcnJ1cHRpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IDdmNmUyZDY3Li42NzdhOWRhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCkBAIC0xMjcsOCArMTI3LDcgQEAg cHJpdmF0ZToKIAogICAgIHN0YXRpYyBib29sIGlzQXZhaWxhYmxlKCk7CiAKLSAgICB2b2lkIHVw ZGF0ZUF1ZGlvU2luaygpOwotICAgIHZvaWQgY3JlYXRlQXVkaW9TaW5rKCk7CisgICAgR3N0RWxl bWVudCogY3JlYXRlQXVkaW9TaW5rKCk7CiAKICAgICBmbG9hdCBwbGF5YmFja1Bvc2l0aW9uKCkg Y29uc3Q7CiAKQEAgLTE5MSw3ICsxOTAsNiBAQCBwcml2YXRlOgogICAgIGd1aW50IG1fdmlkZW9U aW1lckhhbmRsZXI7CiAgICAgZ3VpbnQgbV92aWRlb0NhcHNUaW1lckhhbmRsZXI7CiAgICAgZ3Vp bnQgbV9yZWFkeVRpbWVySGFuZGxlcjsKLSAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IG1fd2Via2l0 QXVkaW9TaW5rOwogICAgIG11dGFibGUgbG9uZyBtX3RvdGFsQnl0ZXM7CiAgICAgVVJMIG1fdXJs OwogICAgIGJvb2wgbV9wcmVzZXJ2ZXNQaXRjaDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJC YXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAppbmRleCA5NmYxMWU2Li43NTFlYmM3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2Uu Y3BwCkBAIC00OTksNiArNDk5LDExIEBAIEdzdEVsZW1lbnQqIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2U6OmNyZWF0ZVZpZGVvU2luaygpCiAgICAgcmV0dXJuIHZpZGVvU2luazsKIH0K IAorR3N0RWxlbWVudCogTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6dmlkZW9TaW5r KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9mcHNTaW5rID8gbV9mcHNTaW5rLmdldCgpIDogbV93 ZWJraXRWaWRlb1NpbmsuZ2V0KCk7Cit9CisKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZTo6c2V0U3RyZWFtVm9sdW1lRWxlbWVudChHc3RTdHJlYW1Wb2x1bWUqIHZvbHVtZSkK IHsKICAgICBBU1NFUlQoIW1fdm9sdW1lRWxlbWVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaAppbmRleCA0ZTBiY2QzLi4zNmViZDFmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgK QEAgLTEwMywxMCArMTAzLDEzIEBAIHB1YmxpYzoKIAogcHJvdGVjdGVkOgogICAgIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UoTWVkaWFQbGF5ZXIqKTsKLSAgICBHc3RFbGVtZW50KiBj cmVhdGVWaWRlb1NpbmsoKTsKKyAgICB2aXJ0dWFsIEdzdEVsZW1lbnQqIGNyZWF0ZVZpZGVvU2lu aygpOworICAgIHZpcnR1YWwgR3N0RWxlbWVudCogdmlkZW9TaW5rKCkgY29uc3Q7CisgICAgR1Jl ZlB0cjxHc3RDYXBzPiBjdXJyZW50VmlkZW9TaW5rQ2FwcygpIGNvbnN0OworCiAgICAgdm9pZCBz ZXRTdHJlYW1Wb2x1bWVFbGVtZW50KEdzdFN0cmVhbVZvbHVtZSopOworICAgIHZpcnR1YWwgR3N0 RWxlbWVudCogY3JlYXRlQXVkaW9TaW5rKCkgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgR3N0 RWxlbWVudCogYXVkaW9TaW5rKCkgY29uc3QgeyByZXR1cm4gMDsgfQotICAgIEdSZWZQdHI8R3N0 Q2Fwcz4gY3VycmVudFZpZGVvU2lua0NhcHMoKSBjb25zdDsKIAogICAgIE1lZGlhUGxheWVyKiBt X3BsYXllcjsKICAgICBHUmVmUHRyPEdzdFN0cmVhbVZvbHVtZT4gbV92b2x1bWVFbGVtZW50Owot LSAKMS44LjQuMw==