125852 2013-12-17 04:42:04 -0800 [GStreamer] video/audio seeking is not unified. 2013-12-23 05:11:45 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 piotr.grad webkit-unassigned cgarcia commit-queue eric.carlson glenn gustavo jer.noble menard mrobinson pnormand oldest_to_newest 960457 0 piotr.grad 2013-12-17 04:42:04 -0800 Seeking should be unified in that way we are always sure negative playback rate is always taken into account. 960459 1 piotr.grad 2013-12-17 04:42:29 -0800 Already working on solution. 960470 2 219411 piotr.grad 2013-12-17 05:22:07 -0800 Created attachment 219411 Patch 960476 3 219411 pnormand 2013-12-17 05:50:24 -0800 Comment on attachment 219411 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219411&action=review > Source/WebCore/ChangeLog:11 > + Test: media/video-seek-with-negative-playback.html This is skipped in EFL but not in GTK, it seems. I guess it can now be unskipped? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:614 > +bool MediaPlayerPrivateGStreamer::seekIncludingRate(gint64 position, float rate, GstSeekFlags seekType) Hum what about doSeek() ? Having only the rate mentioned in the name is a bit odd. 962434 4 219904 piotr.grad 2013-12-23 03:39:46 -0800 Created attachment 219904 patch 962441 5 piotr.grad 2013-12-23 03:55:01 -0800 (In reply to comment #3) > (From update of attachment 219411 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=219411&action=review > > > Source/WebCore/ChangeLog:11 > > + Test: media/video-seek-with-negative-playback.html > > This is skipped in EFL but not in GTK, it seems. I guess it can now be unskipped? > > > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:614 > > +bool MediaPlayerPrivateGStreamer::seekIncludingRate(gint64 position, float rate, GstSeekFlags seekType) > > Hum what about doSeek() ? Having only the rate mentioned in the name is a bit odd. Unfortunatelly this test is still flaky for EFL becouse of some race condition. 962447 6 219904 commit-queue 2013-12-23 05:11:42 -0800 Comment on attachment 219904 patch Clearing flags on attachment: 219904 Committed r160992: <http://trac.webkit.org/changeset/160992> 962448 7 commit-queue 2013-12-23 05:11:45 -0800 All reviewed patches have been landed. Closing bug. 219411 2013-12-17 05:22:07 -0800 2013-12-23 03:39:46 -0800 Patch patch.txt text/plain 6292 piotr.grad ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZmEyYzI4Li41YzIyZTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMTItMTcgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAg ICAgW0dTdHJlYW1lcl0gdmlkZW8vYXVkaW8gc2Vla2luZyBpcyBub3QgdW5pZmllZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTg1MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYnVnIGlzIGZp eGluZyByZWdyZXNzaW9uIHdpdGggc2Vla2luZyBhdWRpby92aWRlbyBlbGVtZW50cyBhbmQgdW5p ZmllcyBzZWVraW5nCisgICAgICAgIGluIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci4KKwor ICAgICAgICBUZXN0OiBtZWRpYS92aWRlby1zZWVrLXdpdGgtbmVnYXRpdmUtcGxheWJhY2suaHRt bAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnNlZWspOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpzZWVrSW5jbHVkaW5nUmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnNldFJhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoKKwogMjAxMy0x Mi0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZC4gVXBkYXRlIEdPYmplY3QgRE9NIHN5bWJvbHMgZmlsZSBhZnRlciByMTYw MzM2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApp bmRleCAxYzkwZTgyLi4wYzU3N2E0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcApAQCAtNTk5LDE4ICs1OTksOCBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6c2VlayhmbG9hdCB0aW1lKQogICAgICAgICAgICAgICAgIGxvYWRp bmdGYWlsZWQoTWVkaWFQbGF5ZXI6OkVtcHR5KTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7Ci0g ICAgICAgIGdpbnQ2NCBzdGFydFRpbWUsIGVuZFRpbWU7Ci0gICAgICAgIGlmIChtX3BsYXllci0+ cmF0ZSgpID4gMCkgewotICAgICAgICAgICAgc3RhcnRUaW1lID0gY2xvY2tUaW1lOwotICAgICAg ICAgICAgZW5kVGltZSA9IEdTVF9DTE9DS19USU1FX05PTkU7Ci0gICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICBzdGFydFRpbWUgPSAwOwotICAgICAgICAgICAgZW5kVGltZSA9IGNsb2NrVGlt ZTsKLSAgICAgICAgfQotCiAgICAgICAgIC8vIFdlIGNhbiBzZWVrIG5vdy4KLSAgICAgICAgaWYg KCFnc3RfZWxlbWVudF9zZWVrKG1fcGxheUJpbi5nZXQoKSwgbV9wbGF5ZXItPnJhdGUoKSwgR1NU X0ZPUk1BVF9USU1FLCBzdGF0aWNfY2FzdDxHc3RTZWVrRmxhZ3M+KEdTVF9TRUVLX0ZMQUdfRkxV U0ggfCBHU1RfU0VFS19GTEFHX0FDQ1VSQVRFKSwKLSAgICAgICAgICAgIEdTVF9TRUVLX1RZUEVf U0VULCBzdGFydFRpbWUsIEdTVF9TRUVLX1RZUEVfU0VULCBlbmRUaW1lKSkgeworICAgICAgICBp ZiAoIXNlZWtJbmNsdWRpbmdSYXRlKGNsb2NrVGltZSwgbV9wbGF5ZXItPnJhdGUoKSwgc3RhdGlj X2Nhc3Q8R3N0U2Vla0ZsYWdzPihHU1RfU0VFS19GTEFHX0ZMVVNIIHwgR1NUX1NFRUtfRkxBR19B Q0NVUkFURSkpKSB7CiAgICAgICAgICAgICBMT0dfTUVESUFfTUVTU0FHRSgiW1NlZWtdIHNlZWtp bmcgdG8gJWYgZmFpbGVkIiwgdGltZSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0K QEAgLTYyMSw2ICs2MTEsMjcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNl ZWsoZmxvYXQgdGltZSkKICAgICBtX2lzRW5kUmVhY2hlZCA9IGZhbHNlOwogfQogCitib29sIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2Vla0luY2x1ZGluZ1JhdGUoZ2ludDY0IHBvc2l0 aW9uLCBmbG9hdCByYXRlLCBHc3RTZWVrRmxhZ3Mgc2Vla1R5cGUpCit7CisgICAgZ2ludDY0IHN0 YXJ0VGltZSwgZW5kVGltZTsKKworICAgIGlmIChyYXRlID4gMCkgeworICAgICAgICBzdGFydFRp bWUgPSBwb3NpdGlvbjsKKyAgICAgICAgZW5kVGltZSA9IEdTVF9DTE9DS19USU1FX05PTkU7Cisg ICAgfSBlbHNlIHsKKyAgICAgICAgc3RhcnRUaW1lID0gMDsKKyAgICAgICAgLy8gSWYgd2UgYXJl IGF0IGJlZ2lubmluZyBvZiBtZWRpYSwgc3RhcnQgZnJvbSB0aGUgZW5kIHRvCisgICAgICAgIC8v IGF2b2lkIGltbWVkaWF0ZSBFT1MuCisgICAgICAgIGlmIChwb3NpdGlvbiA8IDApCisgICAgICAg ICAgICBlbmRUaW1lID0gc3RhdGljX2Nhc3Q8Z2ludDY0PihkdXJhdGlvbigpICogR1NUX1NFQ09O RCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGVuZFRpbWUgPSBwb3NpdGlvbjsKKyAgICB9 CisKKyAgICByZXR1cm4gZ3N0X2VsZW1lbnRfc2VlayhtX3BsYXlCaW4uZ2V0KCksIHJhdGUsIEdT VF9GT1JNQVRfVElNRSwgc2Vla1R5cGUsCisgICAgICAgIEdTVF9TRUVLX1RZUEVfU0VULCBzdGFy dFRpbWUsIEdTVF9TRUVLX1RZUEVfU0VULCBlbmRUaW1lKTsKK30KKwogYm9vbCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnBhdXNlZCgpIGNvbnN0CiB7CiAgICAgaWYgKG1faXNFbmRSZWFj aGVkKSB7CkBAIC04NDIsOCArODUzLDYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OnNldFJhdGUoZmxvYXQgcmF0ZSkKICAgICB9CiAKICAgICBmbG9hdCBjdXJyZW50UG9zaXRp b24gPSBzdGF0aWNfY2FzdDxmbG9hdD4ocGxheWJhY2tQb3NpdGlvbigpICogR1NUX1NFQ09ORCk7 Ci0gICAgR3N0U2Vla0ZsYWdzIGZsYWdzID0gKEdzdFNlZWtGbGFncykoR1NUX1NFRUtfRkxBR19G TFVTSCk7Ci0gICAgZ2ludDY0IHN0YXJ0LCBlbmQ7CiAgICAgYm9vbCBtdXRlID0gZmFsc2U7CiAK ICAgICBJTkZPX01FRElBX01FU1NBR0UoIlNldCBSYXRlIHRvICVmIiwgcmF0ZSk7CkBAIC04NTEs MjUgKzg2MCwxNSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UmF0ZShm bG9hdCByYXRlKQogICAgICAgICAvLyBNdXRlIHRoZSBzb3VuZCBpZiB0aGUgcGxheWJhY2sgcmF0 ZSBpcyB0b28gZXh0cmVtZSBhbmQKICAgICAgICAgLy8gYXVkaW8gcGl0Y2ggaXMgbm90IGFkanVz dGVkLgogICAgICAgICBtdXRlID0gKCFtX3ByZXNlcnZlc1BpdGNoICYmIChyYXRlIDwgMC44IHx8 IHJhdGUgPiAyKSk7Ci0gICAgICAgIHN0YXJ0ID0gY3VycmVudFBvc2l0aW9uOwotICAgICAgICBl bmQgPSBHU1RfQ0xPQ0tfVElNRV9OT05FOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHN0YXJ0ID0g MDsKKyAgICAgICAgaWYgKGN1cnJlbnRQb3NpdGlvbiA9PSAwLjBmKQorICAgICAgICAgICAgY3Vy cmVudFBvc2l0aW9uID0gLTEuMGY7CiAgICAgICAgIG11dGUgPSB0cnVlOwotCi0gICAgICAgIC8v IElmIHdlIGFyZSBhdCBiZWdpbm5pbmcgb2YgbWVkaWEsIHN0YXJ0IGZyb20gdGhlIGVuZCB0bwot ICAgICAgICAvLyBhdm9pZCBpbW1lZGlhdGUgRU9TLgotICAgICAgICBpZiAoY3VycmVudFBvc2l0 aW9uIDw9IDApCi0gICAgICAgICAgICBlbmQgPSBzdGF0aWNfY2FzdDxnaW50NjQ+KGR1cmF0aW9u KCkgKiBHU1RfU0VDT05EKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgZW5kID0gY3VycmVu dFBvc2l0aW9uOwogICAgIH0KIAogICAgIElORk9fTUVESUFfTUVTU0FHRSgiTmVlZCB0byBtdXRl IGF1ZGlvPzogJWQiLCAoaW50KSBtdXRlKTsKIAotICAgIGlmICghZ3N0X2VsZW1lbnRfc2Vlayht X3BsYXlCaW4uZ2V0KCksIHJhdGUsIEdTVF9GT1JNQVRfVElNRSwgZmxhZ3MsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgIEdTVF9TRUVLX1RZUEVfU0VULCBzdGFydCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgR1NUX1NFRUtfVFlQRV9TRVQsIGVuZCkpCisgICAgaWYgKCFzZWVrSW5jbHVk aW5nUmF0ZShjdXJyZW50UG9zaXRpb24sIHJhdGUsIHN0YXRpY19jYXN0PEdzdFNlZWtGbGFncz4o R1NUX1NFRUtfRkxBR19GTFVTSCkpKQogICAgICAgICBFUlJPUl9NRURJQV9NRVNTQUdFKCJTZXQg cmF0ZSB0byAlZiBmYWlsZWQiLCByYXRlKTsKICAgICBlbHNlCiAgICAgICAgIGdfb2JqZWN0X3Nl dChtX3BsYXlCaW4uZ2V0KCksICJtdXRlIiwgbXV0ZSwgTlVMTCk7CkBAIC0xNDU3LDggKzE0NTYs NyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlU3RhdGVzKCkKICAg ICBpZiAobV9zZWVrSXNQZW5kaW5nICYmIGdldFN0YXRlUmVzdWx0ID09IEdTVF9TVEFURV9DSEFO R0VfU1VDQ0VTUyAmJiAoc3RhdGUgPT0gR1NUX1NUQVRFX1BBVVNFRCB8fCBzdGF0ZSA9PSBHU1Rf U1RBVEVfUExBWUlORykpIHsKICAgICAgICAgTE9HX01FRElBX01FU1NBR0UoIltTZWVrXSBjb21t aXR0aW5nIHBlbmRpbmcgc2VlayB0byAlZiIsIG1fc2Vla1RpbWUpOwogICAgICAgICBtX3NlZWtJ c1BlbmRpbmcgPSBmYWxzZTsKLSAgICAgICAgbV9zZWVraW5nID0gZ3N0X2VsZW1lbnRfc2Vlayht X3BsYXlCaW4uZ2V0KCksIG1fcGxheWVyLT5yYXRlKCksIEdTVF9GT1JNQVRfVElNRSwgc3RhdGlj X2Nhc3Q8R3N0U2Vla0ZsYWdzPihHU1RfU0VFS19GTEFHX0ZMVVNIIHwgR1NUX1NFRUtfRkxBR19B Q0NVUkFURSksCi0gICAgICAgICAgICBHU1RfU0VFS19UWVBFX1NFVCwgdG9Hc3RDbG9ja1RpbWUo bV9zZWVrVGltZSksIEdTVF9TRUVLX1RZUEVfTk9ORSwgR1NUX0NMT0NLX1RJTUVfTk9ORSk7Cisg ICAgICAgIG1fc2Vla2luZyA9IHNlZWtJbmNsdWRpbmdSYXRlKHRvR3N0Q2xvY2tUaW1lKG1fc2Vl a1RpbWUpLCBtX3BsYXllci0+cmF0ZSgpLCBzdGF0aWNfY2FzdDxHc3RTZWVrRmxhZ3M+KEdTVF9T RUVLX0ZMQUdfRkxVU0ggfCBHU1RfU0VFS19GTEFHX0FDQ1VSQVRFKSk7CiAgICAgICAgIGlmICgh bV9zZWVraW5nKQogICAgICAgICAgICAgTE9HX01FRElBX01FU1NBR0UoIltTZWVrXSBzZWVraW5n IHRvICVmIGZhaWxlZCIsIG1fc2Vla1RpbWUpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAppbmRleCA2NzdhOWRhLi4xNDBkMDE5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCkBAIC0xNDYsNiArMTQ2 LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHByb2Nlc3NUYWJsZU9mQ29udGVudHMoR3N0TWVzc2Fn ZSopOwogICAgIHZvaWQgcHJvY2Vzc1RhYmxlT2ZDb250ZW50c0VudHJ5KEdzdFRvY0VudHJ5Kiwg R3N0VG9jRW50cnkqIHBhcmVudCk7CiAjZW5kaWYKKyAgICBib29sIHNlZWtJbmNsdWRpbmdSYXRl KGdpbnQ2NCBwb3NpdGlvbiwgZmxvYXQgcmF0ZSwgR3N0U2Vla0ZsYWdzIHNlZWtUeXBlKTsKKwog CiAgICAgdmlydHVhbCBTdHJpbmcgZW5naW5lRGVzY3JpcHRpb24oKSBjb25zdCB7IHJldHVybiAi R1N0cmVhbWVyIjsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0xpdmVTdHJlYW0oKSBjb25zdCB7IHJl dHVybiBtX2lzU3RyZWFtaW5nOyB9Cg== 219904 2013-12-23 03:39:46 -0800 2013-12-23 05:11:42 -0800 patch patch.txt text/plain 6237 piotr.grad ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZmEyYzI4Li41YzIyZTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMTItMTcgIFBpb3RyIEdyYWQgIDxwLmdyYWRAc2Ftc3VuZy5jb20+CisKKyAgICAg ICAgW0dTdHJlYW1lcl0gdmlkZW8vYXVkaW8gc2Vla2luZyBpcyBub3QgdW5pZmllZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTg1MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYnVnIGlzIGZp eGluZyByZWdyZXNzaW9uIHdpdGggc2Vla2luZyBhdWRpby92aWRlbyBlbGVtZW50cyBhbmQgdW5p ZmllcyBzZWVraW5nCisgICAgICAgIGluIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci4KKwor ICAgICAgICBUZXN0OiBtZWRpYS92aWRlby1zZWVrLXdpdGgtbmVnYXRpdmUtcGxheWJhY2suaHRt bAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnNlZWspOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpzZWVrSW5jbHVkaW5nUmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnNldFJhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoKKwogMjAxMy0x Mi0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZC4gVXBkYXRlIEdPYmplY3QgRE9NIHN5bWJvbHMgZmlsZSBhZnRlciByMTYw MzM2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApp bmRleCAxYzkwZTgyLi4yM2YwYWFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcApAQCAtNTk5LDE4ICs1OTksOCBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6c2VlayhmbG9hdCB0aW1lKQogICAgICAgICAgICAgICAgIGxvYWRp bmdGYWlsZWQoTWVkaWFQbGF5ZXI6OkVtcHR5KTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7Ci0g ICAgICAgIGdpbnQ2NCBzdGFydFRpbWUsIGVuZFRpbWU7Ci0gICAgICAgIGlmIChtX3BsYXllci0+ cmF0ZSgpID4gMCkgewotICAgICAgICAgICAgc3RhcnRUaW1lID0gY2xvY2tUaW1lOwotICAgICAg ICAgICAgZW5kVGltZSA9IEdTVF9DTE9DS19USU1FX05PTkU7Ci0gICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICBzdGFydFRpbWUgPSAwOwotICAgICAgICAgICAgZW5kVGltZSA9IGNsb2NrVGlt ZTsKLSAgICAgICAgfQotCiAgICAgICAgIC8vIFdlIGNhbiBzZWVrIG5vdy4KLSAgICAgICAgaWYg KCFnc3RfZWxlbWVudF9zZWVrKG1fcGxheUJpbi5nZXQoKSwgbV9wbGF5ZXItPnJhdGUoKSwgR1NU X0ZPUk1BVF9USU1FLCBzdGF0aWNfY2FzdDxHc3RTZWVrRmxhZ3M+KEdTVF9TRUVLX0ZMQUdfRkxV U0ggfCBHU1RfU0VFS19GTEFHX0FDQ1VSQVRFKSwKLSAgICAgICAgICAgIEdTVF9TRUVLX1RZUEVf U0VULCBzdGFydFRpbWUsIEdTVF9TRUVLX1RZUEVfU0VULCBlbmRUaW1lKSkgeworICAgICAgICBp ZiAoIWRvU2VlayhjbG9ja1RpbWUsIG1fcGxheWVyLT5yYXRlKCksIHN0YXRpY19jYXN0PEdzdFNl ZWtGbGFncz4oR1NUX1NFRUtfRkxBR19GTFVTSCB8IEdTVF9TRUVLX0ZMQUdfQUNDVVJBVEUpKSkg ewogICAgICAgICAgICAgTE9HX01FRElBX01FU1NBR0UoIltTZWVrXSBzZWVraW5nIHRvICVmIGZh aWxlZCIsIHRpbWUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC02MjEsNiAr NjExLDI3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZWVrKGZsb2F0IHRp bWUpCiAgICAgbV9pc0VuZFJlYWNoZWQgPSBmYWxzZTsKIH0KIAorYm9vbCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmRvU2VlayhnaW50NjQgcG9zaXRpb24sIGZsb2F0IHJhdGUsIEdzdFNl ZWtGbGFncyBzZWVrVHlwZSkKK3sKKyAgICBnaW50NjQgc3RhcnRUaW1lLCBlbmRUaW1lOworCisg ICAgaWYgKHJhdGUgPiAwKSB7CisgICAgICAgIHN0YXJ0VGltZSA9IHBvc2l0aW9uOworICAgICAg ICBlbmRUaW1lID0gR1NUX0NMT0NLX1RJTUVfTk9ORTsKKyAgICB9IGVsc2UgeworICAgICAgICBz dGFydFRpbWUgPSAwOworICAgICAgICAvLyBJZiB3ZSBhcmUgYXQgYmVnaW5uaW5nIG9mIG1lZGlh LCBzdGFydCBmcm9tIHRoZSBlbmQgdG8KKyAgICAgICAgLy8gYXZvaWQgaW1tZWRpYXRlIEVPUy4K KyAgICAgICAgaWYgKHBvc2l0aW9uIDwgMCkKKyAgICAgICAgICAgIGVuZFRpbWUgPSBzdGF0aWNf Y2FzdDxnaW50NjQ+KGR1cmF0aW9uKCkgKiBHU1RfU0VDT05EKTsKKyAgICAgICAgZWxzZQorICAg ICAgICAgICAgZW5kVGltZSA9IHBvc2l0aW9uOworICAgIH0KKworICAgIHJldHVybiBnc3RfZWxl bWVudF9zZWVrKG1fcGxheUJpbi5nZXQoKSwgcmF0ZSwgR1NUX0ZPUk1BVF9USU1FLCBzZWVrVHlw ZSwKKyAgICAgICAgR1NUX1NFRUtfVFlQRV9TRVQsIHN0YXJ0VGltZSwgR1NUX1NFRUtfVFlQRV9T RVQsIGVuZFRpbWUpOworfQorCiBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGF1 c2VkKCkgY29uc3QKIHsKICAgICBpZiAobV9pc0VuZFJlYWNoZWQpIHsKQEAgLTg0Miw4ICs4NTMs NiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UmF0ZShmbG9hdCByYXRl KQogICAgIH0KIAogICAgIGZsb2F0IGN1cnJlbnRQb3NpdGlvbiA9IHN0YXRpY19jYXN0PGZsb2F0 PihwbGF5YmFja1Bvc2l0aW9uKCkgKiBHU1RfU0VDT05EKTsKLSAgICBHc3RTZWVrRmxhZ3MgZmxh Z3MgPSAoR3N0U2Vla0ZsYWdzKShHU1RfU0VFS19GTEFHX0ZMVVNIKTsKLSAgICBnaW50NjQgc3Rh cnQsIGVuZDsKICAgICBib29sIG11dGUgPSBmYWxzZTsKIAogICAgIElORk9fTUVESUFfTUVTU0FH RSgiU2V0IFJhdGUgdG8gJWYiLCByYXRlKTsKQEAgLTg1MSwyNSArODYwLDE1IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRSYXRlKGZsb2F0IHJhdGUpCiAgICAgICAgIC8v IE11dGUgdGhlIHNvdW5kIGlmIHRoZSBwbGF5YmFjayByYXRlIGlzIHRvbyBleHRyZW1lIGFuZAog ICAgICAgICAvLyBhdWRpbyBwaXRjaCBpcyBub3QgYWRqdXN0ZWQuCiAgICAgICAgIG11dGUgPSAo IW1fcHJlc2VydmVzUGl0Y2ggJiYgKHJhdGUgPCAwLjggfHwgcmF0ZSA+IDIpKTsKLSAgICAgICAg c3RhcnQgPSBjdXJyZW50UG9zaXRpb247Ci0gICAgICAgIGVuZCA9IEdTVF9DTE9DS19USU1FX05P TkU7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgc3RhcnQgPSAwOworICAgICAgICBpZiAoY3VycmVu dFBvc2l0aW9uID09IDAuMGYpCisgICAgICAgICAgICBjdXJyZW50UG9zaXRpb24gPSAtMS4wZjsK ICAgICAgICAgbXV0ZSA9IHRydWU7Ci0KLSAgICAgICAgLy8gSWYgd2UgYXJlIGF0IGJlZ2lubmlu ZyBvZiBtZWRpYSwgc3RhcnQgZnJvbSB0aGUgZW5kIHRvCi0gICAgICAgIC8vIGF2b2lkIGltbWVk aWF0ZSBFT1MuCi0gICAgICAgIGlmIChjdXJyZW50UG9zaXRpb24gPD0gMCkKLSAgICAgICAgICAg IGVuZCA9IHN0YXRpY19jYXN0PGdpbnQ2ND4oZHVyYXRpb24oKSAqIEdTVF9TRUNPTkQpOwotICAg ICAgICBlbHNlCi0gICAgICAgICAgICBlbmQgPSBjdXJyZW50UG9zaXRpb247CiAgICAgfQogCiAg ICAgSU5GT19NRURJQV9NRVNTQUdFKCJOZWVkIHRvIG11dGUgYXVkaW8/OiAlZCIsIChpbnQpIG11 dGUpOwogCi0gICAgaWYgKCFnc3RfZWxlbWVudF9zZWVrKG1fcGxheUJpbi5nZXQoKSwgcmF0ZSwg R1NUX0ZPUk1BVF9USU1FLCBmbGFncywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgR1NUX1NF RUtfVFlQRV9TRVQsIHN0YXJ0LAotICAgICAgICAgICAgICAgICAgICAgICAgICBHU1RfU0VFS19U WVBFX1NFVCwgZW5kKSkKKyAgICBpZiAoIWRvU2VlayhjdXJyZW50UG9zaXRpb24sIHJhdGUsIHN0 YXRpY19jYXN0PEdzdFNlZWtGbGFncz4oR1NUX1NFRUtfRkxBR19GTFVTSCkpKQogICAgICAgICBF UlJPUl9NRURJQV9NRVNTQUdFKCJTZXQgcmF0ZSB0byAlZiBmYWlsZWQiLCByYXRlKTsKICAgICBl bHNlCiAgICAgICAgIGdfb2JqZWN0X3NldChtX3BsYXlCaW4uZ2V0KCksICJtdXRlIiwgbXV0ZSwg TlVMTCk7CkBAIC0xNDU3LDggKzE0NTYsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6dXBkYXRlU3RhdGVzKCkKICAgICBpZiAobV9zZWVrSXNQZW5kaW5nICYmIGdldFN0YXRl UmVzdWx0ID09IEdTVF9TVEFURV9DSEFOR0VfU1VDQ0VTUyAmJiAoc3RhdGUgPT0gR1NUX1NUQVRF X1BBVVNFRCB8fCBzdGF0ZSA9PSBHU1RfU1RBVEVfUExBWUlORykpIHsKICAgICAgICAgTE9HX01F RElBX01FU1NBR0UoIltTZWVrXSBjb21taXR0aW5nIHBlbmRpbmcgc2VlayB0byAlZiIsIG1fc2Vl a1RpbWUpOwogICAgICAgICBtX3NlZWtJc1BlbmRpbmcgPSBmYWxzZTsKLSAgICAgICAgbV9zZWVr aW5nID0gZ3N0X2VsZW1lbnRfc2VlayhtX3BsYXlCaW4uZ2V0KCksIG1fcGxheWVyLT5yYXRlKCks IEdTVF9GT1JNQVRfVElNRSwgc3RhdGljX2Nhc3Q8R3N0U2Vla0ZsYWdzPihHU1RfU0VFS19GTEFH X0ZMVVNIIHwgR1NUX1NFRUtfRkxBR19BQ0NVUkFURSksCi0gICAgICAgICAgICBHU1RfU0VFS19U WVBFX1NFVCwgdG9Hc3RDbG9ja1RpbWUobV9zZWVrVGltZSksIEdTVF9TRUVLX1RZUEVfTk9ORSwg R1NUX0NMT0NLX1RJTUVfTk9ORSk7CisgICAgICAgIG1fc2Vla2luZyA9IGRvU2Vlayh0b0dzdENs b2NrVGltZShtX3NlZWtUaW1lKSwgbV9wbGF5ZXItPnJhdGUoKSwgc3RhdGljX2Nhc3Q8R3N0U2Vl a0ZsYWdzPihHU1RfU0VFS19GTEFHX0ZMVVNIIHwgR1NUX1NFRUtfRkxBR19BQ0NVUkFURSkpOwog ICAgICAgICBpZiAoIW1fc2Vla2luZykKICAgICAgICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJb U2Vla10gc2Vla2luZyB0byAlZiBmYWlsZWQiLCBtX3NlZWtUaW1lKTsKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXggNjc3YTlkYS4uN2Y0 MGM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaApA QCAtMTQ2LDYgKzE0Niw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwcm9jZXNzVGFibGVPZkNvbnRl bnRzKEdzdE1lc3NhZ2UqKTsKICAgICB2b2lkIHByb2Nlc3NUYWJsZU9mQ29udGVudHNFbnRyeShH c3RUb2NFbnRyeSosIEdzdFRvY0VudHJ5KiBwYXJlbnQpOwogI2VuZGlmCisgICAgYm9vbCBkb1Nl ZWsoZ2ludDY0IHBvc2l0aW9uLCBmbG9hdCByYXRlLCBHc3RTZWVrRmxhZ3Mgc2Vla1R5cGUpOwor CiAKICAgICB2aXJ0dWFsIFN0cmluZyBlbmdpbmVEZXNjcmlwdGlvbigpIGNvbnN0IHsgcmV0dXJu ICJHU3RyZWFtZXIiOyB9CiAgICAgdmlydHVhbCBib29sIGlzTGl2ZVN0cmVhbSgpIGNvbnN0IHsg cmV0dXJuIG1faXNTdHJlYW1pbmc7IH0K