170598 2017-04-07 05:33:15 -0700 MediaSample should store video sample rotation instead of orientation 2017-04-07 10:29:45 -0700 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue webkit-bug-importer youennf oldest_to_newest 1295289 0 eric.carlson 2017-04-07 05:33:15 -0700 Store the rotation required to correct the sample for view instead of the sensor orientation. 1295337 1 306504 eric.carlson 2017-04-07 08:34:07 -0700 Created attachment 306504 Proposed patch. 1295353 2 webkit-bug-importer 2017-04-07 09:00:45 -0700 <rdar://problem/31501643> 1295375 3 306504 commit-queue 2017-04-07 10:29:44 -0700 Comment on attachment 306504 Proposed patch. Clearing flags on attachment: 306504 Committed r215099: <http://trac.webkit.org/changeset/215099> 1295376 4 commit-queue 2017-04-07 10:29:45 -0700 All reviewed patches have been landed. Closing bug. 306504 2017-04-07 08:34:07 -0700 2017-04-07 10:29:44 -0700 Proposed patch. rotate_not_orientation_patch_3.txt text/plain 16389 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTA0MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE3LTA0LTA3ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1lZGlhU2FtcGxlIHNo b3VsZCBzdG9yZSB2aWRlbyBzYW1wbGUgcm90YXRpb24gaW5zdGVhZCBvZiBvcmllbnRhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNTk4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCBubyBmdW5jdGlvbmFsIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL01lZGlhU2Ft cGxlLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNhbXBsZTo6dmlkZW9Sb3RhdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVNhbXBsZTo6dmlkZW9PcmllbnRhdGlvbik6IERlbGV0ZWQu CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhU2FtcGxlQVZG T2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFt QVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3Ry ZWFtQVZGT2JqQzo6dmlkZW9UcmFuc2Zvcm1hdGlvbk1hdHJpeCk6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OmVucXVldWVWaWRlb1NhbXBs ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9i akM6OnVwZGF0ZURpc3BsYXlMYXllcik6CisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVh bS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW06CisgICAgICAgIChXZWJDb3JlOjpBVlZpZGVv Q2FwdHVyZVNvdXJjZTo6cHJvY2Vzc05ld0ZyYW1lKToKKworICAgICAgICAqIHBsYXRmb3JtL21l ZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlOjpPbkZyYW1lKToKKyAgICAgICAg KFdlYkNvcmU6OlJlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZTo6cHJvY2Vzc05ld1NhbXBsZSk6 CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdWaWRl b1NvdXJjZS5oOgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1l T3V0Z29pbmdWaWRlb1NvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU91dGdv aW5nVmlkZW9Tb3VyY2U6OnZpZGVvU2FtcGxlQXZhaWxhYmxlKToKKwogMjAxNy0wNC0wNiAgUm9t YWluIEJlbGxlc3NvcnQgIDxyb21haW4uYmVsbGVzc29ydEBjcmYuY2Fub24uZnI+CiAKICAgICAg ICAgW1JlYWRhYmxlIFN0cmVhbXMgQVBJXSBJbXBsZW1lbnQgUmVhZGFibGVTdHJlYW1CWU9CUmVx dWVzdCByZXNwb25kV2l0aE5ld1ZpZXcoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v TWVkaWFTYW1wbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZWRp YVNhbXBsZS5oCShyZXZpc2lvbiAyMTUwNDMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9N ZWRpYVNhbXBsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04MCwxNCArODAsMTMgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgU2FtcGxlRmxhZ3MgZmxhZ3MoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBQ bGF0Zm9ybVNhbXBsZSBwbGF0Zm9ybVNhbXBsZSgpID0gMDsKIAotICAgIGVudW0gY2xhc3MgVmlk ZW9PcmllbnRhdGlvbiB7Ci0gICAgICAgIFVua25vd24sCi0gICAgICAgIFBvcnRyYWl0LAotICAg ICAgICBQb3J0cmFpdFVwc2lkZURvd24sCi0gICAgICAgIExhbmRzY2FwZVJpZ2h0LAotICAgICAg ICBMYW5kc2NhcGVMZWZ0LAorICAgIGVudW0gY2xhc3MgVmlkZW9Sb3RhdGlvbiB7CisgICAgICAg IE5vbmUgPSAwLAorICAgICAgICBVcHNpZGVEb3duID0gMTgwLAorICAgICAgICBSaWdodCA9IDkw LAorICAgICAgICBMZWZ0ID0gMjcwLAogICAgIH07Ci0gICAgdmlydHVhbCBWaWRlb09yaWVudGF0 aW9uIHZpZGVvT3JpZW50YXRpb24oKSBjb25zdCB7IHJldHVybiBWaWRlb09yaWVudGF0aW9uOjpV bmtub3duOyB9CisgICAgdmlydHVhbCBWaWRlb1JvdGF0aW9uIHZpZGVvUm90YXRpb24oKSBjb25z dCB7IHJldHVybiBWaWRlb1JvdGF0aW9uOjpOb25lOyB9CiAgICAgdmlydHVhbCBib29sIHZpZGVv TWlycm9yZWQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgYm9vbCBpc1N5bmMoKSBj b25zdCB7IHJldHVybiBmbGFncygpICYgSXNTeW5jOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFTYW1wbGVBVkZPYmpDLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01l ZGlhU2FtcGxlQVZGT2JqQy5oCShyZXZpc2lvbiAyMTUwNDMpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFTYW1wbGVBVkZPYmpDLmgJKHdvcmtp bmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgTWVkaWFTYW1wbGVBVkZPYmpDIGZpbmFs IDogcHVibGljIAogcHVibGljOgogICAgIHN0YXRpYyBSZWY8TWVkaWFTYW1wbGVBVkZPYmpDPiBj cmVhdGUoQ01TYW1wbGVCdWZmZXJSZWYgc2FtcGxlLCBpbnQgdHJhY2tJRCkgeyByZXR1cm4gYWRv cHRSZWYoKm5ldyBNZWRpYVNhbXBsZUFWRk9iakMoc2FtcGxlLCB0cmFja0lEKSk7IH0KICAgICBz dGF0aWMgUmVmPE1lZGlhU2FtcGxlQVZGT2JqQz4gY3JlYXRlKENNU2FtcGxlQnVmZmVyUmVmIHNh bXBsZSwgQXRvbWljU3RyaW5nIHRyYWNrSUQpIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTWVkaWFT YW1wbGVBVkZPYmpDKHNhbXBsZSwgdHJhY2tJRCkpOyB9Ci0gICAgc3RhdGljIFJlZjxNZWRpYVNh bXBsZUFWRk9iakM+IGNyZWF0ZShDTVNhbXBsZUJ1ZmZlclJlZiBzYW1wbGUsIFZpZGVvT3JpZW50 YXRpb24gb3JpZW50YXRpb24gPSBWaWRlb09yaWVudGF0aW9uOjpVbmtub3duLCBib29sIG1pcnJv cmVkID0gZmFsc2UpIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTWVkaWFTYW1wbGVBVkZPYmpDKHNh bXBsZSwgb3JpZW50YXRpb24sIG1pcnJvcmVkKSk7IH0KKyAgICBzdGF0aWMgUmVmPE1lZGlhU2Ft cGxlQVZGT2JqQz4gY3JlYXRlKENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZSwgVmlkZW9Sb3RhdGlv biByb3RhdGlvbiA9IFZpZGVvUm90YXRpb246Ok5vbmUsIGJvb2wgbWlycm9yZWQgPSBmYWxzZSkg eyByZXR1cm4gYWRvcHRSZWYoKm5ldyBNZWRpYVNhbXBsZUFWRk9iakMoc2FtcGxlLCByb3RhdGlv biwgbWlycm9yZWQpKTsgfQogICAgIHN0YXRpYyBSZWZQdHI8TWVkaWFTYW1wbGVBVkZPYmpDPiBj cmVhdGVJbWFnZVNhbXBsZShSZWY8SlNDOjpVaW50OENsYW1wZWRBcnJheT4mJiwgdW5zaWduZWQg bG9uZyB3aWR0aCwgdW5zaWduZWQgbG9uZyBoZWlnaHQpOwogICAgIHN0YXRpYyBSZWZQdHI8TWVk aWFTYW1wbGVBVkZPYmpDPiBjcmVhdGVJbWFnZVNhbXBsZShWZWN0b3I8dWludDhfdD4mJiwgdW5z aWduZWQgbG9uZyB3aWR0aCwgdW5zaWduZWQgbG9uZyBoZWlnaHQpOwogCkBAIC01OCw5ICs1OCw5 IEBAIHByaXZhdGU6CiAgICAgICAgICwgbV9pZChTdHJpbmc6OmZvcm1hdCgiJWQiLCB0cmFja0lE KSkKICAgICB7CiAgICAgfQotICAgIE1lZGlhU2FtcGxlQVZGT2JqQyhDTVNhbXBsZUJ1ZmZlclJl ZiBzYW1wbGUsIFZpZGVvT3JpZW50YXRpb24gb3JpZW50YXRpb24sIGJvb2wgbWlycm9yZWQpCisg ICAgTWVkaWFTYW1wbGVBVkZPYmpDKENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZSwgVmlkZW9Sb3Rh dGlvbiByb3RhdGlvbiwgYm9vbCBtaXJyb3JlZCkKICAgICAgICAgOiBtX3NhbXBsZShzYW1wbGUp Ci0gICAgICAgICwgbV9vcmllbnRhdGlvbihvcmllbnRhdGlvbikKKyAgICAgICAgLCBtX3JvdGF0 aW9uKHJvdGF0aW9uKQogICAgICAgICAsIG1fbWlycm9yZWQobWlycm9yZWQpCiAgICAgewogICAg IH0KQEAgLTg4LDEyICs4OCwxMiBAQCBwcml2YXRlOgogICAgIHN0ZDo6cGFpcjxSZWZQdHI8TWVk aWFTYW1wbGU+LCBSZWZQdHI8TWVkaWFTYW1wbGU+PiBkaXZpZGUoY29uc3QgTWVkaWFUaW1lJiBw cmVzZW50YXRpb25UaW1lKSBvdmVycmlkZTsKICAgICBSZWY8TWVkaWFTYW1wbGU+IGNyZWF0ZU5v bkRpc3BsYXlpbmdDb3B5KCkgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICBWaWRlb09yaWVudGF0aW9u IHZpZGVvT3JpZW50YXRpb24oKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX29yaWVudGF0aW9uOyB9 CisgICAgVmlkZW9Sb3RhdGlvbiB2aWRlb1JvdGF0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4g bV9yb3RhdGlvbjsgfQogICAgIGJvb2wgdmlkZW9NaXJyb3JlZCgpIGNvbnN0IGZpbmFsIHsgcmV0 dXJuIG1fbWlycm9yZWQ7IH0KIAogICAgIFJldGFpblB0cjxDTVNhbXBsZUJ1ZmZlclJlZj4gbV9z YW1wbGU7CiAgICAgQXRvbWljU3RyaW5nIG1faWQ7Ci0gICAgVmlkZW9PcmllbnRhdGlvbiBtX29y aWVudGF0aW9uIHsgVmlkZW9PcmllbnRhdGlvbjo6VW5rbm93biB9OworICAgIFZpZGVvUm90YXRp b24gbV9yb3RhdGlvbiB7IFZpZGVvUm90YXRpb246Ok5vbmUgfTsKICAgICBib29sIG1fbWlycm9y ZWQgeyBmYWxzZSB9OwogfTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpD LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmgJKHJldmlz aW9uIDIxNTA0MykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNTIsNyArMjUyLDcgQEAgcHJpdmF0ZToKICAgICBmbG9hdCBtX3ZvbHVtZSB7 IDEgfTsKICAgICBEaXNwbGF5TW9kZSBtX2Rpc3BsYXlNb2RlIHsgTm9uZSB9OwogICAgIFBsYXli YWNrU3RhdGUgbV9wbGF5YmFja1N0YXRlIHsgUGxheWJhY2tTdGF0ZTo6Tm9uZSB9OwotICAgIE1l ZGlhU2FtcGxlOjpWaWRlb09yaWVudGF0aW9uIG1fdmlkZW9PcmllbnRhdGlvbiB7IE1lZGlhU2Ft cGxlOjpWaWRlb09yaWVudGF0aW9uOjpVbmtub3duIH07CisgICAgTWVkaWFTYW1wbGU6OlZpZGVv Um90YXRpb24gbV92aWRlb1JvdGF0aW9uIHsgTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246Ok5v bmUgfTsKICAgICBDR0FmZmluZVRyYW5zZm9ybSBtX3ZpZGVvVHJhbnNmb3JtOwogICAgIGJvb2wg bV92aWRlb01pcnJvcmVkIHsgZmFsc2UgfTsKICAgICBib29sIG1fcGxheWluZyB7IGZhbHNlIH07 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCShyZXZpc2lvbiAyMTUwNDMpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0JKHdvcmtpbmcgY29weSkKQEAgLTMxNCwx OCArMzE0LDEwIEBAIENHQWZmaW5lVHJhbnNmb3JtIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGkKICAg ICBpZiAoIXdpZHRoIHx8ICFoZWlnaHQpCiAgICAgICAgIHJldHVybiBDR0FmZmluZVRyYW5zZm9y bUlkZW50aXR5OwogCi0gICAgQVNTRVJUKG1fdmlkZW9PcmllbnRhdGlvbiA+PSBNZWRpYVNhbXBs ZTo6VmlkZW9PcmllbnRhdGlvbjo6VW5rbm93bik7Ci0gICAgQVNTRVJUKG1fdmlkZW9PcmllbnRh dGlvbiA8PSBNZWRpYVNhbXBsZTo6VmlkZW9PcmllbnRhdGlvbjo6TGFuZHNjYXBlTGVmdCk7Ci0K LSAgICAvLyBVbmtub3duLCBQb3J0cmFpdCwgUG9ydHJhaXRVcHNpZGVEb3duLCBMYW5kc2NhcGVS aWdodCwgTGFuZHNjYXBlTGVmdCwKLSNpZiBQTEFURk9STShNQUMpCi0gICAgc3RhdGljIGZsb2F0 IHNlbnNvckFuZ2xlW10gPSB7IDAsIDAsIDE4MCwgOTAsIDI3MCB9OwotI2Vsc2UKLSAgICBzdGF0 aWMgZmxvYXQgc2Vuc29yQW5nbGVbXSA9IHsgMCwgMTgwLCAwLCA5MCwgMjcwIH07Ci0jZW5kaWYK LSAgICBmbG9hdCByb3RhdGlvbiA9IHNlbnNvckFuZ2xlW3N0YXRpY19jYXN0PGludD4obV92aWRl b09yaWVudGF0aW9uKV07Ci0gICAgbV92aWRlb1RyYW5zZm9ybSA9IENHQWZmaW5lVHJhbnNmb3Jt TWFrZVJvdGF0aW9uKHJvdGF0aW9uICogTV9QSSAvIDE4MCk7CisgICAgQVNTRVJUKG1fdmlkZW9S b3RhdGlvbiA+PSBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6Tm9uZSk7CisgICAgQVNTRVJU KG1fdmlkZW9Sb3RhdGlvbiA8PSBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6TGVmdCk7CiAK KyAgICBtX3ZpZGVvVHJhbnNmb3JtID0gQ0dBZmZpbmVUcmFuc2Zvcm1NYWtlUm90YXRpb24oc3Rh dGljX2Nhc3Q8aW50PihtX3ZpZGVvUm90YXRpb24pICogTV9QSSAvIDE4MCk7CiAgICAgaWYgKHNh bXBsZS52aWRlb01pcnJvcmVkKCkpCiAgICAgICAgIG1fdmlkZW9UcmFuc2Zvcm0gPSBDR0FmZmlu ZVRyYW5zZm9ybVNjYWxlKG1fdmlkZW9UcmFuc2Zvcm0sIC0xLCAxKTsKIApAQCAtMzcwLDggKzM2 Miw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmoKICAgICB1cGRh dGVTYW1wbGVUaW1lcyhzYW1wbGUsIHRpbWVsaW5lT2Zmc2V0LCAiTWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTdHJlYW1BVkZPYmpDOjplbnF1ZXVlVmlkZW9TYW1wbGUiKTsKIAogICAgIGlmIChtX3Nh bXBsZUJ1ZmZlckRpc3BsYXlMYXllcikgewotICAgICAgICBpZiAoc2FtcGxlLnZpZGVvT3JpZW50 YXRpb24oKSAhPSBtX3ZpZGVvT3JpZW50YXRpb24gfHwgc2FtcGxlLnZpZGVvTWlycm9yZWQoKSAh PSBtX3ZpZGVvTWlycm9yZWQpIHsKLSAgICAgICAgICAgIG1fdmlkZW9PcmllbnRhdGlvbiA9IHNh bXBsZS52aWRlb09yaWVudGF0aW9uKCk7CisgICAgICAgIGlmIChzYW1wbGUudmlkZW9Sb3RhdGlv bigpICE9IG1fdmlkZW9Sb3RhdGlvbiB8fCBzYW1wbGUudmlkZW9NaXJyb3JlZCgpICE9IG1fdmlk ZW9NaXJyb3JlZCkgeworICAgICAgICAgICAgbV92aWRlb1JvdGF0aW9uID0gc2FtcGxlLnZpZGVv Um90YXRpb24oKTsKICAgICAgICAgICAgIG1fdmlkZW9NaXJyb3JlZCA9IHNhbXBsZS52aWRlb01p cnJvcmVkKCk7CiAgICAgICAgICAgICBydW5XaXRob3V0QW5pbWF0aW9ucyhbdGhpcywgJnNhbXBs ZV0gewogICAgICAgICAgICAgICAgIG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyLmdldCgpLmFm ZmluZVRyYW5zZm9ybSA9IHZpZGVvVHJhbnNmb3JtYXRpb25NYXRyaXgoc2FtcGxlLCB0cnVlKTsK QEAgLTExMjEsNyArMTExMyw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1B VkZPYmoKIAogICAgIGF1dG8gYmFja2dyb3VuZEJvdW5kcyA9IG1fYmFja2dyb3VuZExheWVyLmdl dCgpLmJvdW5kczsKICAgICBhdXRvIHZpZGVvQm91bmRzID0gYmFja2dyb3VuZEJvdW5kczsKLSAg ICBpZiAobV92aWRlb09yaWVudGF0aW9uID09IE1lZGlhU2FtcGxlOjpWaWRlb09yaWVudGF0aW9u OjpMYW5kc2NhcGVSaWdodCB8fCBtX3ZpZGVvT3JpZW50YXRpb24gPT0gTWVkaWFTYW1wbGU6OlZp ZGVvT3JpZW50YXRpb246OkxhbmRzY2FwZUxlZnQpCisgICAgaWYgKG1fdmlkZW9Sb3RhdGlvbiA9 PSBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6UmlnaHQgfHwgbV92aWRlb1JvdGF0aW9uID09 IE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpMZWZ0KQogICAgICAgICBzdGQ6OnN3YXAodmlk ZW9Cb3VuZHMuc2l6ZS53aWR0aCwgdmlkZW9Cb3VuZHMuc2l6ZS5oZWlnaHQpOwogCiAgICAgbV9z YW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIuZ2V0KCkuYm91bmRzID0gdmlkZW9Cb3VuZHM7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVT b3VyY2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCShyZXZpc2lvbiAyMTUwNDMpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2Uu bW0JKHdvcmtpbmcgY29weSkKQEAgLTQyOCwyNSArNDI4LDQwIEBAIHZvaWQgQVZWaWRlb0NhcHR1 cmVTb3VyY2U6OnByb2Nlc3NOZXdGcmEKICAgICBtX2J1ZmZlciA9IHNhbXBsZUJ1ZmZlcjsKICAg ICBtX2xhc3RJbWFnZSA9IG51bGxwdHI7CiAKLSAgICBNZWRpYVNhbXBsZTo6VmlkZW9PcmllbnRh dGlvbiBvcmllbnRhdGlvbiA9IE1lZGlhU2FtcGxlOjpWaWRlb09yaWVudGF0aW9uOjpVbmtub3du OworICAgIE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9uIHJvdGF0aW9uOworI2lmIFBMQVRGT1JN KElPUykKICAgICBzd2l0Y2ggKFtjb25uZWN0aW9uIHZpZGVvT3JpZW50YXRpb25dKSB7CiAgICAg Y2FzZSBBVkNhcHR1cmVWaWRlb09yaWVudGF0aW9uUG9ydHJhaXQ6Ci0gICAgICAgIG9yaWVudGF0 aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVvT3JpZW50YXRpb246OlBvcnRyYWl0OworICAgICAgICBy b3RhdGlvbiA9IE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpVcHNpZGVEb3duOwogICAgICAg ICBicmVhazsKICAgICBjYXNlIEFWQ2FwdHVyZVZpZGVvT3JpZW50YXRpb25Qb3J0cmFpdFVwc2lk ZURvd246Ci0gICAgICAgIG9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVvT3JpZW50YXRp b246OlBvcnRyYWl0VXBzaWRlRG93bjsKKyAgICAgICAgcm90YXRpb24gPSBNZWRpYVNhbXBsZTo6 VmlkZW9Sb3RhdGlvbjo6Tm9uZTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBVkNhcHR1cmVW aWRlb09yaWVudGF0aW9uTGFuZHNjYXBlUmlnaHQ6Ci0gICAgICAgIG9yaWVudGF0aW9uID0gTWVk aWFTYW1wbGU6OlZpZGVvT3JpZW50YXRpb246OkxhbmRzY2FwZVJpZ2h0OworICAgIGNhc2UgQVZD YXB0dXJlVmlkZW9PcmllbnRhdGlvbkxhbmRzY2FwZUxlZnQ6CisgICAgICAgIHJvdGF0aW9uID0g TWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246OlJpZ2h0OworICAgICAgICBicmVhazsKKyAgICB9 CisjZWxzZQorICAgIHN3aXRjaCAoW2Nvbm5lY3Rpb24gdmlkZW9PcmllbnRhdGlvbl0pIHsKKyAg ICBjYXNlIEFWQ2FwdHVyZVZpZGVvT3JpZW50YXRpb25Qb3J0cmFpdDoKKyAgICAgICAgcm90YXRp b24gPSBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6Tm9uZTsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBBVkNhcHR1cmVWaWRlb09yaWVudGF0aW9uUG9ydHJhaXRVcHNpZGVEb3duOgorICAg ICAgICByb3RhdGlvbiA9IE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpVcHNpZGVEb3duOwor ICAgICAgICBicmVhazsKKyAgICBjYXNlIEFWQ2FwdHVyZVZpZGVvT3JpZW50YXRpb25MYW5kc2Nh cGVSaWdodDoKKyAgICAgICAgcm90YXRpb24gPSBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6 UmlnaHQ7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQVZDYXB0dXJlVmlkZW9PcmllbnRhdGlv bkxhbmRzY2FwZUxlZnQ6Ci0gICAgICAgIG9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVv T3JpZW50YXRpb246OkxhbmRzY2FwZUxlZnQ7CisgICAgICAgIHJvdGF0aW9uID0gTWVkaWFTYW1w bGU6OlZpZGVvUm90YXRpb246OkxlZnQ7CiAgICAgICAgIGJyZWFrOwogICAgIH0KKyNlbmRpZgog CiAgICAgYm9vbCBzZXR0aW5nc0NoYW5nZWQgPSBmYWxzZTsKICAgICBDTVZpZGVvRGltZW5zaW9u cyBkaW1lbnNpb25zID0gQ01WaWRlb0Zvcm1hdERlc2NyaXB0aW9uR2V0RGltZW5zaW9ucyhmb3Jt YXREZXNjcmlwdGlvbik7Ci0gICAgaWYgKG9yaWVudGF0aW9uID09IE1lZGlhU2FtcGxlOjpWaWRl b09yaWVudGF0aW9uOjpMYW5kc2NhcGVSaWdodCB8fCBvcmllbnRhdGlvbiA9PSBNZWRpYVNhbXBs ZTo6VmlkZW9PcmllbnRhdGlvbjo6TGFuZHNjYXBlTGVmdCkKKyAgICBpZiAocm90YXRpb24gPT0g TWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246OlJpZ2h0IHx8IHJvdGF0aW9uID09IE1lZGlhU2Ft cGxlOjpWaWRlb1JvdGF0aW9uOjpMZWZ0KQogICAgICAgICBzdGQ6OnN3YXAoZGltZW5zaW9ucy53 aWR0aCwgZGltZW5zaW9ucy5oZWlnaHQpOwogCiAgICAgaWYgKGRpbWVuc2lvbnMud2lkdGggIT0g bV93aWR0aCB8fCBkaW1lbnNpb25zLmhlaWdodCAhPSBtX2hlaWdodCkgewpAQCAtNDU4LDcgKzQ3 Myw3IEBAIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnByb2Nlc3NOZXdGcmEKICAgICBpZiAo c2V0dGluZ3NDaGFuZ2VkKQogICAgICAgICBzZXR0aW5nc0RpZENoYW5nZSgpOwogCi0gICAgdmlk ZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFTYW1wbGVBVkZPYmpDOjpjcmVhdGUobV9idWZmZXIuZ2V0 KCksIG9yaWVudGF0aW9uLCBbY29ubmVjdGlvbiBpc1ZpZGVvTWlycm9yZWRdKSk7CisgICAgdmlk ZW9TYW1wbGVBdmFpbGFibGUoTWVkaWFTYW1wbGVBVkZPYmpDOjpjcmVhdGUobV9idWZmZXIuZ2V0 KCksIHJvdGF0aW9uLCBbY29ubmVjdGlvbiBpc1ZpZGVvTWlycm9yZWRdKSk7CiB9CiAKIHZvaWQg QVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVPdXRwdXREaWRPdXRwdXRTYW1wbGVCdWZmZXJG cm9tQ29ubmVjdGlvbihBVkNhcHR1cmVPdXRwdXRUeXBlKiwgQ01TYW1wbGVCdWZmZXJSZWYgc2Ft cGxlQnVmZmVyLCBBVkNhcHR1cmVDb25uZWN0aW9uVHlwZSogY2FwdHVyZUNvbm5lY3Rpb24pCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNv bWluZ1ZpZGVvU291cmNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlLmNwcAkocmV2aXNp b24gMjE1MDQzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1Jl YWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MSwzMSAr MTcxLDMxIEBAIHZvaWQgUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlOjpPbkZyYW0KICAgICB1 bnNpZ25lZCB3aWR0aCA9IGZyYW1lLndpZHRoKCk7CiAgICAgdW5zaWduZWQgaGVpZ2h0ID0gZnJh bWUuaGVpZ2h0KCk7CiAKLSAgICBNZWRpYVNhbXBsZTo6VmlkZW9PcmllbnRhdGlvbiBvcmllbnRh dGlvbjsKKyAgICBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbiByb3RhdGlvbjsKICAgICBzd2l0 Y2ggKGZyYW1lLnJvdGF0aW9uKCkpIHsKICAgICBjYXNlIHdlYnJ0Yzo6a1ZpZGVvUm90YXRpb25f MDoKLSAgICAgICAgb3JpZW50YXRpb24gPSBNZWRpYVNhbXBsZTo6VmlkZW9PcmllbnRhdGlvbjo6 UG9ydHJhaXQ7CisgICAgICAgIHJvdGF0aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246 Ok5vbmU7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2Ugd2VicnRjOjprVmlkZW9Sb3RhdGlvbl8x ODA6Ci0gICAgICAgIG9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVvT3JpZW50YXRpb246 OlBvcnRyYWl0VXBzaWRlRG93bjsKKyAgICAgICAgcm90YXRpb24gPSBNZWRpYVNhbXBsZTo6Vmlk ZW9Sb3RhdGlvbjo6VXBzaWRlRG93bjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSB3ZWJydGM6 OmtWaWRlb1JvdGF0aW9uXzkwOgotICAgICAgICBvcmllbnRhdGlvbiA9IE1lZGlhU2FtcGxlOjpW aWRlb09yaWVudGF0aW9uOjpMYW5kc2NhcGVSaWdodDsKKyAgICAgICAgcm90YXRpb24gPSBNZWRp YVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6UmlnaHQ7CiAgICAgICAgIHN0ZDo6c3dhcCh3aWR0aCwg aGVpZ2h0KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSB3ZWJydGM6OmtWaWRlb1JvdGF0aW9u XzI3MDoKLSAgICAgICAgb3JpZW50YXRpb24gPSBNZWRpYVNhbXBsZTo6VmlkZW9PcmllbnRhdGlv bjo6TGFuZHNjYXBlTGVmdDsKKyAgICAgICAgcm90YXRpb24gPSBNZWRpYVNhbXBsZTo6VmlkZW9S b3RhdGlvbjo6TGVmdDsKICAgICAgICAgc3RkOjpzd2FwKHdpZHRoLCBoZWlnaHQpOwogICAgICAg ICBicmVhazsKICAgICB9CiAKICAgICBSZWZQdHI8UmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNl PiBwcm90ZWN0ZWRUaGlzKHRoaXMpOwotICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRo aXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBzYW1wbGUgPSBXVEZNb3ZlKHNhbXBsZSksIHdp ZHRoLCBoZWlnaHQsIG9yaWVudGF0aW9uXSB7Ci0gICAgICAgIHByb3RlY3RlZFRoaXMtPnByb2Nl c3NOZXdTYW1wbGUoc2FtcGxlLmdldCgpLCB3aWR0aCwgaGVpZ2h0LCBvcmllbnRhdGlvbik7Cisg ICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhp cyksIHNhbXBsZSA9IFdURk1vdmUoc2FtcGxlKSwgd2lkdGgsIGhlaWdodCwgcm90YXRpb25dIHsK KyAgICAgICAgcHJvdGVjdGVkVGhpcy0+cHJvY2Vzc05ld1NhbXBsZShzYW1wbGUuZ2V0KCksIHdp ZHRoLCBoZWlnaHQsIHJvdGF0aW9uKTsKICAgICB9KTsKIH0KIAotdm9pZCBSZWFsdGltZUluY29t aW5nVmlkZW9Tb3VyY2U6OnByb2Nlc3NOZXdTYW1wbGUoQ01TYW1wbGVCdWZmZXJSZWYgc2FtcGxl LCB1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCBNZWRpYVNhbXBsZTo6VmlkZW9Pcmll bnRhdGlvbiBvcmllbnRhdGlvbikKK3ZvaWQgUmVhbHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlOjpw cm9jZXNzTmV3U2FtcGxlKENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZSwgdW5zaWduZWQgd2lkdGgs IHVuc2lnbmVkIGhlaWdodCwgTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb24gcm90YXRpb24pCiB7 CiAgICAgbV9idWZmZXIgPSBzYW1wbGU7CiAgICAgaWYgKHdpZHRoICE9IG1fY3VycmVudFNldHRp bmdzLndpZHRoKCkgfHwgaGVpZ2h0ICE9IG1fY3VycmVudFNldHRpbmdzLmhlaWdodCgpKSB7CkBA IC0yMDQsNyArMjA0LDcgQEAgdm9pZCBSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2U6OnByb2Nl cwogICAgICAgICBzZXR0aW5nc0RpZENoYW5nZSgpOwogICAgIH0KIAotICAgIHZpZGVvU2FtcGxl QXZhaWxhYmxlKE1lZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlKHNhbXBsZSwgb3JpZW50YXRpb24p KTsKKyAgICB2aWRlb1NhbXBsZUF2YWlsYWJsZShNZWRpYVNhbXBsZUFWRk9iakM6OmNyZWF0ZShz YW1wbGUsIHJvdGF0aW9uKSk7CiB9CiAKIFJlZlB0cjxSZWFsdGltZU1lZGlhU291cmNlQ2FwYWJp bGl0aWVzPiBSZWFsdGltZUluY29taW5nVmlkZW9Tb3VyY2U6OmNhcGFiaWxpdGllcygpIGNvbnN0 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJ bmNvbWluZ1ZpZGVvU291cmNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdWaWRlb1NvdXJjZS5oCShyZXZpc2lv biAyMTUwNDMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVh bHRpbWVJbmNvbWluZ1ZpZGVvU291cmNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY0LDcgKzY0LDcg QEAgcHJpdmF0ZToKICAgICBNZWRpYUNvbnN0cmFpbnRzJiBjb25zdHJhaW50cygpIHsgcmV0dXJu ICptX2NvbnN0cmFpbnRzLmdldCgpOyB9CiAgICAgUmVhbHRpbWVNZWRpYVNvdXJjZVN1cHBvcnRl ZENvbnN0cmFpbnRzJiBzdXBwb3J0ZWRDb25zdHJhaW50cygpOwogCi0gICAgdm9pZCBwcm9jZXNz TmV3U2FtcGxlKENNU2FtcGxlQnVmZmVyUmVmLCB1bnNpZ25lZCwgdW5zaWduZWQsIE1lZGlhU2Ft cGxlOjpWaWRlb09yaWVudGF0aW9uKTsKKyAgICB2b2lkIHByb2Nlc3NOZXdTYW1wbGUoQ01TYW1w bGVCdWZmZXJSZWYsIHVuc2lnbmVkLCB1bnNpZ25lZCwgTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRp b24pOwogCiAgICAgYm9vbCBpc1Byb2R1Y2luZ0RhdGEoKSBjb25zdCBmaW5hbCB7IHJldHVybiBt X2lzUHJvZHVjaW5nRGF0YSAmJiBtX2J1ZmZlcjsgfQogICAgIGJvb2wgYXBwbHlTaXplKGNvbnN0 IEludFNpemUmKSBmaW5hbCB7IHJldHVybiB0cnVlOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVPdXRnb2luZ1ZpZGVvU291cmNlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVh bHRpbWVPdXRnb2luZ1ZpZGVvU291cmNlLmNwcAkocmV2aXNpb24gMjE1MDQzKQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lT3V0Z29pbmdWaWRlb1Nv dXJjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMSwxOCArMTIxLDE3IEBAIHZvaWQgUmVhbHRp bWVPdXRnb2luZ1ZpZGVvU291cmNlOjp2aWRlb1MKICAgICBhdXRvIHBpeGVsRm9ybWF0VHlwZSA9 IENWUGl4ZWxCdWZmZXJHZXRQaXhlbEZvcm1hdFR5cGUocGl4ZWxCdWZmZXIpOwogCiAgICAgd2Vi cnRjOjpWaWRlb1JvdGF0aW9uIHJvdGF0aW9uOwotICAgIHN3aXRjaCAoc2FtcGxlLnZpZGVvT3Jp ZW50YXRpb24oKSkgewotICAgIGNhc2UgTWVkaWFTYW1wbGU6OlZpZGVvT3JpZW50YXRpb246OlVu a25vd246Ci0gICAgY2FzZSBNZWRpYVNhbXBsZTo6VmlkZW9PcmllbnRhdGlvbjo6UG9ydHJhaXQ6 CisgICAgc3dpdGNoIChzYW1wbGUudmlkZW9Sb3RhdGlvbigpKSB7CisgICAgY2FzZSBNZWRpYVNh bXBsZTo6VmlkZW9Sb3RhdGlvbjo6Tm9uZToKICAgICAgICAgcm90YXRpb24gPSB3ZWJydGM6OmtW aWRlb1JvdGF0aW9uXzA7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgTWVkaWFTYW1wbGU6OlZp ZGVvT3JpZW50YXRpb246OlBvcnRyYWl0VXBzaWRlRG93bjoKKyAgICBjYXNlIE1lZGlhU2FtcGxl OjpWaWRlb1JvdGF0aW9uOjpVcHNpZGVEb3duOgogICAgICAgICByb3RhdGlvbiA9IHdlYnJ0Yzo6 a1ZpZGVvUm90YXRpb25fMTgwOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIE1lZGlhU2FtcGxl OjpWaWRlb09yaWVudGF0aW9uOjpMYW5kc2NhcGVSaWdodDoKKyAgICBjYXNlIE1lZGlhU2FtcGxl OjpWaWRlb1JvdGF0aW9uOjpSaWdodDoKICAgICAgICAgcm90YXRpb24gPSB3ZWJydGM6OmtWaWRl b1JvdGF0aW9uXzkwOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIE1lZGlhU2FtcGxlOjpWaWRl b09yaWVudGF0aW9uOjpMYW5kc2NhcGVMZWZ0OgorICAgIGNhc2UgTWVkaWFTYW1wbGU6OlZpZGVv Um90YXRpb246OkxlZnQ6CiAgICAgICAgIHJvdGF0aW9uID0gd2VicnRjOjprVmlkZW9Sb3RhdGlv bl8yNzA7CiAgICAgICAgIGJyZWFrOwogICAgIH0K