30377 2009-10-14 22:40:01 -0700 [GStreamer] Should emit {networkState,readyState,volume,time,size,rate,duration}Changed signals 2009-12-14 02:08:28 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 slomo webkit-unassigned abarth gustavo pnormand webkit.review.bot oldest_to_newest 154713 0 slomo 2009-10-14 22:40:01 -0700 Hi, the gstreamer media player should emit {networkState,readyState,volume,time,size,rate,duration}Changed signals as appropiate. networkState and readyState: could probably be implemented based on the GstBus handler: for state changed, buffering and error messages volumeChanged: Can be done from the notify::volume and notify::mute signals of playbin2 (note: called from the streaming thread usually) timeChanged: Not sure when this should be called rateChanged: From some NEWSEGMENT event handler in the video sink if the rate of the segment has changed. And of course after seeks sizeChanged: From the notify::caps signal of the video sink pad (note: called from the streaming thread usually) if the width, height or PAR has changed. durationChanged: When a GstMessage of type DURATION is received in the message handler 162424 1 42946 pnormand 2009-11-11 03:17:07 -0800 Created attachment 42946 emit volumeChanged and durationChanged upon notification from GStreamer. 162478 2 pnormand 2009-11-11 08:06:11 -0800 (In reply to comment #0) > Hi, > the gstreamer media player should emit > {networkState,readyState,volume,time,size,rate,duration}Changed signals as > appropiate. > > networkState and readyState: could probably be implemented based on the GstBus > handler: for state changed, buffering and error messages > AFAICS these are already emitted during updateStates(), called by the bus message handler. > volumeChanged: Can be done from the notify::volume and notify::mute signals of > playbin2 (note: called from the streaming thread usually) > see attached patch ;) > timeChanged: Not sure when this should be called > It is called after seek and at EOS. Will check if some more is needed. > rateChanged: From some NEWSEGMENT event handler in the video sink if the rate > of the segment has changed. And of course after seeks > This is now emitted after succesful rate change (bug 31047). Do you think some more is needed? > sizeChanged: From the notify::caps signal of the video sink pad (note: called > from the streaming thread usually) if the width, height or PAR has changed. > Company has a patch for this ;) > durationChanged: When a GstMessage of type DURATION is received in the message > handler See attached patch 163300 3 pnormand 2009-11-13 06:50:18 -0800 We should indeed emit timeupdate events everytime the playback position changes, not sure about the frequency though. See also http://www.w3.org/TR/html5/video.html#event-timeupdate 163858 4 pnormand 2009-11-15 23:44:46 -0800 (In reply to comment #3) > We should indeed emit timeupdate events everytime the playback position > changes, not sure about the frequency though. See also > http://www.w3.org/TR/html5/video.html#event-timeupdate Scratch that, HTMLMediaElement takes care of that. 167330 5 abarth 2009-11-30 12:23:47 -0800 Attachment 42946 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h:48: Code inside a namespace should not be indented. [whitespace/indent] [4] WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h:49: Code inside a namespace should not be indented. [whitespace/indent] [4] Done processing WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h Done processing WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp Total errors found: 2 167540 6 44060 pnormand 2009-12-01 00:44:25 -0800 Created attachment 44060 emit volumeChanged and durationChanged upon notification from GStreamer. 167541 7 webkit.review.bot 2009-12-01 00:48:48 -0800 style-queue ran check-webkit-style on attachment 44060 without any errors. 170923 8 44060 oliver 2009-12-11 14:11:01 -0800 Comment on attachment 44060 emit volumeChanged and durationChanged upon notification from GStreamer. r=me 171321 9 gustavo 2009-12-14 02:08:28 -0800 Landed by Philippe as r52085. 42946 2009-11-11 03:17:07 -0800 2009-12-01 00:44:25 -0800 emit volumeChanged and durationChanged upon notification from GStreamer. emit-volumeChanged-and-durationChanged-upon-notifi.patch text/plain 4779 pnormand RnJvbSBiMDNmNjEyMWM2YjFlMzgxMjA1MDljNjAxNGI0NjIyOGRhMzk1ODZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBXZWQsIDExIE5vdiAyMDA5IDExOjAyOjUxICswMTAwClN1YmplY3Q6IFtQQVRDSF0g ZW1pdCB2b2x1bWVDaGFuZ2VkIGFuZCBkdXJhdGlvbkNoYW5nZWQgdXBvbiBub3RpZmljYXRpb24g ZnJvbSBHU3RyZWFtZXIuCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAxOSArKysrKysrKysrKysrKysKIC4uLi9ncmFwaGljcy9ndGsv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCAgIHwgICAyNSArKysrKysrKysrKysrKysr LS0tCiAuLi4vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oICAgICB8 ICAgIDQgKystCiAzIGZpbGVzIGNoYW5nZWQsIDQzIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBjZTQzMTg3Li5hZGQxNTIxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDA5LTExLTExICBQaGlsaXBw ZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1N0cmVhbWVyXSBTaG91bGQgZW1pdCB7bmV0d29y a1N0YXRlLHJlYWR5U3RhdGUsdm9sdW1lLHRpbWUsc2l6ZSxyYXRlLGR1cmF0aW9ufUNoYW5nZWQg c2lnbmFscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzAzNzcKKworICAgICAgICBFbWl0IHZvbHVtZUNoYW5nZWQgYW5kIGR1cmF0aW9uQ2hhbmdlZCB1 cG9uIG5vdGlmaWNhdGlvbiBmcm9tCisgICAgICAgIEdTdHJlYW1lci4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6bWVkaWFQbGF5ZXJQcml2YXRlTWVzc2FnZUNhbGxiYWNrKToKKyAgICAg ICAgKFdlYkNvcmU6Om1lZGlhUGxheWVyUHJpdmF0ZVZvbHVtZUNhbGxiYWNrKToKKyAgICAgICAg KFdlYkNvcmU6Om5vdGlmeV92b2x1bWVfaWRsZV9jYik6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGU6OmRpZEVuZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGU6OmR1cmF0aW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGU6OmNyZWF0ZUdTVFBsYXlCaW4pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0 ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoKKwogMjAwOS0xMS0xMCAgR2F2aW4gQmFy cmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg R2VvZmYgR2FyZW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCAzNGM2ZDg4Li42MWEy YTZjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3Rr L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTkxLDYgKzkxLDEwIEBAIGdib29s ZWFuIG1lZGlhUGxheWVyUHJpdmF0ZU1lc3NhZ2VDYWxsYmFjayhHc3RCdXMqIGJ1cywgR3N0TWVz c2FnZSogbWVzc2FnZSwgZ3BvCiAgICAgICAgIGdzdF9tZXNzYWdlX3BhcnNlX2J1ZmZlcmluZyht ZXNzYWdlLCAmcGVyY2VudCk7CiAgICAgICAgIExPR19WRVJCT1NFKE1lZGlhLCAiQnVmZmVyaW5n ICVkIiwgcGVyY2VudCk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgR1NUX01FU1NBR0VfRFVS QVRJT046CisgICAgICAgIExPR19WRVJCT1NFKE1lZGlhLCAiRHVyYXRpb24gY2hhbmdlZCIpOwor ICAgICAgICBtcC0+ZHVyYXRpb25DaGFuZ2VkKCk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1 bHQ6CiAgICAgICAgIExPR19WRVJCT1NFKE1lZGlhLCAiVW5oYW5kbGVkIEdTdHJlYW1lciBtZXNz YWdlIHR5cGU6ICVzIiwKICAgICAgICAgICAgICAgICAgICAgR1NUX01FU1NBR0VfVFlQRV9OQU1F KG1lc3NhZ2UpKTsKQEAgLTk5LDYgKzEwMywxNyBAQCBnYm9vbGVhbiBtZWRpYVBsYXllclByaXZh dGVNZXNzYWdlQ2FsbGJhY2soR3N0QnVzKiBidXMsIEdzdE1lc3NhZ2UqIG1lc3NhZ2UsIGdwbwog ICAgIHJldHVybiB0cnVlOwogfQogCit2b2lkIG1lZGlhUGxheWVyUHJpdmF0ZVZvbHVtZUNhbGxi YWNrKEdPYmplY3QgKmVsZW1lbnQsIEdQYXJhbVNwZWMgKnBzcGVjLCBNZWRpYVBsYXllciogbXAp Cit7CisgICAgZ19pZGxlX2FkZCgoR1NvdXJjZUZ1bmMpIG5vdGlmeV92b2x1bWVfaWRsZV9jYiwg bXApOworfQorCitnYm9vbGVhbiBub3RpZnlfdm9sdW1lX2lkbGVfY2IoTWVkaWFQbGF5ZXIqIG1w KQoreworICAgIG1wLT52b2x1bWVDaGFuZ2VkKCk7CisgICAgcmV0dXJuIEZBTFNFOworfQorCiBz dGF0aWMgZmxvYXQgcGxheWJhY2tQb3NpdGlvbihHc3RFbGVtZW50KiBwbGF5YmluKQogewogCkBA IC02MzgsMTQgKzY1MywxNCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6dGltZUNoYW5nZWQo KQogICAgIG1fcGxheWVyLT50aW1lQ2hhbmdlZCgpOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJp dmF0ZTo6dm9sdW1lQ2hhbmdlZCgpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6ZGlkRW5kKCkK IHsKLSAgICBtX3BsYXllci0+dm9sdW1lQ2hhbmdlZCgpOworICAgIHRpbWVDaGFuZ2VkKCk7CiB9 CiAKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpkaWRFbmQoKQordm9pZCBNZWRpYVBsYXllclBy aXZhdGU6OmR1cmF0aW9uQ2hhbmdlZCgpCiB7Ci0gICAgdGltZUNoYW5nZWQoKTsKKyAgICBtX3Bs YXllci0+ZHVyYXRpb25DaGFuZ2VkKCk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjps b2FkaW5nRmFpbGVkKE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgZXJyb3IpCkBAIC04ODMsNiAr ODk4LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OmNyZWF0ZUdTVFBsYXlCaW4oU3RyaW5n IHVybCkKICAgICBnX29iamVjdF9zZXQoR19PQkpFQ1QobV9wbGF5QmluKSwgInVyaSIsIHVybC51 dGY4KCkuZGF0YSgpLAogICAgICAgICAidm9sdW1lIiwgc3RhdGljX2Nhc3Q8ZG91YmxlPihtX3Bs YXllci0+dm9sdW1lKCkpLCBOVUxMKTsKIAorICAgIGdfc2lnbmFsX2Nvbm5lY3QoR19PQkpFQ1Qo bV9wbGF5QmluKSwgIm5vdGlmeTo6dm9sdW1lIiwgR19DQUxMQkFDSyhtZWRpYVBsYXllclByaXZh dGVWb2x1bWVDYWxsYmFjayksIG1fcGxheWVyKTsKKwogICAgIG1fdmlkZW9TaW5rID0gd2Via2l0 X3ZpZGVvX3NpbmtfbmV3KCk7CiAKICAgICBnX29iamVjdF9yZWZfc2luayhtX3ZpZGVvU2luayk7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IDFlY2JjNDYuLjVhYTVjMzQgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5oCkBAIC00NSw2ICs0NSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBj bGFzcyBTdHJpbmc7CiAKICAgICBnYm9vbGVhbiBtZWRpYVBsYXllclByaXZhdGVNZXNzYWdlQ2Fs bGJhY2soR3N0QnVzKiBidXMsIEdzdE1lc3NhZ2UqIG1lc3NhZ2UsIGdwb2ludGVyIGRhdGEpOwor ICAgIHZvaWQgbWVkaWFQbGF5ZXJQcml2YXRlVm9sdW1lQ2FsbGJhY2soR09iamVjdCAqZWxlbWVu dCwgR1BhcmFtU3BlYyAqcHNwZWMsIE1lZGlhUGxheWVyKiBtcCk7CisgICAgZ2Jvb2xlYW4gbm90 aWZ5X3ZvbHVtZV9pZGxlX2NiKE1lZGlhUGxheWVyKiBtcCk7CiAKICAgICBjbGFzcyBNZWRpYVBs YXllclByaXZhdGUgOiBwdWJsaWMgTWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlIHsKICAgICAg ICAgZnJpZW5kIGdib29sZWFuIG1lZGlhUGxheWVyUHJpdmF0ZU1lc3NhZ2VDYWxsYmFjayhHc3RC dXMqIGJ1cywgR3N0TWVzc2FnZSogbWVzc2FnZSwgZ3BvaW50ZXIgZGF0YSk7CkBAIC05Miw4ICs5 NCw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIHZvaWQgbG9hZFN0YXRlQ2hh bmdlZCgpOwogICAgICAgICAgICAgdm9pZCBzaXplQ2hhbmdlZCgpOwogICAgICAgICAgICAgdm9p ZCB0aW1lQ2hhbmdlZCgpOwotICAgICAgICAgICAgdm9pZCB2b2x1bWVDaGFuZ2VkKCk7CiAgICAg ICAgICAgICB2b2lkIGRpZEVuZCgpOworICAgICAgICAgICAgdm9pZCBkdXJhdGlvbkNoYW5nZWQo KTsKICAgICAgICAgICAgIHZvaWQgbG9hZGluZ0ZhaWxlZChNZWRpYVBsYXllcjo6TmV0d29ya1N0 YXRlKTsKIAogICAgICAgICAgICAgdm9pZCByZXBhaW50KCk7Ci0tIAoxLjYuMy4z 44060 2009-12-01 00:44:25 -0800 2009-12-11 14:11:01 -0800 emit volumeChanged and durationChanged upon notification from GStreamer. emit-volumeChanged-and-durationChanged-upon-notifi.patch text/plain 5106 pnormand RnJvbSAyOWNjZjZhZTQ0ZGYyMDM2NDljY2RiNDA1NTU1NGE1MGI3NDEzMDM4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBXZWQsIDExIE5vdiAyMDA5IDExOjAyOjUxICswMTAwClN1YmplY3Q6IFtQQVRDSF0g ZW1pdCB2b2x1bWVDaGFuZ2VkIGFuZCBkdXJhdGlvbkNoYW5nZWQgdXBvbiBub3RpZmljYXRpb24g ZnJvbSBHU3RyZWFtZXIuCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAxOSArKysrKysrKysrKysrKysKIC4uLi9ncmFwaGljcy9ndGsv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCAgIHwgICAyNSArKysrKysrKysrKysrKysr LS0tCiAuLi4vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oICAgICB8 ICAgMTQgKysrKystLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAxMSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGE4MTBjYWQuLjk1NjE4N2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMTEtMTEg IFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHU3RyZWFtZXJdIFNob3VsZCBlbWl0 IHtuZXR3b3JrU3RhdGUscmVhZHlTdGF0ZSx2b2x1bWUsdGltZSxzaXplLHJhdGUsZHVyYXRpb259 Q2hhbmdlZCBzaWduYWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zMDM3NworCisgICAgICAgIEVtaXQgdm9sdW1lQ2hhbmdlZCBhbmQgZHVyYXRpb25D aGFuZ2VkIHVwb24gbm90aWZpY2F0aW9uIGZyb20KKyAgICAgICAgR1N0cmVhbWVyLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHA6CisgICAgICAgIChXZWJDb3JlOjptZWRpYVBsYXllclByaXZhdGVNZXNzYWdlQ2FsbGJhY2sp OgorICAgICAgICAoV2ViQ29yZTo6bWVkaWFQbGF5ZXJQcml2YXRlVm9sdW1lQ2FsbGJhY2spOgor ICAgICAgICAoV2ViQ29yZTo6bm90aWZ5X3ZvbHVtZV9pZGxlX2NiKToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6ZGlkRW5kKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZTo6ZHVyYXRpb25DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZTo6Y3JlYXRlR1NUUGxheUJpbik6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorCiAyMDA5LTExLTMwICBF cmlrIEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IDkyZGUzOTIuLmZlNTlj ZmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtOTEsNiArOTEsMTAgQEAgZ2Jvb2xl YW4gbWVkaWFQbGF5ZXJQcml2YXRlTWVzc2FnZUNhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNz YWdlKiBtZXNzYWdlLCBncG8KICAgICAgICAgZ3N0X21lc3NhZ2VfcGFyc2VfYnVmZmVyaW5nKG1l c3NhZ2UsICZwZXJjZW50KTsKICAgICAgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJCdWZmZXJpbmcg JWQiLCBwZXJjZW50KTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBHU1RfTUVTU0FHRV9EVVJB VElPTjoKKyAgICAgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJEdXJhdGlvbiBjaGFuZ2VkIik7Cisg ICAgICAgIG1wLT5kdXJhdGlvbkNoYW5nZWQoKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVs dDoKICAgICAgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJVbmhhbmRsZWQgR1N0cmVhbWVyIG1lc3Nh Z2UgdHlwZTogJXMiLAogICAgICAgICAgICAgICAgICAgICBHU1RfTUVTU0FHRV9UWVBFX05BTUUo bWVzc2FnZSkpOwpAQCAtOTksNiArMTAzLDE3IEBAIGdib29sZWFuIG1lZGlhUGxheWVyUHJpdmF0 ZU1lc3NhZ2VDYWxsYmFjayhHc3RCdXMqIGJ1cywgR3N0TWVzc2FnZSogbWVzc2FnZSwgZ3BvCiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKK3N0YXRpYyBnYm9vbGVhbiBub3RpZnlfdm9sdW1lX2lkbGVf Y2IoTWVkaWFQbGF5ZXIqIG1wKQoreworICAgIG1wLT52b2x1bWVDaGFuZ2VkKCk7CisgICAgcmV0 dXJuIEZBTFNFOworfQorCitzdGF0aWMgdm9pZCBtZWRpYVBsYXllclByaXZhdGVWb2x1bWVDYWxs YmFjayhHT2JqZWN0ICplbGVtZW50LCBHUGFyYW1TcGVjICpwc3BlYywgTWVkaWFQbGF5ZXIqIG1w KQoreworICAgIGdfaWRsZV9hZGQoKEdTb3VyY2VGdW5jKSBub3RpZnlfdm9sdW1lX2lkbGVfY2Is IG1wKTsKK30KKwogc3RhdGljIGZsb2F0IHBsYXliYWNrUG9zaXRpb24oR3N0RWxlbWVudCogcGxh eWJpbikKIHsKIApAQCAtNjYzLDE0ICs2NzgsMTQgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGU6 OnRpbWVDaGFuZ2VkKCkKICAgICBtX3BsYXllci0+dGltZUNoYW5nZWQoKTsKIH0KIAotdm9pZCBN ZWRpYVBsYXllclByaXZhdGU6OnZvbHVtZUNoYW5nZWQoKQordm9pZCBNZWRpYVBsYXllclByaXZh dGU6OmRpZEVuZCgpCiB7Ci0gICAgbV9wbGF5ZXItPnZvbHVtZUNoYW5nZWQoKTsKKyAgICB0aW1l Q2hhbmdlZCgpOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6ZGlkRW5kKCkKK3ZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlOjpkdXJhdGlvbkNoYW5nZWQoKQogewotICAgIHRpbWVDaGFuZ2Vk KCk7CisgICAgbV9wbGF5ZXItPmR1cmF0aW9uQ2hhbmdlZCgpOwogfQogCiB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZTo6bG9hZGluZ0ZhaWxlZChNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIGVycm9y KQpAQCAtODc1LDYgKzg5MCw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpjcmVhdGVHU1RQ bGF5QmluKFN0cmluZyB1cmwpCiAgICAgZ19vYmplY3Rfc2V0KEdfT0JKRUNUKG1fcGxheUJpbiks ICJ1cmkiLCB1cmwudXRmOCgpLmRhdGEoKSwKICAgICAgICAgInZvbHVtZSIsIHN0YXRpY19jYXN0 PGRvdWJsZT4obV9wbGF5ZXItPnZvbHVtZSgpKSwgTlVMTCk7CiAKKyAgICBnX3NpZ25hbF9jb25u ZWN0KEdfT0JKRUNUKG1fcGxheUJpbiksICJub3RpZnk6OnZvbHVtZSIsIEdfQ0FMTEJBQ0sobWVk aWFQbGF5ZXJQcml2YXRlVm9sdW1lQ2FsbGJhY2spLCBtX3BsYXllcik7CisKICAgICBtX3ZpZGVv U2luayA9IHdlYmtpdF92aWRlb19zaW5rX25ldygpOwogCiAgICAgZ19vYmplY3RfcmVmX3Npbmso bV92aWRlb1NpbmspOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAppbmRleCA2YWI4ZWRiLi45MWM5N2Zj IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuaApAQCAtMzksMTQgKzM5LDE0IEBAIHR5cGVkZWYgc3Ry dWN0IF9Hc3RCdXMgR3N0QnVzOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSAgICBjbGFzcyBH cmFwaGljc0NvbnRleHQ7Ci0gICAgY2xhc3MgSW50U2l6ZTsKLSAgICBjbGFzcyBJbnRSZWN0Owot ICAgIGNsYXNzIFN0cmluZzsKK2NsYXNzIEdyYXBoaWNzQ29udGV4dDsKK2NsYXNzIEludFNpemU7 CitjbGFzcyBJbnRSZWN0OworY2xhc3MgU3RyaW5nOwogCi0gICAgZ2Jvb2xlYW4gbWVkaWFQbGF5 ZXJQcml2YXRlTWVzc2FnZUNhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNzYWdlKiBtZXNzYWdl LCBncG9pbnRlciBkYXRhKTsKK2dib29sZWFuIG1lZGlhUGxheWVyUHJpdmF0ZU1lc3NhZ2VDYWxs YmFjayhHc3RCdXMqIGJ1cywgR3N0TWVzc2FnZSogbWVzc2FnZSwgZ3BvaW50ZXIgZGF0YSk7CiAK LSAgICBjbGFzcyBNZWRpYVBsYXllclByaXZhdGUgOiBwdWJsaWMgTWVkaWFQbGF5ZXJQcml2YXRl SW50ZXJmYWNlIHsKK2NsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZSA6IHB1YmxpYyBNZWRpYVBsYXll clByaXZhdGVJbnRlcmZhY2UgewogICAgICAgICBmcmllbmQgZ2Jvb2xlYW4gbWVkaWFQbGF5ZXJQ cml2YXRlTWVzc2FnZUNhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNzYWdlKiBtZXNzYWdlLCBn cG9pbnRlciBkYXRhKTsKICAgICAgICAgZnJpZW5kIHZvaWQgbWVkaWFQbGF5ZXJQcml2YXRlUmVw YWludENhbGxiYWNrKFdlYktpdFZpZGVvU2luayosIEdzdEJ1ZmZlciAqYnVmZmVyLCBNZWRpYVBs YXllclByaXZhdGUqIHBsYXllclByaXZhdGUpOwogCkBAIC05Miw4ICs5Miw4IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgICAgIHZvaWQgbG9hZFN0YXRlQ2hhbmdlZCgpOwogICAgICAg ICAgICAgdm9pZCBzaXplQ2hhbmdlZCgpOwogICAgICAgICAgICAgdm9pZCB0aW1lQ2hhbmdlZCgp OwotICAgICAgICAgICAgdm9pZCB2b2x1bWVDaGFuZ2VkKCk7CiAgICAgICAgICAgICB2b2lkIGRp ZEVuZCgpOworICAgICAgICAgICAgdm9pZCBkdXJhdGlvbkNoYW5nZWQoKTsKICAgICAgICAgICAg IHZvaWQgbG9hZGluZ0ZhaWxlZChNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlKTsKIAogICAgICAg ICAgICAgdm9pZCByZXBhaW50KCk7Ci0tIAoxLjYuMy4z