234458 2021-12-17 19:14:28 -0800 Don't pack audio samples with discontinuity together 2021-12-19 17:46:28 -0800 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jean-yves.avenard jean-yves.avenard eric.carlson webkit-bug-importer oldest_to_newest 1825280 0 jean-yves.avenard 2021-12-17 19:14:28 -0800 When playing https://jyavenard.github.io/htmltests/tests/mse_webm/83910012/ at 2s we can hear a "chtook" kind of sound. This stream has a 1ms discontinuity after the first opus packet (20ms), as 2s worth of samples are packed together that discontinuity can be heard at the 2s block boundary. We shouldn't pack samples together if there's a discontinuity between them so that timestamps stay correct. 1825281 1 webkit-bug-importer 2021-12-17 19:14:48 -0800 <rdar://problem/86659914> 1825288 2 447505 jean-yves.avenard 2021-12-17 19:38:45 -0800 Created attachment 447505 Patch 1825365 3 447505 eric.carlson 2021-12-18 12:10:18 -0800 Comment on attachment 447505 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447505&action=review > Source/WebCore/ChangeLog:18 > + So w no longer pack samples with discontinuities so that the frame s/So w/So we/ > Source/WebCore/ChangeLog:23 > + in CoreMedia that insert very audible artifacts when there's a gap between s/insert/inserts/ 1825484 4 447560 jean-yves.avenard 2021-12-19 14:27:20 -0800 Created attachment 447560 Patch address comments 1825485 5 447561 jean-yves.avenard 2021-12-19 14:43:20 -0800 Created attachment 447561 Patch add reviewer name 1825499 6 ews-feeder 2021-12-19 16:04:13 -0800 Committed r287249 (245407@main): <https://commits.webkit.org/245407@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447561. 447505 2021-12-17 19:38:45 -0800 2021-12-19 14:27:15 -0800 Patch bug-234458-20211218143843.patch text/plain 6607 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3OTRhOGMwYTUzMGVh MGUwNWJkODU0ZTk5ZmNhODQwNmYyMWYzYi4uNjlhZDRmZWI3ZjYyZDI3NmMyNzI4NDY3ODBkOWQz MTJkODcwMjU1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTEyLTE3ICBKZWFu LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgcGFjayBhdWRp byBzYW1wbGVzIHdpdGggZGlzY29udGludWl0eSB0b2dldGhlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NDU4CisgICAgICAgIHJkYXI6Ly84NjY1 OTkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNv bWUgd2VibSBjb250ZW50IG1heSBoYXZlIGEgZGF0YSBnYXAgYmV0d2VlbiBmcmFtZXMuIE5vcm1h bGx5IGF1ZGlvIGZyYW1lcworICAgICAgICBhcmUgcGFja2VkIGluIDJzIGJsb2NrLiBXaGVuIHdl IHBhY2sgdGhlIHNhbXBsZXMgd2l0aCBkaXNjb250aW51aXRpZXMsIHRob3NlCisgICAgICAgIGRp c2NvbnRpbnVpdGllcyB3b3VsZCBhbGwgYmUgYWNjdW11bGF0ZWQgYXQgdGhlIDJzIGJvdW5kYXJ5 IHdoaWNoIG1ha2VzIHRoZW0KKyAgICAgICAgbXVjaCBtb3JlIGF1ZGlibGUuCisgICAgICAgIFRo ZSBDTVNhbXBsZUJ1ZmZlckNyZWF0ZVJlYWR5IEFQSSBzaG91bGQgYWxsb3cgdXMgdG8gcGFjayBz YW1wbGVzIHdpdGgKKyAgICAgICAgZGlzY29udGludWl0aWVzIGFzIHdlIGNhbiBnaXZlIGEgdmVj dG9yIG9mIENNU2FtcGxlVGltaW5nSW5mbyB3aXRoIHRoZQorICAgICAgICBleGFjdCBpbmZvcm1h dGlvbiBmb3IgYWxsIHBhY2tldHMuCisgICAgICAgIEhvd2V2ZXIsIHRoaXMgZGF0YSBhcHBlYXJz IHRvIGJlIGlnbm9yZWQgYW5kIHRoZSBkaXNjb250aW51aXRpZXMgaXMgc3RpbGwKKyAgICAgICAg aGVhcmQgYXQgdGhlIDJzIGJvdW5kYXJ5LgorICAgICAgICBTbyB3IG5vIGxvbmdlciBwYWNrIHNh bXBsZXMgd2l0aCBkaXNjb250aW51aXRpZXMgc28gdGhhdCB0aGUgZnJhbWUKKyAgICAgICAgdGlt ZXN0YW1wcyB3aWxsIGJlIG1vcmUgYWNjdXJhdGUgYW5kIG5vIGF1ZGlibGUgYXJ0ZWZhY3RzIGFy ZSBoZWFyZCBvbgorICAgICAgICBzbWFsbCBnYXBzLgorCisgICAgICAgIE1hbnVhbGx5IHRlc3Rl ZCBhbmQgdmVyaWZpZWQgbWFudWFsbHkuIFRoaXMgaXMgZ2V0dGluZyBhcm91bmQgYW4gaXNzdWUK KyAgICAgICAgaW4gQ29yZU1lZGlhIHRoYXQgaW5zZXJ0IHZlcnkgYXVkaWJsZSBhcnRpZmFjdHMg d2hlbiB0aGVyZSdzIGEgZ2FwIGJldHdlZW4KKyAgICAgICAgc2FtcGxlcy4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUGFyc2VyV2ViTTo6QXVkaW9UcmFja0RhdGE6OnJl c2V0Q29tcGxldGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBhcnNlcldlYk06 OkF1ZGlvVHJhY2tEYXRhOjpjb25zdW1lRnJhbWVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlNv dXJjZUJ1ZmZlclBhcnNlcldlYk06OkF1ZGlvVHJhY2tEYXRhOjpjcmVhdGVTYW1wbGVCdWZmZXIp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldl Yk0uaDoKKwogMjAyMS0xMi0xNCAgSmVhbi1ZdmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgog CiAgICAgICAgIFNvdXJjZUJ1ZmZlclBhcnNlciBzaG91bGQgYmUgdXNpbmcgY29udGlndW91cyBT aGFyZWRCdWZmZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAKaW5kZXggZGU2ZGVi ZTJiZDRjYTEzNjA0MGZjMGMzYTQ1ZGM0ZWEzOWY0ODlkMC4uZmJkYTEyOThmNGZkOTdiMzAwZWIz MzRhOGU1YWVkMTY4ODcxOTgyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAK QEAgLTEzOTEsMTMgKzEzOTEsMjMgQEAgdm9pZCBTb3VyY2VCdWZmZXJQYXJzZXJXZWJNOjpWaWRl b1RyYWNrRGF0YTo6Y3JlYXRlU2FtcGxlQnVmZmVyKGNvbnN0IENNVGltZSYgcHIKIHZvaWQgU291 cmNlQnVmZmVyUGFyc2VyV2ViTTo6QXVkaW9UcmFja0RhdGE6OnJlc2V0Q29tcGxldGVkKCkKIHsK ICAgICBtTnVtRnJhbWVzSW5Db21wbGV0ZUJsb2NrID0gMDsKLSAgICBtX3BhY2tldERlc2NyaXB0 aW9ucy5jbGVhcigpOworICAgIG1fcGFja2V0U2l6ZXMuY2xlYXIoKTsKKyAgICBtX3BhY2tldFRp bWluZ3MuY2xlYXIoKTsKICAgICBtX2N1cnJlbnRQYWNrZXRCeXRlT2Zmc2V0ID0gMDsKICAgICBU cmFja0RhdGE6OnJlc2V0Q29tcGxldGVkKCk7CiB9CiAKIHdlYm06OlN0YXR1cyBTb3VyY2VCdWZm ZXJQYXJzZXJXZWJNOjpBdWRpb1RyYWNrRGF0YTo6Y29uc3VtZUZyYW1lRGF0YSh3ZWJtOjpSZWFk ZXImIHJlYWRlciwgY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIHVpbnQ2NF90KiBieXRl c1JlbWFpbmluZywgY29uc3QgQ01UaW1lJiBwcmVzZW50YXRpb25UaW1lLCBpbnQgc2FtcGxlQ291 bnQpCiB7CisgICAgaWYgKG1fcGFja2V0VGltaW5ncy5zaXplKCkpIHsKKyAgICAgICAgYXV0byYg bGFzdFRpbWluZyA9IG1fcGFja2V0VGltaW5ncy5sYXN0KCk7CisgICAgICAgIGlmIChQQUw6OkNN VGltZUNvbXBhcmUoUEFMOjpDTVRpbWVBZGQobGFzdFRpbWluZy5kdXJhdGlvbiwgbGFzdFRpbWlu Zy5wcmVzZW50YXRpb25UaW1lU3RhbXApLCBwcmVzZW50YXRpb25UaW1lKSkgeworICAgICAgICAg ICAgLy8gRGlzY29udGludWl0eSBlbmNvdW50ZXJlZCwgZW1pdCB0aGUgcHJldmlvdXNseSBkZW11 eGVkIHNhbXBsZXMuCisgICAgICAgICAgICBjcmVhdGVTYW1wbGVCdWZmZXIobWV0YWRhdGEucG9z aXRpb24pOworICAgICAgICAgICAgcmVzZXQoKTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGF1 dG8gc3RhdHVzID0gcmVhZEZyYW1lRGF0YShyZWFkZXIsIG1ldGFkYXRhLCBieXRlc1JlbWFpbmlu Zyk7CiAgICAgaWYgKCFzdGF0dXMuY29tcGxldGVkX29rKCkpCiAgICAgICAgIHJldHVybiBzdGF0 dXM7CkBAIC0xNDA3LDcgKzE0MTcsNyBAQCB3ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2Vy V2ViTTo6QXVkaW9UcmFja0RhdGE6OmNvbnN1bWVGcmFtZURhdGEod2VibTo6UmVhZAogICAgIGlm IChtTnVtRnJhbWVzSW5Db21wbGV0ZUJsb2NrID4gbU1heEJsb2NrQnVmZmVyQ2FwYWNpdHkpCiAg ICAgICAgIG1NYXhCbG9ja0J1ZmZlckNhcGFjaXR5ID0gbU51bUZyYW1lc0luQ29tcGxldGVCbG9j azsKIAotICAgIGlmIChtX3BhY2tldERlc2NyaXB0aW9ucy5pc0VtcHR5KCkpCisgICAgaWYgKG1f cGFja2V0U2l6ZXMuaXNFbXB0eSgpKQogICAgICAgICBtX3NhbXBsZVByZXNlbnRhdGlvblRpbWUg PSBwcmVzZW50YXRpb25UaW1lOwogCiAgICAgaWYgKCFmb3JtYXREZXNjcmlwdGlvbigpKSB7CkBA IC0xNDg0LDExICsxNDk0LDEzIEBAIHdlYm06OlN0YXR1cyBTb3VyY2VCdWZmZXJQYXJzZXJXZWJN OjpBdWRpb1RyYWNrRGF0YTo6Y29uc3VtZUZyYW1lRGF0YSh3ZWJtOjpSZWFkCiAgICAgICAgIH0K ICAgICB9CiAKLSAgICBtX3BhY2tldERlc2NyaXB0aW9ucy5hcHBlbmQoeyBzdGF0aWNfY2FzdDxp bnQ2NF90PihtX2N1cnJlbnRQYWNrZXRCeXRlT2Zmc2V0KSwgMCwgc3RhdGljX2Nhc3Q8VUludDMy PigqbV9jb21wbGV0ZVBhY2tldFNpemUpIH0pOworICAgIG1fcGFja2V0U2l6ZXMuYXBwZW5kKCpt X2NvbXBsZXRlUGFja2V0U2l6ZSk7CisgICAgbV9wYWNrZXRUaW1pbmdzLmFwcGVuZCh7IG1fcGFj a2V0RHVyYXRpb24sIHByZXNlbnRhdGlvblRpbWUsIFBBTDo6a0NNVGltZUludmFsaWQgfSk7CiAg ICAgbV9jdXJyZW50UGFja2V0Qnl0ZU9mZnNldCArPSAqbV9jb21wbGV0ZVBhY2tldFNpemU7CiAg ICAgbV9jb21wbGV0ZVBhY2tldFNpemUgPSBzdGQ6Om51bGxvcHQ7CiAKICAgICBhdXRvIHNhbXBs ZUR1cmF0aW9uID0gUEFMOjpDTVRpbWVHZXRTZWNvbmRzKFBBTDo6Q01UaW1lU3VidHJhY3QocHJl c2VudGF0aW9uVGltZSwgbV9zYW1wbGVQcmVzZW50YXRpb25UaW1lKSkgKyBQQUw6OkNNVGltZUdl dFNlY29uZHMobV9wYWNrZXREdXJhdGlvbikgKiBzYW1wbGVDb3VudDsKKwogICAgIGlmIChzYW1w bGVEdXJhdGlvbiA+PSBtX21pbmltdW1TYW1wbGVEdXJhdGlvbikgewogICAgICAgICBjcmVhdGVT YW1wbGVCdWZmZXIobWV0YWRhdGEucG9zaXRpb24pOwogICAgICAgICByZXNldCgpOwpAQCAtMTUw MCwxMSArMTUxMiwxMSBAQCB3ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6QXVk aW9UcmFja0RhdGE6OmNvbnN1bWVGcmFtZURhdGEod2VibTo6UmVhZAogCiB2b2lkIFNvdXJjZUJ1 ZmZlclBhcnNlcldlYk06OkF1ZGlvVHJhY2tEYXRhOjpjcmVhdGVTYW1wbGVCdWZmZXIoc3RkOjpv cHRpb25hbDxzaXplX3Q+IGxhdGVzdEJ5dGVSYW5nZU9mZnNldCkKIHsKLSAgICBpZiAobV9wYWNr ZXREZXNjcmlwdGlvbnMuaXNFbXB0eSgpKQorICAgIGlmIChtX3BhY2tldFNpemVzLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgQ01TYW1wbGVCdWZmZXJSZWYgcmF3U2FtcGxlQnVm ZmVyID0gbnVsbHB0cjsKLSAgICBhdXRvIGVyciA9IFBBTDo6Q01BdWRpb1NhbXBsZUJ1ZmZlckNy ZWF0ZVJlYWR5V2l0aFBhY2tldERlc2NyaXB0aW9ucyhrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBtX2Nv bXBsZXRlQmxvY2tCdWZmZXIuZ2V0KCksIGZvcm1hdERlc2NyaXB0aW9uKCkuZ2V0KCksIG1fcGFj a2V0RGVzY3JpcHRpb25zLnNpemUoKSwgbV9zYW1wbGVQcmVzZW50YXRpb25UaW1lLCBtX3BhY2tl dERlc2NyaXB0aW9ucy5kYXRhKCksICZyYXdTYW1wbGVCdWZmZXIpOworICAgIGF1dG8gZXJyID0g UEFMOjpDTVNhbXBsZUJ1ZmZlckNyZWF0ZVJlYWR5KGtDRkFsbG9jYXRvckRlZmF1bHQsIG1fY29t cGxldGVCbG9ja0J1ZmZlci5nZXQoKSwgZm9ybWF0RGVzY3JpcHRpb24oKS5nZXQoKSwgbV9wYWNr ZXRTaXplcy5zaXplKCksIG1fcGFja2V0VGltaW5ncy5zaXplKCksIG1fcGFja2V0VGltaW5ncy5k YXRhKCksIG1fcGFja2V0U2l6ZXMuc2l6ZSgpLCBtX3BhY2tldFNpemVzLmRhdGEoKSwgJnJhd1Nh bXBsZUJ1ZmZlcik7CiAgICAgaWYgKGVycikgewogICAgICAgICBQQVJTRVJfTE9HX0VSUk9SX0lG X1BPU1NJQkxFKCJDTUF1ZGlvU2FtcGxlQnVmZmVyQ3JlYXRlV2l0aFBhY2tldERlc2NyaXB0aW9u cyBmYWlsZWQgd2l0aCAlZCIsIGVycik7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldl Yk0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZl clBhcnNlcldlYk0uaAppbmRleCA0NTVjZmI1ODA0NmM2ZWZhYTgxOTIwNTM3NTY3OTllMWVmZTJk MDc0Li41YTM3NjM1MDA3Y2ZhMzZkNGI1ZWI0M2ExMzBjODE2OGIwZmJiN2MzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJz ZXJXZWJNLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291 cmNlQnVmZmVyUGFyc2VyV2ViTS5oCkBAIC0yNDIsNyArMjQyLDggQEAgcHVibGljOgogICAgICAg ICBzaXplX3QgbV9jdXJyZW50UGFja2V0Qnl0ZU9mZnNldCB7IDAgfTsKICAgICAgICAgdWludDhf dCBtX2ZyYW1lc1BlclBhY2tldCB7IDAgfTsKICAgICAgICAgU2Vjb25kcyBtX2ZyYW1lRHVyYXRp b24geyAwX3MgfTsKLSAgICAgICAgVmVjdG9yPEF1ZGlvU3RyZWFtUGFja2V0RGVzY3JpcHRpb24+ IG1fcGFja2V0RGVzY3JpcHRpb25zOworICAgICAgICBWZWN0b3I8c2l6ZV90PiBtX3BhY2tldFNp emVzOworICAgICAgICBWZWN0b3I8Q01TYW1wbGVUaW1pbmdJbmZvPiBtX3BhY2tldFRpbWluZ3M7 CiAgICAgICAgIHNpemVfdCBtTnVtRnJhbWVzSW5Db21wbGV0ZUJsb2NrIHsgMCB9OwogICAgICAg ICAvLyBGSVhNRTogMC41IC0gMS4wIHNlY29uZHMgaXMgYSBiZXR0ZXIgZHVyYXRpb24gcGVyIHNh bXBsZSBidWZmZXIsIGJ1dCB1c2UgMiBzZWNvbmRzIHNvIGF0IGxlYXN0IHRoZSBmaXJzdAogICAg ICAgICAvLyBzYW1wbGUgYnVmZmVyIHdpbGwgcGxheSB1bnRpbCB3ZSBmaXggTWVkaWFTYW1wbGVD dXJzb3I6OmNyZWF0ZVNhbXBsZUJ1ZmZlciB0byBkZWFsIHdpdGggYGVuZEN1cnNvcmAuCg== 447560 2021-12-19 14:27:20 -0800 2021-12-19 14:48:27 -0800 Patch bug-234458-20211220092718.patch text/plain 6609 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3OTRhOGMwYTUzMGVh MGUwNWJkODU0ZTk5ZmNhODQwNmYyMWYzYi4uMjk1ZWY2YzNiMmQ1YmE5NjJiZjhhYTk1ZjZlYTg0 MGRiNjFhMmQxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTEyLTE3ICBKZWFu LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgcGFjayBhdWRp byBzYW1wbGVzIHdpdGggZGlzY29udGludWl0eSB0b2dldGhlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NDU4CisgICAgICAgIHJkYXI6Ly84NjY1 OTkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNv bWUgd2VibSBjb250ZW50IG1heSBoYXZlIGEgZGF0YSBnYXAgYmV0d2VlbiBmcmFtZXMuIE5vcm1h bGx5IGF1ZGlvIGZyYW1lcworICAgICAgICBhcmUgcGFja2VkIGluIDJzIGJsb2NrLiBXaGVuIHdl IHBhY2sgdGhlIHNhbXBsZXMgd2l0aCBkaXNjb250aW51aXRpZXMsIHRob3NlCisgICAgICAgIGRp c2NvbnRpbnVpdGllcyB3b3VsZCBhbGwgYmUgYWNjdW11bGF0ZWQgYXQgdGhlIDJzIGJvdW5kYXJ5 IHdoaWNoIG1ha2VzIHRoZW0KKyAgICAgICAgbXVjaCBtb3JlIGF1ZGlibGUuCisgICAgICAgIFRo ZSBDTVNhbXBsZUJ1ZmZlckNyZWF0ZVJlYWR5IEFQSSBzaG91bGQgYWxsb3cgdXMgdG8gcGFjayBz YW1wbGVzIHdpdGgKKyAgICAgICAgZGlzY29udGludWl0aWVzIGFzIHdlIGNhbiBnaXZlIGEgdmVj dG9yIG9mIENNU2FtcGxlVGltaW5nSW5mbyB3aXRoIHRoZQorICAgICAgICBleGFjdCBpbmZvcm1h dGlvbiBmb3IgYWxsIHBhY2tldHMuCisgICAgICAgIEhvd2V2ZXIsIHRoaXMgZGF0YSBhcHBlYXJz IHRvIGJlIGlnbm9yZWQgYW5kIHRoZSBkaXNjb250aW51aXRpZXMgaXMgc3RpbGwKKyAgICAgICAg aGVhcmQgYXQgdGhlIDJzIGJvdW5kYXJ5LgorICAgICAgICBTbyB3ZSBubyBsb25nZXIgcGFjayBz YW1wbGVzIHdpdGggZGlzY29udGludWl0aWVzIHNvIHRoYXQgdGhlIGZyYW1lCisgICAgICAgIHRp bWVzdGFtcHMgd2lsbCBiZSBtb3JlIGFjY3VyYXRlIGFuZCBubyBhdWRpYmxlIGFydGVmYWN0cyBh cmUgaGVhcmQgb24KKyAgICAgICAgc21hbGwgZ2Fwcy4KKworICAgICAgICBNYW51YWxseSB0ZXN0 ZWQgYW5kIHZlcmlmaWVkIG1hbnVhbGx5LiBUaGlzIGlzIGdldHRpbmcgYXJvdW5kIGFuIGlzc3Vl CisgICAgICAgIGluIENvcmVNZWRpYSB0aGF0IGluc2VydHMgdmVyeSBhdWRpYmxlIGFydGlmYWN0 cyB3aGVuIHRoZXJlJ3MgYSBnYXAgYmV0d2VlbgorICAgICAgICBzYW1wbGVzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTb3VyY2VCdWZmZXJQYXJzZXJXZWJNOjpBdWRpb1RyYWNrRGF0YTo6 cmVzZXRDb21wbGV0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUGFyc2VyV2Vi TTo6QXVkaW9UcmFja0RhdGE6OmNvbnN1bWVGcmFtZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6 U291cmNlQnVmZmVyUGFyc2VyV2ViTTo6QXVkaW9UcmFja0RhdGE6OmNyZWF0ZVNhbXBsZUJ1ZmZl cik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2Vy V2ViTS5oOgorCiAyMDIxLTEyLTE0ICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+ CiAKICAgICAgICAgU291cmNlQnVmZmVyUGFyc2VyIHNob3VsZCBiZSB1c2luZyBjb250aWd1b3Vz IFNoYXJlZEJ1ZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAppbmRleCBkZTZk ZWJlMmJkNGNhMTM2MDQwZmMwYzNhNDVkYzRlYTM5ZjQ4OWQwLi5mYmRhMTI5OGY0ZmQ5N2IzMDBl YjMzNGE4ZTVhZWQxNjg4NzE5ODI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNw cApAQCAtMTM5MSwxMyArMTM5MSwyMyBAQCB2b2lkIFNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OlZp ZGVvVHJhY2tEYXRhOjpjcmVhdGVTYW1wbGVCdWZmZXIoY29uc3QgQ01UaW1lJiBwcgogdm9pZCBT b3VyY2VCdWZmZXJQYXJzZXJXZWJNOjpBdWRpb1RyYWNrRGF0YTo6cmVzZXRDb21wbGV0ZWQoKQog ewogICAgIG1OdW1GcmFtZXNJbkNvbXBsZXRlQmxvY2sgPSAwOwotICAgIG1fcGFja2V0RGVzY3Jp cHRpb25zLmNsZWFyKCk7CisgICAgbV9wYWNrZXRTaXplcy5jbGVhcigpOworICAgIG1fcGFja2V0 VGltaW5ncy5jbGVhcigpOwogICAgIG1fY3VycmVudFBhY2tldEJ5dGVPZmZzZXQgPSAwOwogICAg IFRyYWNrRGF0YTo6cmVzZXRDb21wbGV0ZWQoKTsKIH0KIAogd2VibTo6U3RhdHVzIFNvdXJjZUJ1 ZmZlclBhcnNlcldlYk06OkF1ZGlvVHJhY2tEYXRhOjpjb25zdW1lRnJhbWVEYXRhKHdlYm06OlJl YWRlciYgcmVhZGVyLCBjb25zdCBGcmFtZU1ldGFkYXRhJiBtZXRhZGF0YSwgdWludDY0X3QqIGJ5 dGVzUmVtYWluaW5nLCBjb25zdCBDTVRpbWUmIHByZXNlbnRhdGlvblRpbWUsIGludCBzYW1wbGVD b3VudCkKIHsKKyAgICBpZiAobV9wYWNrZXRUaW1pbmdzLnNpemUoKSkgeworICAgICAgICBhdXRv JiBsYXN0VGltaW5nID0gbV9wYWNrZXRUaW1pbmdzLmxhc3QoKTsKKyAgICAgICAgaWYgKFBBTDo6 Q01UaW1lQ29tcGFyZShQQUw6OkNNVGltZUFkZChsYXN0VGltaW5nLmR1cmF0aW9uLCBsYXN0VGlt aW5nLnByZXNlbnRhdGlvblRpbWVTdGFtcCksIHByZXNlbnRhdGlvblRpbWUpKSB7CisgICAgICAg ICAgICAvLyBEaXNjb250aW51aXR5IGVuY291bnRlcmVkLCBlbWl0IHRoZSBwcmV2aW91c2x5IGRl bXV4ZWQgc2FtcGxlcy4KKyAgICAgICAgICAgIGNyZWF0ZVNhbXBsZUJ1ZmZlcihtZXRhZGF0YS5w b3NpdGlvbik7CisgICAgICAgICAgICByZXNldCgpOworICAgICAgICB9CisgICAgfQorCiAgICAg YXV0byBzdGF0dXMgPSByZWFkRnJhbWVEYXRhKHJlYWRlciwgbWV0YWRhdGEsIGJ5dGVzUmVtYWlu aW5nKTsKICAgICBpZiAoIXN0YXR1cy5jb21wbGV0ZWRfb2soKSkKICAgICAgICAgcmV0dXJuIHN0 YXR1czsKQEAgLTE0MDcsNyArMTQxNyw3IEBAIHdlYm06OlN0YXR1cyBTb3VyY2VCdWZmZXJQYXJz ZXJXZWJNOjpBdWRpb1RyYWNrRGF0YTo6Y29uc3VtZUZyYW1lRGF0YSh3ZWJtOjpSZWFkCiAgICAg aWYgKG1OdW1GcmFtZXNJbkNvbXBsZXRlQmxvY2sgPiBtTWF4QmxvY2tCdWZmZXJDYXBhY2l0eSkK ICAgICAgICAgbU1heEJsb2NrQnVmZmVyQ2FwYWNpdHkgPSBtTnVtRnJhbWVzSW5Db21wbGV0ZUJs b2NrOwogCi0gICAgaWYgKG1fcGFja2V0RGVzY3JpcHRpb25zLmlzRW1wdHkoKSkKKyAgICBpZiAo bV9wYWNrZXRTaXplcy5pc0VtcHR5KCkpCiAgICAgICAgIG1fc2FtcGxlUHJlc2VudGF0aW9uVGlt ZSA9IHByZXNlbnRhdGlvblRpbWU7CiAKICAgICBpZiAoIWZvcm1hdERlc2NyaXB0aW9uKCkpIHsK QEAgLTE0ODQsMTEgKzE0OTQsMTMgQEAgd2VibTo6U3RhdHVzIFNvdXJjZUJ1ZmZlclBhcnNlcldl Yk06OkF1ZGlvVHJhY2tEYXRhOjpjb25zdW1lRnJhbWVEYXRhKHdlYm06OlJlYWQKICAgICAgICAg fQogICAgIH0KIAotICAgIG1fcGFja2V0RGVzY3JpcHRpb25zLmFwcGVuZCh7IHN0YXRpY19jYXN0 PGludDY0X3Q+KG1fY3VycmVudFBhY2tldEJ5dGVPZmZzZXQpLCAwLCBzdGF0aWNfY2FzdDxVSW50 MzI+KCptX2NvbXBsZXRlUGFja2V0U2l6ZSkgfSk7CisgICAgbV9wYWNrZXRTaXplcy5hcHBlbmQo Km1fY29tcGxldGVQYWNrZXRTaXplKTsKKyAgICBtX3BhY2tldFRpbWluZ3MuYXBwZW5kKHsgbV9w YWNrZXREdXJhdGlvbiwgcHJlc2VudGF0aW9uVGltZSwgUEFMOjprQ01UaW1lSW52YWxpZCB9KTsK ICAgICBtX2N1cnJlbnRQYWNrZXRCeXRlT2Zmc2V0ICs9ICptX2NvbXBsZXRlUGFja2V0U2l6ZTsK ICAgICBtX2NvbXBsZXRlUGFja2V0U2l6ZSA9IHN0ZDo6bnVsbG9wdDsKIAogICAgIGF1dG8gc2Ft cGxlRHVyYXRpb24gPSBQQUw6OkNNVGltZUdldFNlY29uZHMoUEFMOjpDTVRpbWVTdWJ0cmFjdChw cmVzZW50YXRpb25UaW1lLCBtX3NhbXBsZVByZXNlbnRhdGlvblRpbWUpKSArIFBBTDo6Q01UaW1l R2V0U2Vjb25kcyhtX3BhY2tldER1cmF0aW9uKSAqIHNhbXBsZUNvdW50OworCiAgICAgaWYgKHNh bXBsZUR1cmF0aW9uID49IG1fbWluaW11bVNhbXBsZUR1cmF0aW9uKSB7CiAgICAgICAgIGNyZWF0 ZVNhbXBsZUJ1ZmZlcihtZXRhZGF0YS5wb3NpdGlvbik7CiAgICAgICAgIHJlc2V0KCk7CkBAIC0x NTAwLDExICsxNTEyLDExIEBAIHdlYm06OlN0YXR1cyBTb3VyY2VCdWZmZXJQYXJzZXJXZWJNOjpB dWRpb1RyYWNrRGF0YTo6Y29uc3VtZUZyYW1lRGF0YSh3ZWJtOjpSZWFkCiAKIHZvaWQgU291cmNl QnVmZmVyUGFyc2VyV2ViTTo6QXVkaW9UcmFja0RhdGE6OmNyZWF0ZVNhbXBsZUJ1ZmZlcihzdGQ6 Om9wdGlvbmFsPHNpemVfdD4gbGF0ZXN0Qnl0ZVJhbmdlT2Zmc2V0KQogewotICAgIGlmIChtX3Bh Y2tldERlc2NyaXB0aW9ucy5pc0VtcHR5KCkpCisgICAgaWYgKG1fcGFja2V0U2l6ZXMuaXNFbXB0 eSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBDTVNhbXBsZUJ1ZmZlclJlZiByYXdTYW1wbGVC dWZmZXIgPSBudWxscHRyOwotICAgIGF1dG8gZXJyID0gUEFMOjpDTUF1ZGlvU2FtcGxlQnVmZmVy Q3JlYXRlUmVhZHlXaXRoUGFja2V0RGVzY3JpcHRpb25zKGtDRkFsbG9jYXRvckRlZmF1bHQsIG1f Y29tcGxldGVCbG9ja0J1ZmZlci5nZXQoKSwgZm9ybWF0RGVzY3JpcHRpb24oKS5nZXQoKSwgbV9w YWNrZXREZXNjcmlwdGlvbnMuc2l6ZSgpLCBtX3NhbXBsZVByZXNlbnRhdGlvblRpbWUsIG1fcGFj a2V0RGVzY3JpcHRpb25zLmRhdGEoKSwgJnJhd1NhbXBsZUJ1ZmZlcik7CisgICAgYXV0byBlcnIg PSBQQUw6OkNNU2FtcGxlQnVmZmVyQ3JlYXRlUmVhZHkoa0NGQWxsb2NhdG9yRGVmYXVsdCwgbV9j b21wbGV0ZUJsb2NrQnVmZmVyLmdldCgpLCBmb3JtYXREZXNjcmlwdGlvbigpLmdldCgpLCBtX3Bh Y2tldFNpemVzLnNpemUoKSwgbV9wYWNrZXRUaW1pbmdzLnNpemUoKSwgbV9wYWNrZXRUaW1pbmdz LmRhdGEoKSwgbV9wYWNrZXRTaXplcy5zaXplKCksIG1fcGFja2V0U2l6ZXMuZGF0YSgpLCAmcmF3 U2FtcGxlQnVmZmVyKTsKICAgICBpZiAoZXJyKSB7CiAgICAgICAgIFBBUlNFUl9MT0dfRVJST1Jf SUZfUE9TU0lCTEUoIkNNQXVkaW9TYW1wbGVCdWZmZXJDcmVhdGVXaXRoUGFja2V0RGVzY3JpcHRp b25zIGZhaWxlZCB3aXRoICVkIiwgZXJyKTsKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2Vy V2ViTS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVm ZmVyUGFyc2VyV2ViTS5oCmluZGV4IDQ1NWNmYjU4MDQ2YzZlZmFhODE5MjA1Mzc1Njc5OWUxZWZl MmQwNzQuLjVhMzc2MzUwMDdjZmEzNmQ0YjVlYjQzYTEzMGM4MTY4YjBmYmI3YzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBh cnNlcldlYk0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9T b3VyY2VCdWZmZXJQYXJzZXJXZWJNLmgKQEAgLTI0Miw3ICsyNDIsOCBAQCBwdWJsaWM6CiAgICAg ICAgIHNpemVfdCBtX2N1cnJlbnRQYWNrZXRCeXRlT2Zmc2V0IHsgMCB9OwogICAgICAgICB1aW50 OF90IG1fZnJhbWVzUGVyUGFja2V0IHsgMCB9OwogICAgICAgICBTZWNvbmRzIG1fZnJhbWVEdXJh dGlvbiB7IDBfcyB9OwotICAgICAgICBWZWN0b3I8QXVkaW9TdHJlYW1QYWNrZXREZXNjcmlwdGlv bj4gbV9wYWNrZXREZXNjcmlwdGlvbnM7CisgICAgICAgIFZlY3RvcjxzaXplX3Q+IG1fcGFja2V0 U2l6ZXM7CisgICAgICAgIFZlY3RvcjxDTVNhbXBsZVRpbWluZ0luZm8+IG1fcGFja2V0VGltaW5n czsKICAgICAgICAgc2l6ZV90IG1OdW1GcmFtZXNJbkNvbXBsZXRlQmxvY2sgeyAwIH07CiAgICAg ICAgIC8vIEZJWE1FOiAwLjUgLSAxLjAgc2Vjb25kcyBpcyBhIGJldHRlciBkdXJhdGlvbiBwZXIg c2FtcGxlIGJ1ZmZlciwgYnV0IHVzZSAyIHNlY29uZHMgc28gYXQgbGVhc3QgdGhlIGZpcnN0CiAg ICAgICAgIC8vIHNhbXBsZSBidWZmZXIgd2lsbCBwbGF5IHVudGlsIHdlIGZpeCBNZWRpYVNhbXBs ZUN1cnNvcjo6Y3JlYXRlU2FtcGxlQnVmZmVyIHRvIGRlYWwgd2l0aCBgZW5kQ3Vyc29yYC4K 447561 2021-12-19 14:43:20 -0800 2021-12-19 17:46:28 -0800 Patch bug-234458-20211220094318.patch text/plain 6607 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3OTRhOGMwYTUzMGVh MGUwNWJkODU0ZTk5ZmNhODQwNmYyMWYzYi4uM2Q4YzkwMjJjMDJlNGZiMzcwODkzY2Q5NjAxYWVk NmI4NTI0OGJkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTEyLTE3ICBKZWFu LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgcGFjayBhdWRp byBzYW1wbGVzIHdpdGggZGlzY29udGludWl0eSB0b2dldGhlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NDU4CisgICAgICAgIHJkYXI6Ly84NjY1 OTkxNAorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBTb21l IHdlYm0gY29udGVudCBtYXkgaGF2ZSBhIGRhdGEgZ2FwIGJldHdlZW4gZnJhbWVzLiBOb3JtYWxs eSBhdWRpbyBmcmFtZXMKKyAgICAgICAgYXJlIHBhY2tlZCBpbiAycyBibG9jay4gV2hlbiB3ZSBw YWNrIHRoZSBzYW1wbGVzIHdpdGggZGlzY29udGludWl0aWVzLCB0aG9zZQorICAgICAgICBkaXNj b250aW51aXRpZXMgd291bGQgYWxsIGJlIGFjY3VtdWxhdGVkIGF0IHRoZSAycyBib3VuZGFyeSB3 aGljaCBtYWtlcyB0aGVtCisgICAgICAgIG11Y2ggbW9yZSBhdWRpYmxlLgorICAgICAgICBUaGUg Q01TYW1wbGVCdWZmZXJDcmVhdGVSZWFkeSBBUEkgc2hvdWxkIGFsbG93IHVzIHRvIHBhY2sgc2Ft cGxlcyB3aXRoCisgICAgICAgIGRpc2NvbnRpbnVpdGllcyBhcyB3ZSBjYW4gZ2l2ZSBhIHZlY3Rv ciBvZiBDTVNhbXBsZVRpbWluZ0luZm8gd2l0aCB0aGUKKyAgICAgICAgZXhhY3QgaW5mb3JtYXRp b24gZm9yIGFsbCBwYWNrZXRzLgorICAgICAgICBIb3dldmVyLCB0aGlzIGRhdGEgYXBwZWFycyB0 byBiZSBpZ25vcmVkIGFuZCB0aGUgZGlzY29udGludWl0aWVzIGlzIHN0aWxsCisgICAgICAgIGhl YXJkIGF0IHRoZSAycyBib3VuZGFyeS4KKyAgICAgICAgU28gd2Ugbm8gbG9uZ2VyIHBhY2sgc2Ft cGxlcyB3aXRoIGRpc2NvbnRpbnVpdGllcyBzbyB0aGF0IHRoZSBmcmFtZQorICAgICAgICB0aW1l c3RhbXBzIHdpbGwgYmUgbW9yZSBhY2N1cmF0ZSBhbmQgbm8gYXVkaWJsZSBhcnRlZmFjdHMgYXJl IGhlYXJkIG9uCisgICAgICAgIHNtYWxsIGdhcHMuCisKKyAgICAgICAgTWFudWFsbHkgdGVzdGVk IGFuZCB2ZXJpZmllZCBtYW51YWxseS4gVGhpcyBpcyBnZXR0aW5nIGFyb3VuZCBhbiBpc3N1ZQor ICAgICAgICBpbiBDb3JlTWVkaWEgdGhhdCBpbnNlcnRzIHZlcnkgYXVkaWJsZSBhcnRpZmFjdHMg d2hlbiB0aGVyZSdzIGEgZ2FwIGJldHdlZW4KKyAgICAgICAgc2FtcGxlcy4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUGFyc2VyV2ViTTo6QXVkaW9UcmFja0RhdGE6OnJl c2V0Q29tcGxldGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBhcnNlcldlYk06 OkF1ZGlvVHJhY2tEYXRhOjpjb25zdW1lRnJhbWVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlNv dXJjZUJ1ZmZlclBhcnNlcldlYk06OkF1ZGlvVHJhY2tEYXRhOjpjcmVhdGVTYW1wbGVCdWZmZXIp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldl Yk0uaDoKKwogMjAyMS0xMi0xNCAgSmVhbi1ZdmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29tPgog CiAgICAgICAgIFNvdXJjZUJ1ZmZlclBhcnNlciBzaG91bGQgYmUgdXNpbmcgY29udGlndW91cyBT aGFyZWRCdWZmZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldlYk0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAKaW5kZXggZGU2ZGVi ZTJiZDRjYTEzNjA0MGZjMGMzYTQ1ZGM0ZWEzOWY0ODlkMC4uZmJkYTEyOThmNGZkOTdiMzAwZWIz MzRhOGU1YWVkMTY4ODcxOTgyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAK QEAgLTEzOTEsMTMgKzEzOTEsMjMgQEAgdm9pZCBTb3VyY2VCdWZmZXJQYXJzZXJXZWJNOjpWaWRl b1RyYWNrRGF0YTo6Y3JlYXRlU2FtcGxlQnVmZmVyKGNvbnN0IENNVGltZSYgcHIKIHZvaWQgU291 cmNlQnVmZmVyUGFyc2VyV2ViTTo6QXVkaW9UcmFja0RhdGE6OnJlc2V0Q29tcGxldGVkKCkKIHsK ICAgICBtTnVtRnJhbWVzSW5Db21wbGV0ZUJsb2NrID0gMDsKLSAgICBtX3BhY2tldERlc2NyaXB0 aW9ucy5jbGVhcigpOworICAgIG1fcGFja2V0U2l6ZXMuY2xlYXIoKTsKKyAgICBtX3BhY2tldFRp bWluZ3MuY2xlYXIoKTsKICAgICBtX2N1cnJlbnRQYWNrZXRCeXRlT2Zmc2V0ID0gMDsKICAgICBU cmFja0RhdGE6OnJlc2V0Q29tcGxldGVkKCk7CiB9CiAKIHdlYm06OlN0YXR1cyBTb3VyY2VCdWZm ZXJQYXJzZXJXZWJNOjpBdWRpb1RyYWNrRGF0YTo6Y29uc3VtZUZyYW1lRGF0YSh3ZWJtOjpSZWFk ZXImIHJlYWRlciwgY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIHVpbnQ2NF90KiBieXRl c1JlbWFpbmluZywgY29uc3QgQ01UaW1lJiBwcmVzZW50YXRpb25UaW1lLCBpbnQgc2FtcGxlQ291 bnQpCiB7CisgICAgaWYgKG1fcGFja2V0VGltaW5ncy5zaXplKCkpIHsKKyAgICAgICAgYXV0byYg bGFzdFRpbWluZyA9IG1fcGFja2V0VGltaW5ncy5sYXN0KCk7CisgICAgICAgIGlmIChQQUw6OkNN VGltZUNvbXBhcmUoUEFMOjpDTVRpbWVBZGQobGFzdFRpbWluZy5kdXJhdGlvbiwgbGFzdFRpbWlu Zy5wcmVzZW50YXRpb25UaW1lU3RhbXApLCBwcmVzZW50YXRpb25UaW1lKSkgeworICAgICAgICAg ICAgLy8gRGlzY29udGludWl0eSBlbmNvdW50ZXJlZCwgZW1pdCB0aGUgcHJldmlvdXNseSBkZW11 eGVkIHNhbXBsZXMuCisgICAgICAgICAgICBjcmVhdGVTYW1wbGVCdWZmZXIobWV0YWRhdGEucG9z aXRpb24pOworICAgICAgICAgICAgcmVzZXQoKTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGF1 dG8gc3RhdHVzID0gcmVhZEZyYW1lRGF0YShyZWFkZXIsIG1ldGFkYXRhLCBieXRlc1JlbWFpbmlu Zyk7CiAgICAgaWYgKCFzdGF0dXMuY29tcGxldGVkX29rKCkpCiAgICAgICAgIHJldHVybiBzdGF0 dXM7CkBAIC0xNDA3LDcgKzE0MTcsNyBAQCB3ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2Vy V2ViTTo6QXVkaW9UcmFja0RhdGE6OmNvbnN1bWVGcmFtZURhdGEod2VibTo6UmVhZAogICAgIGlm IChtTnVtRnJhbWVzSW5Db21wbGV0ZUJsb2NrID4gbU1heEJsb2NrQnVmZmVyQ2FwYWNpdHkpCiAg ICAgICAgIG1NYXhCbG9ja0J1ZmZlckNhcGFjaXR5ID0gbU51bUZyYW1lc0luQ29tcGxldGVCbG9j azsKIAotICAgIGlmIChtX3BhY2tldERlc2NyaXB0aW9ucy5pc0VtcHR5KCkpCisgICAgaWYgKG1f cGFja2V0U2l6ZXMuaXNFbXB0eSgpKQogICAgICAgICBtX3NhbXBsZVByZXNlbnRhdGlvblRpbWUg PSBwcmVzZW50YXRpb25UaW1lOwogCiAgICAgaWYgKCFmb3JtYXREZXNjcmlwdGlvbigpKSB7CkBA IC0xNDg0LDExICsxNDk0LDEzIEBAIHdlYm06OlN0YXR1cyBTb3VyY2VCdWZmZXJQYXJzZXJXZWJN OjpBdWRpb1RyYWNrRGF0YTo6Y29uc3VtZUZyYW1lRGF0YSh3ZWJtOjpSZWFkCiAgICAgICAgIH0K ICAgICB9CiAKLSAgICBtX3BhY2tldERlc2NyaXB0aW9ucy5hcHBlbmQoeyBzdGF0aWNfY2FzdDxp bnQ2NF90PihtX2N1cnJlbnRQYWNrZXRCeXRlT2Zmc2V0KSwgMCwgc3RhdGljX2Nhc3Q8VUludDMy PigqbV9jb21wbGV0ZVBhY2tldFNpemUpIH0pOworICAgIG1fcGFja2V0U2l6ZXMuYXBwZW5kKCpt X2NvbXBsZXRlUGFja2V0U2l6ZSk7CisgICAgbV9wYWNrZXRUaW1pbmdzLmFwcGVuZCh7IG1fcGFj a2V0RHVyYXRpb24sIHByZXNlbnRhdGlvblRpbWUsIFBBTDo6a0NNVGltZUludmFsaWQgfSk7CiAg ICAgbV9jdXJyZW50UGFja2V0Qnl0ZU9mZnNldCArPSAqbV9jb21wbGV0ZVBhY2tldFNpemU7CiAg ICAgbV9jb21wbGV0ZVBhY2tldFNpemUgPSBzdGQ6Om51bGxvcHQ7CiAKICAgICBhdXRvIHNhbXBs ZUR1cmF0aW9uID0gUEFMOjpDTVRpbWVHZXRTZWNvbmRzKFBBTDo6Q01UaW1lU3VidHJhY3QocHJl c2VudGF0aW9uVGltZSwgbV9zYW1wbGVQcmVzZW50YXRpb25UaW1lKSkgKyBQQUw6OkNNVGltZUdl dFNlY29uZHMobV9wYWNrZXREdXJhdGlvbikgKiBzYW1wbGVDb3VudDsKKwogICAgIGlmIChzYW1w bGVEdXJhdGlvbiA+PSBtX21pbmltdW1TYW1wbGVEdXJhdGlvbikgewogICAgICAgICBjcmVhdGVT YW1wbGVCdWZmZXIobWV0YWRhdGEucG9zaXRpb24pOwogICAgICAgICByZXNldCgpOwpAQCAtMTUw MCwxMSArMTUxMiwxMSBAQCB3ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6QXVk aW9UcmFja0RhdGE6OmNvbnN1bWVGcmFtZURhdGEod2VibTo6UmVhZAogCiB2b2lkIFNvdXJjZUJ1 ZmZlclBhcnNlcldlYk06OkF1ZGlvVHJhY2tEYXRhOjpjcmVhdGVTYW1wbGVCdWZmZXIoc3RkOjpv cHRpb25hbDxzaXplX3Q+IGxhdGVzdEJ5dGVSYW5nZU9mZnNldCkKIHsKLSAgICBpZiAobV9wYWNr ZXREZXNjcmlwdGlvbnMuaXNFbXB0eSgpKQorICAgIGlmIChtX3BhY2tldFNpemVzLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgQ01TYW1wbGVCdWZmZXJSZWYgcmF3U2FtcGxlQnVm ZmVyID0gbnVsbHB0cjsKLSAgICBhdXRvIGVyciA9IFBBTDo6Q01BdWRpb1NhbXBsZUJ1ZmZlckNy ZWF0ZVJlYWR5V2l0aFBhY2tldERlc2NyaXB0aW9ucyhrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBtX2Nv bXBsZXRlQmxvY2tCdWZmZXIuZ2V0KCksIGZvcm1hdERlc2NyaXB0aW9uKCkuZ2V0KCksIG1fcGFj a2V0RGVzY3JpcHRpb25zLnNpemUoKSwgbV9zYW1wbGVQcmVzZW50YXRpb25UaW1lLCBtX3BhY2tl dERlc2NyaXB0aW9ucy5kYXRhKCksICZyYXdTYW1wbGVCdWZmZXIpOworICAgIGF1dG8gZXJyID0g UEFMOjpDTVNhbXBsZUJ1ZmZlckNyZWF0ZVJlYWR5KGtDRkFsbG9jYXRvckRlZmF1bHQsIG1fY29t cGxldGVCbG9ja0J1ZmZlci5nZXQoKSwgZm9ybWF0RGVzY3JpcHRpb24oKS5nZXQoKSwgbV9wYWNr ZXRTaXplcy5zaXplKCksIG1fcGFja2V0VGltaW5ncy5zaXplKCksIG1fcGFja2V0VGltaW5ncy5k YXRhKCksIG1fcGFja2V0U2l6ZXMuc2l6ZSgpLCBtX3BhY2tldFNpemVzLmRhdGEoKSwgJnJhd1Nh bXBsZUJ1ZmZlcik7CiAgICAgaWYgKGVycikgewogICAgICAgICBQQVJTRVJfTE9HX0VSUk9SX0lG X1BPU1NJQkxFKCJDTUF1ZGlvU2FtcGxlQnVmZmVyQ3JlYXRlV2l0aFBhY2tldERlc2NyaXB0aW9u cyBmYWlsZWQgd2l0aCAlZCIsIGVycik7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZlclBhcnNlcldl Yk0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1NvdXJjZUJ1ZmZl clBhcnNlcldlYk0uaAppbmRleCA0NTVjZmI1ODA0NmM2ZWZhYTgxOTIwNTM3NTY3OTllMWVmZTJk MDc0Li41YTM3NjM1MDA3Y2ZhMzZkNGI1ZWI0M2ExMzBjODE2OGIwZmJiN2MzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJz ZXJXZWJNLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvU291 cmNlQnVmZmVyUGFyc2VyV2ViTS5oCkBAIC0yNDIsNyArMjQyLDggQEAgcHVibGljOgogICAgICAg ICBzaXplX3QgbV9jdXJyZW50UGFja2V0Qnl0ZU9mZnNldCB7IDAgfTsKICAgICAgICAgdWludDhf dCBtX2ZyYW1lc1BlclBhY2tldCB7IDAgfTsKICAgICAgICAgU2Vjb25kcyBtX2ZyYW1lRHVyYXRp b24geyAwX3MgfTsKLSAgICAgICAgVmVjdG9yPEF1ZGlvU3RyZWFtUGFja2V0RGVzY3JpcHRpb24+ IG1fcGFja2V0RGVzY3JpcHRpb25zOworICAgICAgICBWZWN0b3I8c2l6ZV90PiBtX3BhY2tldFNp emVzOworICAgICAgICBWZWN0b3I8Q01TYW1wbGVUaW1pbmdJbmZvPiBtX3BhY2tldFRpbWluZ3M7 CiAgICAgICAgIHNpemVfdCBtTnVtRnJhbWVzSW5Db21wbGV0ZUJsb2NrIHsgMCB9OwogICAgICAg ICAvLyBGSVhNRTogMC41IC0gMS4wIHNlY29uZHMgaXMgYSBiZXR0ZXIgZHVyYXRpb24gcGVyIHNh bXBsZSBidWZmZXIsIGJ1dCB1c2UgMiBzZWNvbmRzIHNvIGF0IGxlYXN0IHRoZSBmaXJzdAogICAg ICAgICAvLyBzYW1wbGUgYnVmZmVyIHdpbGwgcGxheSB1bnRpbCB3ZSBmaXggTWVkaWFTYW1wbGVD dXJzb3I6OmNyZWF0ZVNhbXBsZUJ1ZmZlciB0byBkZWFsIHdpdGggYGVuZEN1cnNvcmAuCg==