237677 2022-03-09 14:36:12 -0800 MediaSampleCursor should iterate over the samples contained in the MediaSamplesBlock 2022-03-10 14:01:29 -0800 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 237594 236754 1 jean-yves.avenard jean-yves.avenard eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1849849 0 jean-yves.avenard 2022-03-09 14:36:12 -0800 Sub-task of bug 236754. In bug 237594; the MediaFormatReader was made to use MediaSamplesBlock as backend via MediaSampleRangeRequest's refactor. However, it only ever uses the last sample of the block, which is okay for now as there's no producer that create MediaSamplesBlock with more than one sample in it. However, the resolution for bug 236754 will change that pre-requisite. So we need the MediaSampleCursor to properly iterate over all the samples contained in the block. 1849850 1 webkit-bug-importer 2022-03-09 14:36:50 -0800 <rdar://problem/90058029> 1849972 2 454317 jean-yves.avenard 2022-03-09 22:37:19 -0800 Created attachment 454317 Patch 1850238 3 ews-feeder 2022-03-10 14:01:26 -0800 Committed r291132 (248292@main): <https://commits.webkit.org/248292@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454317. 454317 2022-03-09 22:37:19 -0800 2022-03-10 14:01:28 -0800 Patch bug-237677-20220310173717.patch text/plain 15298 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM5Y2U0MjFlZmY0Y2I1OTc5 MGY1ZWRkNGQ2Zjg0MDI4Njg1Y2Q0NDMuLmRhZTg4M2NhMjNiNWRjNmQzMTE2YWE1MzUzMTIwYzZh ZTYzNjBiMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMjItMDMtMDkgIEplYW4tWXZl cyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVNhbXBsZUN1cnNvciBz aG91bGQgaXRlcmF0ZSBvdmVyIHRoZSBzYW1wbGVzIGNvbnRhaW5lZCBpbiB0aGUgTWVkaWFTYW1w bGVzQmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNzY3NworICAgICAgICByZGFyOi8vODA4NjkwNDEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gb2JzZXJ2YWJsZSBiZWhhdmlv dXIgZm9yIG5vdywgYXMgdGhlIGN1cnJlbnQgY29kZSBjYW4ndAorICAgICAgICBwcm9kdWNlIE1l ZGlhU2FtcGxlc0Jsb2NrIHdpdGggbW9yZSB0aGFuIG9uZSBzdWItc2FtcGxlLgorICAgICAgICBU ZXN0cyB3aWxsIGJlIGFkZGVkIGluIGJ1ZyAyMzY3NTQuCisKKyAgICAgICAgKiBTaGFyZWQvbWFj L01lZGlhRm9ybWF0UmVhZGVyL01lZGlhU2FtcGxlQnl0ZVJhbmdlLmg6CisgICAgICAgICogU2hh cmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9NZWRpYVNhbXBsZUN1cnNvci5jcHA6CisgICAgICAg IChXZWJLaXQ6OnN0ZXBJdGVyYXRvcik6CisgICAgICAgIChXZWJLaXQ6Ok1lZGlhU2FtcGxlQ3Vy c29yOjpNZWRpYVNhbXBsZUN1cnNvcik6CisgICAgICAgIChXZWJLaXQ6Ok1lZGlhU2FtcGxlQ3Vy c29yOjpsb2NhdGVJdGVyYXRvciBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6Ok1lZGlhU2FtcGxl Q3Vyc29yOjpzZXRMb2NhdG9yIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6TWVkaWFTYW1wbGVD dXJzb3I6OmxvY2F0ZU1lZGlhU2FtcGxlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6TWVkaWFT YW1wbGVDdXJzb3I6OmxvY2F0ZVRpbWluZyBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6Ok1lZGlh U2FtcGxlQ3Vyc29yOjpzdGVwSW5PcmRlcmVkTWFwKToKKyAgICAgICAgKFdlYktpdDo6TWVkaWFT YW1wbGVDdXJzb3I6OnN0ZXBJblByZXNlbnRhdGlvblRpbWUpOgorICAgICAgICAoV2ViS2l0OjpN ZWRpYVNhbXBsZUN1cnNvcjo6Z2V0TWVkaWFTYW1wbGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0 OjpNZWRpYVNhbXBsZUN1cnNvcjo6Z2V0U3luY0luZm8gY29uc3QpOgorICAgICAgICAoV2ViS2l0 OjpNZWRpYVNhbXBsZUN1cnNvcjo6Y29weUZvcm1hdERlc2NyaXB0aW9uIGNvbnN0KToKKyAgICAg ICAgKFdlYktpdDo6TWVkaWFTYW1wbGVDdXJzb3I6OmNvcHlTYW1wbGVMb2NhdGlvbiBjb25zdCk6 CisgICAgICAgICogU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9NZWRpYVNhbXBsZUN1cnNv ci5oOiBUaGUgTG9jYXRvciB0eXBlIGFuZAorICAgICAgICB0aGUgdGVtcGxhdGVkIGNvZGUgbWFr aW5nIHVzZSBvZiBpdCBtYWtlcyB1c2Ugb2Ygc3Ryb25nIGFzc3VtcHRpb25zIHRoYXQKKyAgICAg ICAgdGhlIGl0ZXJhdG9yIGNhbiBvbmx5IGJlIG1hZGUgb2Ygb25lIHR5cGUgb3IgdGhlIG90aGVy LgorICAgICAgICBBcyBzdWNoLCB0aGUgb3JpZ2luYWxseSBvYnZpb3VzIHNvbHV0aW9uIHRvIGV4 cGFuZCB0aGUgTG9jYXRvciB0eXBlIHdpdGgKKyAgICAgICAgYSBNZWRpYVNhbXBsZXNCbG9jayBp dGVyYXRvciBlbmRlZCB1cCBiZWluZyBvdmVybHkgY29tcGxleC4KKyAgICAgICAgU28gaW5zdGVh ZCB3ZSBkZWZpbmUgYW4gYWRkaXRpb25hbCBtZW1iZXIgbV9jdXJyZW50RW50cnkKKyAgICAgICAg YW5kIHdpbGwgYWRkIGFsbCB0aGUgbG9naWMgaGFuZGxpbmcgaW4gdGhlIHN0ZXBJdGVyYXRvciBt ZXRob2QuCisgICAgICAgIEl0IHNob3VsZCBiZSBub3RlZCB0aGF0IHdoaWxlIHRoZSBNZWRpYVNh bXBsZUN1cnNvciBpbXBsZW1lbnRzIGFsbCB0aGUKKyAgICAgICAgbWV0aG9kcyBvZiBNVFBsdWdp blNhbXBsZUN1cnNvcjsgaW4gcHJhY3RpY2Ugb25seSB0aGUgZm9sbG93aW5nIGFwcGVhciB1c2Vk OgorICAgICAgICAtIHN0ZXBJbkRlY29kZU9yZGVyQW5kUmVwb3J0U3RlcHNUYWtlbgorICAgICAg ICAtIGdldFNhbXBsZVRpbWluZworICAgICAgICAtIGdldFN5bmNJbmZvCisgICAgICAgIC0gY29w eUZvcm1hdERlc2NyaXB0aW9uCisKIDIwMjItMDMtMDggIEplYW4tWXZlcyBBdmVuYXJkICA8anlh QGFwcGxlLmNvbT4KIAogICAgICAgICBIYXZlIE1lZGlhRm9ybWF0UmVhZGVyIHBsdWdpbiB1c2Ug V2ViTVBhcnNlciBkaXJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFj L01lZGlhRm9ybWF0UmVhZGVyL01lZGlhU2FtcGxlQnl0ZVJhbmdlLmggYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvTWVkaWFTYW1wbGVCeXRlUmFuZ2UuaAppbmRl eCBhNGIxNzQ2NTAxYWI4YmUxYzc1ZWI5ZjYwYmNkNjU1NTA2NGY3Yzc5Li40NDRhZWY1OTI3ZjAw NDIzM2NjM2M3ZjdiMmUzMGFkMjBmZmViNzgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvTWVkaWFTYW1wbGVCeXRlUmFuZ2UuaAorKysgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvTWVkaWFTYW1wbGVCeXRl UmFuZ2UuaApAQCAtNTMsNiArNTMsMTAgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGltZXN0YW1w cyhjb25zdCBNZWRpYVRpbWUmLCBjb25zdCBNZWRpYVRpbWUmKSBmaW5hbDsKICAgICBSZWY8TWVk aWFTYW1wbGU+IGNyZWF0ZU5vbkRpc3BsYXlpbmdDb3B5KCkgY29uc3QgZmluYWwgeyByZXR1cm4g KmNvbnN0X2Nhc3Q8TWVkaWFTYW1wbGVCeXRlUmFuZ2UqPih0aGlzKTsgfQogCisgICAgdXNpbmcg Y29uc3RfaXRlcmF0b3IgPSBXZWJDb3JlOjpNZWRpYVNhbXBsZXNCbG9jazo6U2FtcGxlc1ZlY3Rv cjo6Y29uc3RfaXRlcmF0b3I7CisgICAgY29uc3RfaXRlcmF0b3IgYmVnaW4oKSBjb25zdCB7IHJl dHVybiBtX2Jsb2NrLmJlZ2luKCk7IH0KKyAgICBjb25zdF9pdGVyYXRvciBlbmQoKSBjb25zdCB7 IHJldHVybiBtX2Jsb2NrLmVuZCgpOyB9CisKIHByaXZhdGU6CiAgICAgTWVkaWFTYW1wbGVCeXRl UmFuZ2UoV2ViQ29yZTo6TWVkaWFTYW1wbGVzQmxvY2smJiwgTVRQbHVnaW5CeXRlU291cmNlUmVm KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01lZGlhRm9ybWF0UmVh ZGVyL01lZGlhU2FtcGxlQ3Vyc29yLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9NZWRp YUZvcm1hdFJlYWRlci9NZWRpYVNhbXBsZUN1cnNvci5jcHAKaW5kZXggZmM5ZGU3ZjU2NWJjYzRh YTdkMjU5Yzc5ZTlmOTc3NTU5MzMwOGZhNi4uNzg2MWVhZDNjNjExM2UyOWJhYWQwNTkzZTExZTIz ODk5YjI4YjAzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01lZGlhRm9y bWF0UmVhZGVyL01lZGlhU2FtcGxlQ3Vyc29yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvTWVkaWFTYW1wbGVDdXJzb3IuY3BwCkBAIC03OSwxMyAr NzksMzEgQEAgc3RhdGljIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWFwOjppdGVyYXRvciB1cHBl ckJvdW5kKFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWEKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUg T3JkZXJlZE1hcD4KLXN0YXRpYyBpbnQ2NF90IHN0ZXBJdGVyYXRvcihpbnQ2NF90IHN0ZXBzUmVt YWluaW5nLCB0eXBlbmFtZSBPcmRlcmVkTWFwOjppdGVyYXRvciYgaXRlcmF0b3IsIE9yZGVyZWRN YXAmIHNhbXBsZXMpCitzdGF0aWMgaW50NjRfdCBzdGVwSXRlcmF0b3IoaW50NjRfdCBzdGVwc1Jl bWFpbmluZywgdHlwZW5hbWUgT3JkZXJlZE1hcDo6aXRlcmF0b3ImIGl0ZXJhdG9yLCBNZWRpYVNh bXBsZUJ5dGVSYW5nZTo6Y29uc3RfaXRlcmF0b3ImIGlubmVySXRlcmF0b3IsIE9yZGVyZWRNYXAm IHNhbXBsZXMpCiB7CiAgICAgQVNTRVJUKGl0ZXJhdG9yICE9IHNhbXBsZXMuZW5kKCkpOwotICAg IGlmIChzdGVwc1JlbWFpbmluZyA8IDApCi0gICAgICAgIGZvciAoOyBzdGVwc1JlbWFpbmluZyAm JiBpdGVyYXRvciAhPSBzYW1wbGVzLmJlZ2luKCk7ICsrc3RlcHNSZW1haW5pbmcsIC0taXRlcmF0 b3IpIHsgfQotICAgIGVsc2UKLSAgICAgICAgZm9yIChhdXRvIG5leHQgPSBzdGQ6Om5leHQoaXRl cmF0b3IpOyBzdGVwc1JlbWFpbmluZyAmJiBuZXh0ICE9IHNhbXBsZXMuZW5kKCk7IC0tc3RlcHNS ZW1haW5pbmcsIGl0ZXJhdG9yID0gbmV4dCsrKSB7IH0KKyAgICBpZiAoc3RlcHNSZW1haW5pbmcg PCAwKSB7CisgICAgICAgIGZvciAoOyBzdGVwc1JlbWFpbmluZyAmJiBpdGVyYXRvciAhPSBzYW1w bGVzLmJlZ2luKCk7ICsrc3RlcHNSZW1haW5pbmcpIHsKKyAgICAgICAgICAgIGlmIChpbm5lckl0 ZXJhdG9yID09IHN0YXRpY19jYXN0PE1lZGlhU2FtcGxlQnl0ZVJhbmdlKj4oaXRlcmF0b3ItPnNl Y29uZC5nZXQoKSktPmJlZ2luKCkpIHsKKyAgICAgICAgICAgICAgICAtLWl0ZXJhdG9yOworICAg ICAgICAgICAgICAgIGlubmVySXRlcmF0b3IgPSBzdGF0aWNfY2FzdDxNZWRpYVNhbXBsZUJ5dGVS YW5nZSo+KGl0ZXJhdG9yLT5zZWNvbmQuZ2V0KCkpLT5lbmQoKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIC0taW5uZXJJdGVyYXRvcjsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gc3Rl cHNSZW1haW5pbmc7CisgICAgfQorICAgIHdoaWxlIChzdGVwc1JlbWFpbmluZykgeworICAgICAg ICBhdXRvIGxhc3RJbm5lciA9IHN0YXRpY19jYXN0PE1lZGlhU2FtcGxlQnl0ZVJhbmdlKj4oaXRl cmF0b3ItPnNlY29uZC5nZXQoKSktPmVuZCgpOworICAgICAgICBmb3IgKGF1dG8gbmV4dElubmVy ID0gc3RkOjpuZXh0KGlubmVySXRlcmF0b3IpOyBzdGVwc1JlbWFpbmluZyAmJiBuZXh0SW5uZXIg IT0gbGFzdElubmVyOyAtLXN0ZXBzUmVtYWluaW5nLCBpbm5lckl0ZXJhdG9yID0gbmV4dElubmVy KyspIHsgfQorICAgICAgICBpZiAoIXN0ZXBzUmVtYWluaW5nKQorICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGF1dG8gbmV4dCA9IHN0ZDo6bmV4dChpdGVyYXRvcik7CisgICAgICAgIGlmIChu ZXh0ID09IHNhbXBsZXMuZW5kKCkpCisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgaXRlcmF0 b3IgPSBuZXh0OworICAgICAgICBpbm5lckl0ZXJhdG9yID0gc3RhdGljX2Nhc3Q8TWVkaWFTYW1w bGVCeXRlUmFuZ2UqPihpdGVyYXRvci0+c2Vjb25kLmdldCgpKS0+YmVnaW4oKTsKKyAgICAgICAg LS1zdGVwc1JlbWFpbmluZzsKKyAgICB9CiAgICAgcmV0dXJuIHN0ZXBzUmVtYWluaW5nOwogfQog CkBAIC0xMzMsNiArMTUxLDcgQEAgTWVkaWFTYW1wbGVDdXJzb3I6Ok1lZGlhU2FtcGxlQ3Vyc29y KEFsbG9jYXRvciYmIGFsbG9jYXRvciwgY29uc3QgTWVkaWFTYW1wbGVDdXIKICAgICA6IENvcmVN ZWRpYVdyYXBwZWQoV1RGTW92ZShhbGxvY2F0b3IpKQogICAgICwgbV90cmFja1JlYWRlcihjdXJz b3IubV90cmFja1JlYWRlci5jb3B5UmVmKCkpCiAgICAgLCBtX2xvY2F0b3IoY3Vyc29yLm1fbG9j YXRvcikKKyAgICAsIG1fY3VycmVudEVudHJ5KGN1cnNvci5tX2N1cnJlbnRFbnRyeSkKICAgICAs IG1fbG9nZ2VyKGN1cnNvci5tX2xvZ2dlci5jb3B5UmVmKCkpCiAgICAgLCBtX2xvZ0lkZW50aWZp ZXIobV90cmFja1JlYWRlci0+bmV4dFNhbXBsZUN1cnNvckxvZ0lkZW50aWZpZXIoaWRlbnRpZmll cigpKSkKIHsKQEAgLTE0OCwxNSArMTY3LDE1IEBAIHN0ZDo6b3B0aW9uYWw8dHlwZW5hbWUgT3Jk ZXJlZE1hcDo6aXRlcmF0b3I+IE1lZGlhU2FtcGxlQ3Vyc29yOjpsb2NhdGVJdGVyYXRvcihPCiAg ICAgICAgICAgICBhc3NlcnRJc0hlbGQobV9sb2NhdG9yTG9jayk7CiAgICAgICAgICAgICBhdXRv IGl0ZXJhdG9yID0gdXBwZXJCb3VuZChzYW1wbGVzLCBwcmVzZW50YXRpb25UaW1lKTsKICAgICAg ICAgICAgIGlmIChpdGVyYXRvciA9PSBzYW1wbGVzLmJlZ2luKCkpCi0gICAgICAgICAgICAgICAg bV9sb2NhdG9yID0gV1RGTW92ZShpdGVyYXRvcik7CisgICAgICAgICAgICAgICAgc2V0TG9jYXRv cihXVEZNb3ZlKGl0ZXJhdG9yKSk7CiAgICAgICAgICAgICBlbHNlIGlmIChoYXNBbGxTYW1wbGVz IHx8IGl0ZXJhdG9yICE9IHNhbXBsZXMuZW5kKCkpCi0gICAgICAgICAgICAgICAgbV9sb2NhdG9y ID0gc3RkOjpwcmV2KGl0ZXJhdG9yKTsKKyAgICAgICAgICAgICAgICBzZXRMb2NhdG9yKHN0ZDo6 cHJldihpdGVyYXRvcikpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHJldHVy biBzdGQ6Om51bGxvcHQ7CiAgICAgICAgICAgICByZXR1cm4gbG9jYXRlSXRlcmF0b3Ioc2FtcGxl cywgaGFzQWxsU2FtcGxlcyk7CiAgICAgICAgIH0sIFsmXShjb25zdCBhdXRvJiBvdGhlckl0ZXJh dG9yKSAtPiBzdGQ6Om9wdGlvbmFsPEl0ZXJhdG9yPiB7CiAgICAgICAgICAgICBhc3NlcnRJc0hl bGQobV9sb2NhdG9yTG9jayk7Ci0gICAgICAgICAgICBtX2xvY2F0b3IgPSBvdGhlckl0ZXJhdG9y LT5zZWNvbmQtPnByZXNlbnRhdGlvblRpbWUoKTsKKyAgICAgICAgICAgIHNldExvY2F0b3Iob3Ro ZXJJdGVyYXRvci0+c2Vjb25kLT5wcmVzZW50YXRpb25UaW1lKCkpOwogICAgICAgICAgICAgcmV0 dXJuIGxvY2F0ZUl0ZXJhdG9yKHNhbXBsZXMsIGhhc0FsbFNhbXBsZXMpOwogICAgICAgICB9LCBb Jl0oY29uc3QgSXRlcmF0b3ImIGl0ZXJhdG9yKSAtPiBzdGQ6Om9wdGlvbmFsPEl0ZXJhdG9yPiB7 CiAgICAgICAgICAgICByZXR1cm4gaXRlcmF0b3I7CkBAIC0xNjQsMTkgKzE4MywzOSBAQCBzdGQ6 Om9wdGlvbmFsPHR5cGVuYW1lIE9yZGVyZWRNYXA6Oml0ZXJhdG9yPiBNZWRpYVNhbXBsZUN1cnNv cjo6bG9jYXRlSXRlcmF0b3IoTwogICAgICk7CiB9CiAKLU1lZGlhU2FtcGxlKiBNZWRpYVNhbXBs ZUN1cnNvcjo6bG9jYXRlTWVkaWFTYW1wbGUoU2FtcGxlTWFwJiBzYW1wbGVzLCBib29sIGhhc0Fs bFNhbXBsZXMpIGNvbnN0Cit2b2lkIE1lZGlhU2FtcGxlQ3Vyc29yOjpzZXRMb2NhdG9yKExvY2F0 b3ImJiBsb2NhdG9yKSBjb25zdAoreworICAgIEFTU0VSVChtX2xvY2F0b3JMb2NrLmlzTG9ja2Vk KCkpOworICAgIGlmIChsb2NhdG9yID09IG1fbG9jYXRvcikKKyAgICAgICAgcmV0dXJuOworICAg IG1fbG9jYXRvciA9IFdURk1vdmUobG9jYXRvcik7CisgICAgV1RGOjpzd2l0Y2hPbihtX2xvY2F0 b3IsCisgICAgICAgIFsmXShjb25zdCBNZWRpYVRpbWUmKSB7CisgICAgICAgICAgICBhc3NlcnRJ c0hlbGQobV9sb2NhdG9yTG9jayk7CisgICAgICAgICAgICBtX2N1cnJlbnRFbnRyeS5yZXNldCgp OworICAgICAgICB9LCBbJl0oY29uc3QgYXV0byYgbG9jYXRvcikgeworICAgICAgICAgICAgYXNz ZXJ0SXNIZWxkKG1fbG9jYXRvckxvY2spOworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfV0lU SF9TRUNVUklUWV9JTVBMSUNBVElPTihsb2NhdG9yLT5zZWNvbmQtPnBsYXRmb3JtU2FtcGxlKCku dHlwZSA9PSBQbGF0Zm9ybVNhbXBsZTo6Qnl0ZVJhbmdlU2FtcGxlVHlwZSk7CisgICAgICAgICAg ICBtX2N1cnJlbnRFbnRyeSA9IHN0YXRpY19jYXN0PGNvbnN0IE1lZGlhU2FtcGxlQnl0ZVJhbmdl Kj4obG9jYXRvci0+c2Vjb25kLmdldCgpKS0+YmVnaW4oKTsKKyAgICAgICAgfQorICAgICk7Cit9 CisKK01lZGlhU2FtcGxlQ3Vyc29yOjpTYW1wbGVUeXBlIE1lZGlhU2FtcGxlQ3Vyc29yOjpsb2Nh dGVNZWRpYVNhbXBsZShTYW1wbGVNYXAmIHNhbXBsZXMsIGJvb2wgaGFzQWxsU2FtcGxlcykgY29u c3QKIHsKICAgICBBU1NFUlQobV9sb2NhdG9yTG9jay5pc0xvY2tlZCgpKTsKICAgICByZXR1cm4g V1RGOjpzd2l0Y2hPbihtX2xvY2F0b3IsCi0gICAgICAgIFsmXShjb25zdCBNZWRpYVRpbWUmKSAt PiBNZWRpYVNhbXBsZSogeworICAgICAgICBbJl0oY29uc3QgTWVkaWFUaW1lJikgLT4gU2FtcGxl VHlwZSB7CiAgICAgICAgICAgICBhc3NlcnRJc0hlbGQobV9sb2NhdG9yTG9jayk7CiAgICAgICAg ICAgICBhdXRvIGl0ZXJhdG9yID0gbG9jYXRlSXRlcmF0b3Ioc2FtcGxlcy5wcmVzZW50YXRpb25P cmRlcigpLCBoYXNBbGxTYW1wbGVzKTsKICAgICAgICAgICAgIGlmICghaXRlcmF0b3IpCi0gICAg ICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6 bnVsbG9wdDsKICAgICAgICAgICAgIHJldHVybiBsb2NhdGVNZWRpYVNhbXBsZShzYW1wbGVzLCBo YXNBbGxTYW1wbGVzKTsKICAgICAgICAgfSwKICAgICAgICAgWyZdKGNvbnN0IGF1dG8mIGl0ZXJh dG9yKSB7Ci0gICAgICAgICAgICByZXR1cm4gaXRlcmF0b3ItPnNlY29uZC5nZXQoKTsKKyAgICAg ICAgICAgIGFzc2VydElzSGVsZChtX2xvY2F0b3JMb2NrKTsKKyAgICAgICAgICAgIEFTU0VSVCht X2N1cnJlbnRFbnRyeS5oYXNfdmFsdWUoKSk7CisgICAgICAgICAgICByZXR1cm4gU2FtcGxlVHlw ZSB7IHN0ZDo6aW5fcGxhY2UsIGl0ZXJhdG9yLT5zZWNvbmQuZ2V0KCksIG1fY3VycmVudEVudHJ5 LnZhbHVlKCkgfTsKICAgICAgICAgfQogICAgICk7CiB9CkBAIC0xOTcsMTAgKzIzNiwxMyBAQCBN ZWRpYVNhbXBsZUN1cnNvcjo6VGltaW5nIE1lZGlhU2FtcGxlQ3Vyc29yOjpsb2NhdGVUaW1pbmco U2FtcGxlTWFwJiBzYW1wbGVzLCBibwogICAgICAgICAgICAgfTsKICAgICAgICAgfSwKICAgICAg ICAgWyZdKGNvbnN0IGF1dG8mIGl0ZXJhdG9yKSB7CisgICAgICAgICAgICBhc3NlcnRJc0hlbGQo bV9sb2NhdG9yTG9jayk7CisgICAgICAgICAgICBBU1NFUlQobV9jdXJyZW50RW50cnkuaGFzX3Zh bHVlKCkpOworICAgICAgICAgICAgYXV0byogZW50cnkgPSAqbV9jdXJyZW50RW50cnk7CiAgICAg ICAgICAgICByZXR1cm4gVGltaW5nIHsKLSAgICAgICAgICAgICAgICBpdGVyYXRvci0+c2Vjb25k LT5kZWNvZGVUaW1lKCksCi0gICAgICAgICAgICAgICAgaXRlcmF0b3ItPnNlY29uZC0+cHJlc2Vu dGF0aW9uVGltZSgpLAotICAgICAgICAgICAgICAgIGl0ZXJhdG9yLT5zZWNvbmQtPmR1cmF0aW9u KCksCisgICAgICAgICAgICAgICAgZW50cnktPmRlY29kZVRpbWUsCisgICAgICAgICAgICAgICAg ZW50cnktPnByZXNlbnRhdGlvblRpbWUsCisgICAgICAgICAgICAgICAgZW50cnktPmR1cmF0aW9u LAogICAgICAgICAgICAgfTsKICAgICAgICAgfQogICAgICk7CkBAIC0yMTMsOCArMjU1LDExIEBA IE9TU3RhdHVzIE1lZGlhU2FtcGxlQ3Vyc29yOjpzdGVwSW5PcmRlcmVkTWFwKGludDY0X3Qgc3Rl cHNUb1Rha2UsIGludDY0X3QmIHN0ZXBzCiAgICAgICAgIGFzc2VydElzSGVsZChtX2xvY2F0b3JM b2NrKTsKICAgICAgICAgYXV0byYgb3JkZXJlZE1hcCA9IG9yZGVyZWRTYW1wbGVzPE9yZGVyZWRN YXA+KHNhbXBsZXMpOwogICAgICAgICBpZiAoYXV0byBpdGVyYXRvciA9IGxvY2F0ZUl0ZXJhdG9y KG9yZGVyZWRNYXAsIGhhc0FsbFNhbXBsZXMpKSB7Ci0gICAgICAgICAgICBhdXRvIHN0ZXBzUmVt YWluaW5nID0gc3RlcEl0ZXJhdG9yKHN0ZXBzVG9UYWtlLCAqaXRlcmF0b3IsIG9yZGVyZWRNYXAp OworICAgICAgICAgICAgQVNTRVJUKG1fY3VycmVudEVudHJ5Lmhhc192YWx1ZSgpKTsKKyAgICAg ICAgICAgIGF1dG8gaW5uZXJJdGVyYXRvciA9ICptX2N1cnJlbnRFbnRyeTsKKyAgICAgICAgICAg IGF1dG8gc3RlcHNSZW1haW5pbmcgPSBzdGVwSXRlcmF0b3Ioc3RlcHNUb1Rha2UsICppdGVyYXRv ciwgaW5uZXJJdGVyYXRvciwgb3JkZXJlZE1hcCk7CiAgICAgICAgICAgICBtX2xvY2F0b3IgPSBX VEZNb3ZlKCppdGVyYXRvcik7CisgICAgICAgICAgICBtX2N1cnJlbnRFbnRyeSA9IFdURk1vdmUo aW5uZXJJdGVyYXRvcik7CiAgICAgICAgICAgICBzdGVwc1Rha2VuID0gc3RlcHNUb1Rha2UgLSBz dGVwc1JlbWFpbmluZzsKICAgICAgICAgICAgIHJldHVybiBub0VycjsKICAgICAgICAgfQpAQCAt MjI4LDcgKzI3Myw3IEBAIE9TU3RhdHVzIE1lZGlhU2FtcGxlQ3Vyc29yOjpzdGVwSW5QcmVzZW50 YXRpb25UaW1lKGNvbnN0IE1lZGlhVGltZSYgZGVsdGEsIEJvb2xlCiAgICAgICAgIGFzc2VydElz SGVsZChtX2xvY2F0b3JMb2NrKTsKICAgICAgICAgYXV0byB0aW1pbmcgPSBsb2NhdGVUaW1pbmco c2FtcGxlcywgaGFzQWxsU2FtcGxlcyk7CiAgICAgICAgIHdhc1Bpbm5lZCA9IHN0ZXBUaW1lKGRl bHRhLCB0aW1pbmcucHJlc2VudGF0aW9uVGltZSwgc2FtcGxlcy5wcmVzZW50YXRpb25PcmRlcigp LCBoYXNBbGxTYW1wbGVzLCBtX3RyYWNrUmVhZGVyLT5kdXJhdGlvbigpKTsKLSAgICAgICAgbV9s b2NhdG9yID0gdGltaW5nLnByZXNlbnRhdGlvblRpbWU7CisgICAgICAgIHNldExvY2F0b3IodGlt aW5nLnByZXNlbnRhdGlvblRpbWUpOwogICAgICAgICByZXR1cm4gbm9FcnI7CiAgICAgfSk7CiB9 CkBAIC0yNTUsNyArMzAwLDcgQEAgT1NTdGF0dXMgTWVkaWFTYW1wbGVDdXJzb3I6OmdldE1lZGlh U2FtcGxlKEZ1bmN0aW9uJiYgZnVuY3Rpb24pIGNvbnN0CiAgICAgICAgIGF1dG8gc2FtcGxlID0g bG9jYXRlTWVkaWFTYW1wbGUoc2FtcGxlcywgaGFzQWxsU2FtcGxlcyk7CiAgICAgICAgIGlmICgh c2FtcGxlKQogICAgICAgICAgICAgcmV0dXJuIGtNVFBsdWdpblNhbXBsZUN1cnNvckVycm9yX0xv Y2F0aW9uTm90QXZhaWxhYmxlOwotICAgICAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgInNh bXBsZTogIiwgKnNhbXBsZSk7CisgICAgICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVSLCAic2Ft cGxlOiAiLCAqc2FtcGxlLT5maXJzdCk7CiAgICAgICAgIGZ1bmN0aW9uKCpzYW1wbGUpOwogICAg ICAgICByZXR1cm4gbm9FcnI7CiAgICAgfSk7CkBAIC0zNDksMzEgKzM5NCwzMSBAQCBPU1N0YXR1 cyBNZWRpYVNhbXBsZUN1cnNvcjo6Z2V0U2FtcGxlVGltaW5nKENNU2FtcGxlVGltaW5nSW5mbyog c2FtcGxlVGltaW5nKSBjbwogCiBPU1N0YXR1cyBNZWRpYVNhbXBsZUN1cnNvcjo6Z2V0U3luY0lu Zm8oTVRQbHVnaW5TYW1wbGVDdXJzb3JTeW5jSW5mbyogc3luY0luZm8pIGNvbnN0CiB7Ci0gICAg cmV0dXJuIGdldE1lZGlhU2FtcGxlKFsmXShNZWRpYVNhbXBsZSYgc2FtcGxlKSB7CisgICAgcmV0 dXJuIGdldE1lZGlhU2FtcGxlKFsmXShhdXRvJiBzYW1wbGUpIHsKICAgICAgICAgKnN5bmNJbmZv ID0gewotICAgICAgICAgICAgLmZ1bGxTeW5jID0gc2FtcGxlLmlzU3luYygpCisgICAgICAgICAg ICAuZnVsbFN5bmMgPSAoc2FtcGxlLnNlY29uZC0+ZmxhZ3MgJiBNZWRpYVNhbXBsZTo6SXNTeW5j KSAhPSAwCiAgICAgICAgIH07CiAgICAgfSk7CiB9CiAKIE9TU3RhdHVzIE1lZGlhU2FtcGxlQ3Vy c29yOjpjb3B5Rm9ybWF0RGVzY3JpcHRpb24oQ01Gb3JtYXREZXNjcmlwdGlvblJlZiogZm9ybWF0 RGVzY3JpcHRpb25PdXQpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGdldE1lZGlhU2FtcGxlKFsmXShN ZWRpYVNhbXBsZSYgc2FtcGxlKSB7Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfU0VDVVJJ VFlfSU1QTElDQVRJT04oc2FtcGxlLnBsYXRmb3JtU2FtcGxlKCkudHlwZSA9PSBQbGF0Zm9ybVNh bXBsZTo6Qnl0ZVJhbmdlU2FtcGxlVHlwZSk7Ci0gICAgICAgICpmb3JtYXREZXNjcmlwdGlvbk91 dCA9IGNyZWF0ZUZvcm1hdERlc2NyaXB0aW9uRnJvbVRyYWNrSW5mbyhzYW1wbGUucGxhdGZvcm1T YW1wbGUoKS5zYW1wbGUuYnl0ZVJhbmdlU2FtcGxlLnNlY29uZCkubGVha1JlZigpOworICAgIHJl dHVybiBnZXRNZWRpYVNhbXBsZShbJl0oYXV0byYgc2FtcGxlKSB7CisgICAgICAgIFJFTEVBU0Vf QVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oc2FtcGxlLmZpcnN0LT5wbGF0Zm9ybVNh bXBsZSgpLnR5cGUgPT0gUGxhdGZvcm1TYW1wbGU6OkJ5dGVSYW5nZVNhbXBsZVR5cGUpOworICAg ICAgICAqZm9ybWF0RGVzY3JpcHRpb25PdXQgPSBjcmVhdGVGb3JtYXREZXNjcmlwdGlvbkZyb21U cmFja0luZm8oc2FtcGxlLmZpcnN0LT5wbGF0Zm9ybVNhbXBsZSgpLnNhbXBsZS5ieXRlUmFuZ2VT YW1wbGUuc2Vjb25kKS5sZWFrUmVmKCk7CiAgICAgfSk7CiB9CiAKIE9TU3RhdHVzIE1lZGlhU2Ft cGxlQ3Vyc29yOjpjb3B5U2FtcGxlTG9jYXRpb24oTVRQbHVnaW5TYW1wbGVDdXJzb3JTdG9yYWdl UmFuZ2UqIHN0b3JhZ2VSYW5nZSwgTVRQbHVnaW5CeXRlU291cmNlUmVmKiBieXRlU291cmNlKSBj b25zdAogewotICAgIHJldHVybiBnZXRNZWRpYVNhbXBsZShbJl0oTWVkaWFTYW1wbGUmIHNhbXBs ZSkgewotICAgICAgICBSRUxFQVNFX0FTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKHNh bXBsZS5wbGF0Zm9ybVNhbXBsZSgpLnR5cGUgPT0gUGxhdGZvcm1TYW1wbGU6OkJ5dGVSYW5nZVNh bXBsZVR5cGUpOwotICAgICAgICBhdXRvIGJ5dGVSYW5nZSA9ICpzYW1wbGUuYnl0ZVJhbmdlKCk7 CisgICAgcmV0dXJuIGdldE1lZGlhU2FtcGxlKFsmXShhdXRvJiBzYW1wbGUpIHsKKyAgICAgICAg UkVMRUFTRV9BU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTihzYW1wbGUuZmlyc3QtPnBs YXRmb3JtU2FtcGxlKCkudHlwZSA9PSBQbGF0Zm9ybVNhbXBsZTo6Qnl0ZVJhbmdlU2FtcGxlVHlw ZSk7CisgICAgICAgIGF1dG8mIGJ5dGVSYW5nZSA9IHN0ZDo6Z2V0PE1lZGlhU2FtcGxlOjpCeXRl UmFuZ2U+KHNhbXBsZS5zZWNvbmQtPmRhdGEpOwogICAgICAgICAqc3RvcmFnZVJhbmdlID0gewog ICAgICAgICAgICAgLm9mZnNldCA9IENoZWNrZWRJbnQ2NChieXRlUmFuZ2UuYnl0ZU9mZnNldCks CiAgICAgICAgICAgICAubGVuZ3RoID0gQ2hlY2tlZEludDY0KGJ5dGVSYW5nZS5ieXRlTGVuZ3Ro KSwKICAgICAgICAgfTsKLSAgICAgICAgKmJ5dGVTb3VyY2UgPSByZXRhaW5QdHIoc2FtcGxlLnBs YXRmb3JtU2FtcGxlKCkuc2FtcGxlLmJ5dGVSYW5nZVNhbXBsZS5maXJzdCkubGVha1JlZigpOwor ICAgICAgICAqYnl0ZVNvdXJjZSA9IHJldGFpblB0cihzYW1wbGUuZmlyc3QtPnBsYXRmb3JtU2Ft cGxlKCkuc2FtcGxlLmJ5dGVSYW5nZVNhbXBsZS5maXJzdCkubGVha1JlZigpOwogICAgIH0pOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFk ZXIvTWVkaWFTYW1wbGVDdXJzb3IuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9NZWRpYUZv cm1hdFJlYWRlci9NZWRpYVNhbXBsZUN1cnNvci5oCmluZGV4IDBlZmU3NTQ2YjIyYWEzNWQ0NDgx ZDU2ZTRlZjZlOTAxZmIyZWQ5NGMuLjhlYTJiMmY4YzVmZDE0ZmMyODcyZTQyZGYzN2EyOGU1Y2I2 MTgxOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJl YWRlci9NZWRpYVNhbXBsZUN1cnNvci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9N ZWRpYUZvcm1hdFJlYWRlci9NZWRpYVNhbXBsZUN1cnNvci5oCkBAIC0yOCw2ICsyOCw3IEBACiAj aWYgRU5BQkxFKFdFQk1fRk9STUFUX1JFQURFUikKIAogI2luY2x1ZGUgIkNvcmVNZWRpYVdyYXBw ZWQuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL01lZGlhU2FtcGxlLmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9TYW1wbGVNYXAuaD4KICNpbmNsdWRlIDx2YXJpYW50PgogI2luY2x1ZGUgPHd0Zi9JZGVudGlm aWVkLmg+CkBAIC00MCwxMCArNDEsNiBAQCBuYW1lc3BhY2UgV1RGIHsKIGNsYXNzIExvZ2dlcjsK IH0KIAotbmFtZXNwYWNlIFdlYkNvcmUgewotY2xhc3MgTWVkaWFTYW1wbGU7Ci19OwotCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgTWVkaWFUcmFja1JlYWRlcjsKQEAgLTc0LDcgKzcxLDgg QEAgcHJpdmF0ZToKICAgICBNZWRpYVNhbXBsZUN1cnNvcihBbGxvY2F0b3ImJiwgY29uc3QgTWVk aWFTYW1wbGVDdXJzb3ImKTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIE9yZGVyZWRNYXA+IHN0 ZDo6b3B0aW9uYWw8dHlwZW5hbWUgT3JkZXJlZE1hcDo6aXRlcmF0b3I+IGxvY2F0ZUl0ZXJhdG9y KE9yZGVyZWRNYXAmLCBib29sIGhhc0FsbFNhbXBsZXMpIGNvbnN0IFdURl9SRVFVSVJFU19MT0NL KG1fbG9jYXRvckxvY2spOwotICAgIFdlYkNvcmU6Ok1lZGlhU2FtcGxlKiBsb2NhdGVNZWRpYVNh bXBsZShXZWJDb3JlOjpTYW1wbGVNYXAmLCBib29sIGhhc0FsbFNhbXBsZXMpIGNvbnN0IFdURl9S RVFVSVJFU19MT0NLKG1fbG9jYXRvckxvY2spOworICAgIHVzaW5nIFNhbXBsZVR5cGUgPSBzdGQ6 Om9wdGlvbmFsPHN0ZDo6cGFpcjxjb25zdCBNZWRpYVNhbXBsZSosIGNvbnN0IFdlYkNvcmU6Ok1l ZGlhU2FtcGxlc0Jsb2NrOjpNZWRpYVNhbXBsZUl0ZW0qPj47CisgICAgU2FtcGxlVHlwZSBsb2Nh dGVNZWRpYVNhbXBsZShXZWJDb3JlOjpTYW1wbGVNYXAmLCBib29sIGhhc0FsbFNhbXBsZXMpIGNv bnN0IFdURl9SRVFVSVJFU19MT0NLKG1fbG9jYXRvckxvY2spOwogICAgIFRpbWluZyBsb2NhdGVU aW1pbmcoV2ViQ29yZTo6U2FtcGxlTWFwJiwgYm9vbCBoYXNBbGxTYW1wbGVzKSBjb25zdCBXVEZf UkVRVUlSRVNfTE9DSyhtX2xvY2F0b3JMb2NrKTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEZ1 bmN0aW9uPiBPU1N0YXR1cyBnZXRTYW1wbGVNYXAoRnVuY3Rpb24mJikgY29uc3Q7CkBAIC0xMDYs OCArMTA0LDExIEBAIHByaXZhdGU6CiAgICAgY29uc3Qgdm9pZCogbG9nSWRlbnRpZmllcigpIGNv bnN0IHsgcmV0dXJuIG1fbG9nSWRlbnRpZmllcjsgfQogICAgIFdURkxvZ0NoYW5uZWwmIGxvZ0No YW5uZWwoKSBjb25zdDsKIAorICAgIHZvaWQgc2V0TG9jYXRvcihMb2NhdG9yJiYpIGNvbnN0IFdU Rl9SRVFVSVJFU19MT0NLKG1fbG9jYXRvckxvY2spOworCiAgICAgUmVmPE1lZGlhVHJhY2tSZWFk ZXI+IG1fdHJhY2tSZWFkZXI7CiAgICAgbXV0YWJsZSBMb2NhdG9yIG1fbG9jYXRvciBXVEZfR1VB UkRFRF9CWV9MT0NLKG1fbG9jYXRvckxvY2spOworICAgIG11dGFibGUgc3RkOjpvcHRpb25hbDxN ZWRpYVNhbXBsZUJ5dGVSYW5nZTo6Y29uc3RfaXRlcmF0b3I+IG1fY3VycmVudEVudHJ5IFdURl9H VUFSREVEX0JZX0xPQ0sobV9sb2NhdG9yTG9jayk7CiAgICAgbXV0YWJsZSBMb2NrIG1fbG9jYXRv ckxvY2s7CiAgICAgUmVmPGNvbnN0IFdURjo6TG9nZ2VyPiBtX2xvZ2dlcjsKICAgICBjb25zdCB2 b2lkKiBtX2xvZ0lkZW50aWZpZXI7Cg==