200633 2019-08-12 10:43:09 -0700 [GStreamer] Deal with slow buffer consumption in GStreamerMediaStreamSource 2019-08-15 10:18:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tsaunier tsaunier commit-queue pnormand webkit-bug-importer oldest_to_newest 1560466 0 tsaunier 2019-08-12 10:43:09 -0700 [GStreamer] Deal with slow buffer consumption in GStreamerMediaStreamSource 1560470 1 376077 tsaunier 2019-08-12 10:54:01 -0700 Created attachment 376077 Patch 1561536 2 376077 pnormand 2019-08-15 07:06:18 -0700 Comment on attachment 376077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376077&action=review > Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:553 > static gboolean webkitMediaStreamSrcSetupAppSrc(WebKitMediaStreamSrc* self, > - MediaStreamTrackPrivate* track, GstElement** element, > + MediaStreamTrackPrivate* track, WebKitMediaStreamSrc::SourceData* data, > GstStaticPadTemplate* pad_template, bool onlyTrack) Where's the call site for this? I don't see it updated in this patch? 1561538 3 376077 tsaunier 2019-08-15 07:24:05 -0700 Comment on attachment 376077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376077&action=review >> Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:553 >> GstStaticPadTemplate* pad_template, bool onlyTrack) > > Where's the call site for this? I don't see it updated in this patch? In `webkitMediaStreamSrcAddTrack` - no need to update it here as it does: > res = webkitMediaStreamSrcSetupAppSrc(self, track, &self->audioSrc, &audioSrcTemplate, onlyTrack); and `self->audioSrc` has been changed to `WebKitMediaStreamSrc::SourceData`. 1561594 4 376077 commit-queue 2019-08-15 10:17:59 -0700 Comment on attachment 376077 Patch Clearing flags on attachment: 376077 Committed r248721: <https://trac.webkit.org/changeset/248721> 1561595 5 commit-queue 2019-08-15 10:18:00 -0700 All reviewed patches have been landed. Closing bug. 1561596 6 webkit-bug-importer 2019-08-15 10:18:16 -0700 <rdar://problem/54351290> 376077 2019-08-12 10:54:01 -0700 2019-08-15 10:17:59 -0700 Patch bug-200633-20190812135359.patch text/plain 10181 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NDY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIyNWJjZjY1ZDZlMGQ5 OGNkYjk3ZjIxZmUxMzBlNmQ4Zjk3OTYxMy4uOWI0MTdhYzJjN2VjM2IwYWNkZWUwM2ExNTg3MGEw MjRiM2NmMWU3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE5LTA4LTEyICBUaGli YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBEZWFsIHdpdGggc2xvdyBidWZmZXIgY29uc3VtcHRpb24gaW4gR1N0cmVhbWVyTWVkaWFTdHJl YW1Tb3VyY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMDYzMworCisgICAgICAgIFJlZmFjdG9yaW5nIHRoZSBHU3RyZWFtZXJNZWRpYVN0cmVhbVNv dXJjZSBmYWN0b3Jpbmcgb3V0IHN0cmVhbXMgc3BlY2lmaWMKKyAgICAgICAgZGF0YSBpbiBhIGRl ZGljYXRlZCBzdHJ1Y3R1cmUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBzaW5jZSBJIGRvIG5vdCBzZWUgaG93IHRvIHJlcHJv ZHVjZSB0aGF0IGluIGEgdGVzdCBpbiBhIHNpbXBsZSB3YXksCisgICAgICAgIHRoaXMgYWltcyBh dCBlbmhhbmNpbmcgdXNlciBleHBlcmllbmNlIHdoZW4gcnVubmluZyB1bmRlciBoaWdoIGxvYWQu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVyTWVk aWFTdHJlYW1Tb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6X1dlYktpdE1lZGlhU3RyZWFt U3JjOjpTb3VyY2VEYXRhOjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpfV2ViS2l0TWVkaWFT dHJlYW1TcmM6OlNvdXJjZURhdGE6OnNyYyk6CisgICAgICAgIChXZWJDb3JlOjpfV2ViS2l0TWVk aWFTdHJlYW1TcmM6OlNvdXJjZURhdGE6OnNldFNyYyk6CisgICAgICAgIChXZWJDb3JlOjpfV2Vi S2l0TWVkaWFTdHJlYW1TcmM6OlNvdXJjZURhdGE6OmlzVXNlZCk6CisgICAgICAgIChXZWJDb3Jl OjpfV2ViS2l0TWVkaWFTdHJlYW1TcmM6OlNvdXJjZURhdGE6OnB1c2hTYW1wbGUpOgorICAgICAg ICAoV2ViQ29yZTo6d2Via2l0TWVkaWFTdHJlYW1TcmNEaXNwb3NlKToKKyAgICAgICAgKFdlYkNv cmU6OndlYmtpdF9tZWRpYV9zdHJlYW1fc3JjX2luaXQpOgorICAgICAgICAoV2ViQ29yZTo6d2Vi a2l0TWVkaWFTdHJlYW1TcmNOZWVkRGF0YUNiKToKKyAgICAgICAgKFdlYkNvcmU6OndlYmtpdE1l ZGlhU3RyZWFtU3JjRW5vdWdoRGF0YUNiKToKKyAgICAgICAgKFdlYkNvcmU6OndlYmtpdE1lZGlh U3RyZWFtU3JjU2V0dXBBcHBTcmMpOgorICAgICAgICAoV2ViQ29yZTo6d2Via2l0TWVkaWFTdHJl YW1TcmNSZW1vdmVUcmFja0J5VHlwZSk6CisgICAgICAgIChXZWJDb3JlOjp3ZWJraXRNZWRpYVN0 cmVhbVNyY1B1c2hWaWRlb1NhbXBsZSk6CisgICAgICAgIChXZWJDb3JlOjp3ZWJraXRNZWRpYVN0 cmVhbVNyY1B1c2hBdWRpb1NhbXBsZSk6CisKIDIwMTktMDgtMTIgIFRoaWJhdWx0IFNhdW5pZXIg IDx0c2F1bmllckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdW1dlYlJUQ10gSGFu ZGxlIGJyb2tlbiBkYXRhIGluIHRoZSBsaWJ3ZWJydGMgR1N0cmVhbWVyIGRlY29kZXJzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0 cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lck1lZGlhU3RyZWFtU291cmNlLmNwcAppbmRleCBi M2FmMzVhZjgyNDg4ZGQ0Y2Y4MjFjZDNlZWFlNjNkOWNmMWFjZDg0Li43ZjM5MmJmNjg0MjNhOWY1 ZDA3MTZhYzllZjZhYzVjNjRjODY5YmUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3Ry ZWFtZXJNZWRpYVN0cmVhbVNvdXJjZS5jcHAKQEAgLTE3MSwxMCArMTcxLDkyIEBAIHN0cnVjdCBf V2ViS2l0TWVkaWFTdHJlYW1TcmMgewogCiAgICAgZ2NoYXIqIHVyaTsKIAotICAgIEdzdEVsZW1l bnQqIGF1ZGlvU3JjOwotICAgIEdzdENsb2NrVGltZSBmaXJzdEF1ZGlvQnVmZmVyUHRzOwotICAg IEdzdEVsZW1lbnQqIHZpZGVvU3JjOwotICAgIEdzdENsb2NrVGltZSBmaXJzdEZyYW1lUHRzOwor ICAgIHN0cnVjdCBTb3VyY2VEYXRhIHsKKyAgICAgICAgR1JlZlB0cjxHc3RFbGVtZW50PiBtX3Ny YzsKKyAgICAgICAgdm9pZCByZXNldChib29sIGlzVmlkZW8pCisgICAgICAgIHsKKyAgICAgICAg ICAgIG1fZmlyc3RCdWZmZXJQdHMgPSBHU1RfQ0xPQ0tfVElNRV9OT05FOworICAgICAgICAgICAg bV9pc1ZpZGVvID0gaXNWaWRlbzsKKyAgICAgICAgICAgIG1fc3JjID0gbnVsbHB0cjsKKyAgICAg ICAgfQorCisgICAgICAgIEdzdEVsZW1lbnQqIHNyYygpCisgICAgICAgIHsKKyAgICAgICAgICAg IHJldHVybiBtX3NyYy5nZXQoKTsKKyAgICAgICAgfQorCisgICAgICAgIHN0YXRpYyB2b2lkIG5l ZWREYXRhQ2IoR3N0RWxlbWVudCosIGd1aW50LCBXZWJLaXRNZWRpYVN0cmVhbVNyYzo6U291cmNl RGF0YSAqc2VsZikKKyAgICAgICAgeworICAgICAgICAgICAgc2VsZi0+c2V0RW5vdWdoRGF0YShm YWxzZSk7CisgICAgICAgIH0KKworICAgICAgICBzdGF0aWMgdm9pZCBlbm91Z2hEYXRhQ2IoR3N0 RWxlbWVudCosIFdlYktpdE1lZGlhU3RyZWFtU3JjOjpTb3VyY2VEYXRhICpzZWxmKQorICAgICAg ICB7CisgICAgICAgICAgICBzZWxmLT5zZXRFbm91Z2hEYXRhKHRydWUpOworICAgICAgICB9CisK KworICAgICAgICB2b2lkIHNldFNyYyhHc3RFbGVtZW50ICpzcmMpCisgICAgICAgIHsKKyAgICAg ICAgICAgIG1fc3JjID0gYWRvcHRHUmVmKEdTVF9FTEVNRU5UKGdfb2JqZWN0X3JlZl9zaW5rKHNy YykpKTsKKyAgICAgICAgICAgIGlmIChHU1RfSVNfQVBQX1NSQyhzcmMpKSB7CisgICAgICAgICAg ICAgICAgZ19vYmplY3Rfc2V0KHNyYywgImlzLWxpdmUiLCB0cnVlLCAiZm9ybWF0IiwgR1NUX0ZP Uk1BVF9USU1FLCAiZW1pdC1zaWduYWxzIiwgVFJVRSwgIm1pbi1wZXJjZW50IiwgMTAwLCBudWxs cHRyKTsKKyAgICAgICAgICAgICAgICBnX3NpZ25hbF9jb25uZWN0KHNyYywgImVub3VnaC1kYXRh IiwgR19DQUxMQkFDSyhlbm91Z2hEYXRhQ2IpLCB0aGlzKTsKKyAgICAgICAgICAgICAgICBnX3Np Z25hbF9jb25uZWN0KHNyYywgIm5lZWQtZGF0YSIsIEdfQ0FMTEJBQ0sobmVlZERhdGFDYiksIHRo aXMpOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgYm9vbCBpc1VzZWQoKQor ICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gISFtX3NyYzsKKyAgICAgICAgfQorCisgICAg ICAgIHZvaWQgc2V0RW5vdWdoRGF0YShib29sIGVub3VnaCkKKyAgICAgICAgeworICAgICAgICAg ICAgbV9lbm91Z2hEYXRhID0gZW5vdWdoOworICAgICAgICB9CisKKyAgICAgICAgdm9pZCBwdXNo U2FtcGxlKEdzdFNhbXBsZSAqc2FtcGxlKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIW1f c3JjKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgYm9vbCBkcm9wID0g bV9lbm91Z2hEYXRhOworICAgICAgICAgICAgYXV0byBidWZmZXIgPSBnc3Rfc2FtcGxlX2dldF9i dWZmZXIoc2FtcGxlKTsKKyAgICAgICAgICAgIGF1dG8gY2FwcyA9IGdzdF9zYW1wbGVfZ2V0X2Nh cHMoc2FtcGxlKTsKKyAgICAgICAgICAgIGlmICghR1NUX0NMT0NLX1RJTUVfSVNfVkFMSUQobV9m aXJzdEJ1ZmZlclB0cykpIHsKKyAgICAgICAgICAgICAgICBtX2ZpcnN0QnVmZmVyUHRzID0gR1NU X0JVRkZFUl9QVFMoYnVmZmVyKTsKKyAgICAgICAgICAgICAgICBhdXRvIHBhZCA9IGFkb3B0R1Jl Zihnc3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZChtX3NyYy5nZXQoKSwgInNyYyIpKTsKKyAgICAg ICAgICAgICAgICBnc3RfcGFkX3NldF9vZmZzZXQocGFkLmdldCgpLCAtbV9maXJzdEJ1ZmZlclB0 cyk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmIChtX2lzVmlkZW8gJiYgZHJvcCkg eworICAgICAgICAgICAgICAgIGRyb3AgPSAoZ3N0X3N0cnVjdHVyZV9oYXNfbmFtZShnc3RfY2Fw c19nZXRfc3RydWN0dXJlKGNhcHMsIDApLCAidmlkZW8veC1yYXciKQorICAgICAgICAgICAgICAg ICAgICB8fCBHU1RfQlVGRkVSX0ZMQUdfSVNfU0VUKGJ1ZmZlciwgR1NUX0JVRkZFUl9GTEFHX0RF TFRBX1VOSVQpKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKGRyb3ApIHsKKyAg ICAgICAgICAgICAgICBtX25lZWRzRGlzY29udCA9IHRydWU7CisgICAgICAgICAgICAgICAgR1NU X0lORk9fT0JKRUNUKG1fc3JjLmdldCgpLCAiJXMgcXVldWUgZnVsbCBhbHJlYWR5Li4uIG5vdCBw dXNoaW5nIiwgbV9pc1ZpZGVvID8gIlZpZGVvIiA6ICJBdWRpbyIpOworICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKG1fbmVlZHNEaXNjb250 KSB7CisgICAgICAgICAgICAgICAgR1NUX0JVRkZFUl9GTEFHX1NFVChidWZmZXIsIEdTVF9CVUZG RVJfRkxBR19ESVNDT05UKTsKKyAgICAgICAgICAgICAgICBtX25lZWRzRGlzY29udCA9IGZhbHNl OworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBnc3RfYXBwX3NyY19wdXNoX3NhbXBsZShH U1RfQVBQX1NSQyhtX3NyYy5nZXQoKSksIHNhbXBsZSk7CisgICAgICAgIH0KKyAgICBwcml2YXRl OgorICAgICAgICBHc3RDbG9ja1RpbWUgbV9maXJzdEJ1ZmZlclB0czsKKyAgICAgICAgYm9vbCBt X2Vub3VnaERhdGE7CisgICAgICAgIGJvb2wgbV9uZWVkc0Rpc2NvbnQ7CisgICAgICAgIGJvb2wg bV9pc1ZpZGVvOworICAgIH07CisKKyAgICBTb3VyY2VEYXRhIGF1ZGlvU3JjOworICAgIFNvdXJj ZURhdGEgdmlkZW9TcmM7CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0TWVkaWFTdHJlYW1U cmFja09ic2VydmVyPiBtZWRpYVN0cmVhbVRyYWNrT2JzZXJ2ZXI7CiAgICAgc3RkOjp1bmlxdWVf cHRyPFdlYktpdE1lZGlhU3RyZWFtT2JzZXJ2ZXI+IG1lZGlhU3RyZWFtT2JzZXJ2ZXI7CkBAIC0y NzQsMTQgKzM1NiwxNCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRNZWRpYVN0cmVhbVNyY0Rpc3Bvc2Uo R09iamVjdCogb2JqZWN0KQogewogICAgIFdlYktpdE1lZGlhU3RyZWFtU3JjKiBzZWxmID0gV0VC S0lUX01FRElBX1NUUkVBTV9TUkMob2JqZWN0KTsKIAotICAgIGlmIChzZWxmLT5hdWRpb1NyYykg ewotICAgICAgICBnc3RfYmluX3JlbW92ZShHU1RfQklOKHNlbGYpLCBzZWxmLT5hdWRpb1NyYyk7 Ci0gICAgICAgIHNlbGYtPmF1ZGlvU3JjID0gbnVsbHB0cjsKKyAgICBpZiAoc2VsZi0+YXVkaW9T cmMuaXNVc2VkKCkpIHsKKyAgICAgICAgZ3N0X2Jpbl9yZW1vdmUoR1NUX0JJTihzZWxmKSwgc2Vs Zi0+YXVkaW9TcmMuc3JjKCkpOworICAgICAgICBzZWxmLT5hdWRpb1NyYy5yZXNldChmYWxzZSk7 CiAgICAgfQogCi0gICAgaWYgKHNlbGYtPnZpZGVvU3JjKSB7Ci0gICAgICAgIGdzdF9iaW5fcmVt b3ZlKEdTVF9CSU4oc2VsZiksIHNlbGYtPnZpZGVvU3JjKTsKLSAgICAgICAgc2VsZi0+dmlkZW9T cmMgPSBudWxscHRyOworICAgIGlmIChzZWxmLT52aWRlb1NyYy5pc1VzZWQoKSkgeworICAgICAg ICBnc3RfYmluX3JlbW92ZShHU1RfQklOKHNlbGYpLCBzZWxmLT52aWRlb1NyYy5zcmMoKSk7Cisg ICAgICAgIHNlbGYtPnZpZGVvU3JjLnJlc2V0KHRydWUpOwogICAgIH0KIH0KIApAQCAtMzU0LDgg KzQzNiw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9tZWRpYV9zdHJlYW1fc3JjX2luaXQoV2ViS2l0 TWVkaWFTdHJlYW1TcmMqIHNlbGYpCiAgICAgc2VsZi0+bWVkaWFTdHJlYW1UcmFja09ic2VydmVy ID0gc3RkOjptYWtlX3VuaXF1ZTxXZWJLaXRNZWRpYVN0cmVhbVRyYWNrT2JzZXJ2ZXI+KHNlbGYp OwogICAgIHNlbGYtPm1lZGlhU3RyZWFtT2JzZXJ2ZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYktp dE1lZGlhU3RyZWFtT2JzZXJ2ZXI+KHNlbGYpOwogICAgIHNlbGYtPmZsb3dDb21iaW5lciA9IGdz dF9mbG93X2NvbWJpbmVyX25ldygpOwotICAgIHNlbGYtPmZpcnN0QXVkaW9CdWZmZXJQdHMgPSBH U1RfQ0xPQ0tfVElNRV9OT05FOwotICAgIHNlbGYtPmZpcnN0RnJhbWVQdHMgPSBHU1RfQ0xPQ0tf VElNRV9OT05FOworICAgIHNlbGYtPnZpZGVvU3JjLnJlc2V0KHRydWUpOworICAgIHNlbGYtPmF1 ZGlvU3JjLnJlc2V0KGZhbHNlKTsKIH0KIAogdHlwZWRlZiBzdHJ1Y3QgewpAQCAtNDY3LDEzICs1 NDksMTQgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdE1lZGlhU3RyZWFtU3JjU2V0dXBTcmMoV2Vi S2l0TWVkaWFTdHJlYW1TcmMqIHNlbGYsCiB9CiAKIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRNZWRp YVN0cmVhbVNyY1NldHVwQXBwU3JjKFdlYktpdE1lZGlhU3RyZWFtU3JjKiBzZWxmLAotICAgIE1l ZGlhU3RyZWFtVHJhY2tQcml2YXRlKiB0cmFjaywgR3N0RWxlbWVudCoqIGVsZW1lbnQsCisgICAg TWVkaWFTdHJlYW1UcmFja1ByaXZhdGUqIHRyYWNrLCBXZWJLaXRNZWRpYVN0cmVhbVNyYzo6U291 cmNlRGF0YSogZGF0YSwKICAgICBHc3RTdGF0aWNQYWRUZW1wbGF0ZSogcGFkX3RlbXBsYXRlLCBi b29sIG9ubHlUcmFjaykKIHsKLSAgICAqZWxlbWVudCA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFr ZSgiYXBwc3JjIiwgbnVsbHB0cik7Ci0gICAgZ19vYmplY3Rfc2V0KCplbGVtZW50LCAiaXMtbGl2 ZSIsIHRydWUsICJmb3JtYXQiLCBHU1RfRk9STUFUX1RJTUUsIG51bGxwdHIpOworICAgIGRhdGEt PnNldFNyYyhnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoImFwcHNyYyIsIG51bGxwdHIpKTsKKyAg ICBpZiAodHJhY2stPmlzQ2FwdHVyZVRyYWNrKCkpCisgICAgICAgIGdfb2JqZWN0X3NldChkYXRh LT5zcmMoKSwgImRvLXRpbWVzdGFtcCIsIHRydWUsIG51bGxwdHIpOwogCi0gICAgcmV0dXJuIHdl YmtpdE1lZGlhU3RyZWFtU3JjU2V0dXBTcmMoc2VsZiwgdHJhY2ssICplbGVtZW50LCBwYWRfdGVt cGxhdGUsIFRSVUUsIG9ubHlUcmFjayk7CisgICAgcmV0dXJuIHdlYmtpdE1lZGlhU3RyZWFtU3Jj U2V0dXBTcmMoc2VsZiwgdHJhY2ssIGRhdGEtPnNyYygpLCBwYWRfdGVtcGxhdGUsIFRSVUUsIG9u bHlUcmFjayk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjUG9zdFN0cmVh bUNvbGxlY3Rpb24oV2ViS2l0TWVkaWFTdHJlYW1TcmMqIHNlbGYsIE1lZGlhU3RyZWFtUHJpdmF0 ZSogc3RyZWFtKQpAQCAtNTEwLDE2ICs1OTMsMTYgQEAgYm9vbCB3ZWJraXRNZWRpYVN0cmVhbVNy Y0FkZFRyYWNrKFdlYktpdE1lZGlhU3RyZWFtU3JjKiBzZWxmLCBNZWRpYVN0cmVhbVRyYWNrUHIK IHN0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjUmVtb3ZlVHJhY2tCeVR5cGUoV2ViS2l0 TWVkaWFTdHJlYW1TcmMqIHNlbGYsIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUgdHJhY2tUeXBl KQogewogICAgIGlmICh0cmFja1R5cGUgPT0gUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVk aW8pIHsKLSAgICAgICAgaWYgKHNlbGYtPmF1ZGlvU3JjKSB7Ci0gICAgICAgICAgICBnc3RfZWxl bWVudF9zZXRfc3RhdGUoc2VsZi0+YXVkaW9TcmMsIEdTVF9TVEFURV9OVUxMKTsKLSAgICAgICAg ICAgIGdzdF9iaW5fcmVtb3ZlKEdTVF9CSU4oc2VsZiksIHNlbGYtPmF1ZGlvU3JjKTsKLSAgICAg ICAgICAgIHNlbGYtPmF1ZGlvU3JjID0gbnVsbHB0cjsKKyAgICAgICAgaWYgKHNlbGYtPmF1ZGlv U3JjLmlzVXNlZCgpKSB7CisgICAgICAgICAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUoc2VsZi0+ YXVkaW9TcmMuc3JjKCksIEdTVF9TVEFURV9OVUxMKTsKKyAgICAgICAgICAgIGdzdF9iaW5fcmVt b3ZlKEdTVF9CSU4oc2VsZiksIHNlbGYtPmF1ZGlvU3JjLnNyYygpKTsKKyAgICAgICAgICAgIHNl bGYtPmF1ZGlvU3JjLnJlc2V0KGZhbHNlKTsKICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAodHJh Y2tUeXBlID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvKSB7Ci0gICAgICAgIGlm IChzZWxmLT52aWRlb1NyYykgewotICAgICAgICAgICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKHNl bGYtPnZpZGVvU3JjLCBHU1RfU1RBVEVfTlVMTCk7Ci0gICAgICAgICAgICBnc3RfYmluX3JlbW92 ZShHU1RfQklOKHNlbGYpLCBzZWxmLT52aWRlb1NyYyk7Ci0gICAgICAgICAgICBzZWxmLT52aWRl b1NyYyA9IG51bGxwdHI7CisgICAgICAgIGlmIChzZWxmLT52aWRlb1NyYy5pc1VzZWQoKSkgewor ICAgICAgICAgICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKHNlbGYtPnZpZGVvU3JjLnNyYygpLCBH U1RfU1RBVEVfTlVMTCk7CisgICAgICAgICAgICBnc3RfYmluX3JlbW92ZShHU1RfQklOKHNlbGYp LCBzZWxmLT52aWRlb1NyYy5zcmMoKSk7CisgICAgICAgICAgICBzZWxmLT52aWRlb1NyYy5yZXNl dCh0cnVlKTsKICAgICAgICAgfQogICAgIH0gZWxzZQogICAgICAgICBHU1RfSU5GTygiVW5zdXBw b3J0ZWQgdHJhY2sgdHlwZTogJWQiLCBzdGF0aWNfY2FzdDxpbnQ+KHRyYWNrVHlwZSkpOwpAQCAt NTQ0LDMxICs2MjcsMTIgQEAgYm9vbCB3ZWJraXRNZWRpYVN0cmVhbVNyY1NldFN0cmVhbShXZWJL aXRNZWRpYVN0cmVhbVNyYyogc2VsZiwgTWVkaWFTdHJlYW1Qcml2YXQKIAogc3RhdGljIHZvaWQg d2Via2l0TWVkaWFTdHJlYW1TcmNQdXNoVmlkZW9TYW1wbGUoV2ViS2l0TWVkaWFTdHJlYW1TcmMq IHNlbGYsIEdzdFNhbXBsZSogZ3N0c2FtcGxlKQogewotICAgIGlmIChzZWxmLT52aWRlb1NyYykg ewotICAgICAgICBpZiAoIUdTVF9DTE9DS19USU1FX0lTX1ZBTElEKHNlbGYtPmZpcnN0RnJhbWVQ dHMpKSB7Ci0gICAgICAgICAgICBhdXRvIGJ1ZmZlciA9IGdzdF9zYW1wbGVfZ2V0X2J1ZmZlcihn c3RzYW1wbGUpOwotCi0gICAgICAgICAgICBzZWxmLT5maXJzdEZyYW1lUHRzID0gR1NUX0JVRkZF Ul9QVFMoYnVmZmVyKTsKLSAgICAgICAgICAgIGF1dG8gcGFkID0gYWRvcHRHUmVmKGdzdF9lbGVt ZW50X2dldF9zdGF0aWNfcGFkKHNlbGYtPnZpZGVvU3JjLCAic3JjIikpOwotICAgICAgICAgICAg Z3N0X3BhZF9zZXRfb2Zmc2V0KHBhZC5nZXQoKSwgLXNlbGYtPmZpcnN0RnJhbWVQdHMpOwotICAg ICAgICB9Ci0KLSAgICAgICAgZ3N0X2FwcF9zcmNfcHVzaF9zYW1wbGUoR1NUX0FQUF9TUkMoc2Vs Zi0+dmlkZW9TcmMpLCBnc3RzYW1wbGUpOwotICAgIH0KKyAgICBzZWxmLT52aWRlb1NyYy5wdXNo U2FtcGxlKGdzdHNhbXBsZSk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3Jj UHVzaEF1ZGlvU2FtcGxlKFdlYktpdE1lZGlhU3RyZWFtU3JjKiBzZWxmLCBHc3RTYW1wbGUqIGdz dHNhbXBsZSkKIHsKLSAgICBpZiAoc2VsZi0+YXVkaW9TcmMpIHsKLSAgICAgICAgaWYgKCFHU1Rf Q0xPQ0tfVElNRV9JU19WQUxJRChzZWxmLT5maXJzdEF1ZGlvQnVmZmVyUHRzKSkgewotICAgICAg ICAgICAgYXV0byBidWZmZXIgPSBnc3Rfc2FtcGxlX2dldF9idWZmZXIoZ3N0c2FtcGxlKTsKLQot ICAgICAgICAgICAgc2VsZi0+Zmlyc3RBdWRpb0J1ZmZlclB0cyA9IEdTVF9CVUZGRVJfUFRTKGJ1 ZmZlcik7Ci0gICAgICAgICAgICBhdXRvIHBhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRf c3RhdGljX3BhZChzZWxmLT5hdWRpb1NyYywgInNyYyIpKTsKLSAgICAgICAgICAgIGdzdF9wYWRf c2V0X29mZnNldChwYWQuZ2V0KCksIC1zZWxmLT5maXJzdEF1ZGlvQnVmZmVyUHRzKTsKLSAgICAg ICAgfQotICAgICAgICBnc3RfYXBwX3NyY19wdXNoX3NhbXBsZShHU1RfQVBQX1NSQyhzZWxmLT5h dWRpb1NyYyksIGdzdHNhbXBsZSk7Ci0gICAgfQorICAgIHNlbGYtPmF1ZGlvU3JjLnB1c2hTYW1w bGUoZ3N0c2FtcGxlKTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0TWVkaWFTdHJlYW1TcmNUcmFj a0VuZGVkKFdlYktpdE1lZGlhU3RyZWFtU3JjKiBzZWxmLAo=