62046 2011-06-03 13:17:53 -0700 Allow existing AudioParams to use scheduled parameter changes 2011-06-03 16:03:17 -0700 1 1 1 Unclassified WebKit Web Audio 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 crogers crogers crogers kbr oldest_to_newest 415125 0 crogers 2011-06-03 13:17:53 -0700 Allow existing AudioParams to use scheduled parameter changes 415129 1 95956 crogers 2011-06-03 13:24:53 -0700 Created attachment 95956 Patch 415139 2 95956 kbr 2011-06-03 13:42:10 -0700 Comment on attachment 95956 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95956&action=review Looks good to me. One minor comment. > Source/WebCore/platform/audio/AudioBus.cpp:385 > + const float* source = sourceBus.channel(channelIndex)->data(); > + float* destination = channel(channelIndex)->data(); > + for (unsigned i = 0; i < numberOfGainValues; ++i) > + destination[i] = source[i] * gainValues[i]; > + } > + } else if (sourceBus.numberOfChannels() == 1) { > + const float* source = sourceBus.channel(0)->data(); > + for (unsigned channelIndex = 0; channelIndex < numberOfChannels(); ++channelIndex) { > + float* destination = channel(channelIndex)->data(); > + for (unsigned i = 0; i < numberOfGainValues; ++i) > + destination[i] = source[i] * gainValues[i]; Would be nice to avoid the duplicated code. 415195 3 95956 crogers 2011-06-03 14:18:21 -0700 Comment on attachment 95956 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95956&action=review >> Source/WebCore/platform/audio/AudioBus.cpp:385 >> + destination[i] = source[i] * gainValues[i]; > > Would be nice to avoid the duplicated code. Agreed. I'll try to coalesce these two cases. 415263 4 crogers 2011-06-03 16:03:17 -0700 Committed r88074: <http://trac.webkit.org/changeset/88074> 95956 2011-06-03 13:24:53 -0700 2011-06-03 14:18:21 -0700 Patch bug-62046-20110603132452.patch text/plain 9630 crogers SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MDQxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDYtMDMgIENocmlzIFJv Z2VycyAgPGNyb2dlcnNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBbGxvdyBleGlzdGluZyBBdWRpb1BhcmFtcyB0byB1c2Ugc2No ZWR1bGVkIHBhcmFtZXRlciBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MjA0NgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSBhdWRp byBBUEkgaXMgbm90IHlldCBpbXBsZW1lbnRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlv L0F1ZGlvQnVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvQnVzOjpwcm9jZXNzV2l0aEdh aW5Gcm9tKToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvQnVzOjpjb3B5V2l0aFNhbXBsZUFjY3Vy YXRlR2FpblZhbHVlc0Zyb20pOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL0F1ZGlvQnVzLmg6 CisgICAgICAgICogd2ViYXVkaW8vQXVkaW9CdWZmZXJTb3VyY2VOb2RlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkF1ZGlvQnVmZmVyU291cmNlTm9kZTo6QXVkaW9CdWZmZXJTb3VyY2VOb2RlKToK KyAgICAgICAgKiB3ZWJhdWRpby9BdWRpb0dhaW5Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkF1ZGlvR2Fpbk5vZGU6OkF1ZGlvR2Fpbk5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9H YWluTm9kZTo6cHJvY2Vzcyk6CisgICAgICAgICogd2ViYXVkaW8vQXVkaW9HYWluTm9kZS5oOgor ICAgICAgICAqIHdlYmF1ZGlvL0hpZ2hQYXNzMkZpbHRlck5vZGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SGlnaFBhc3MyRmlsdGVyTm9kZTo6SGlnaFBhc3MyRmlsdGVyTm9kZSk6CisgICAgICAg ICogd2ViYXVkaW8vTG93UGFzczJGaWx0ZXJOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxv d1Bhc3MyRmlsdGVyTm9kZTo6TG93UGFzczJGaWx0ZXJOb2RlKToKKwogMjAxMS0wNi0wMyAgUm9i IEJ1aXMgIDxyYnVpc0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmlt bWVybWFubi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvQnVzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb0J1cy5j cHAJKHJldmlzaW9uIDg4MDM2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVk aW9CdXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzYsOCArMzM2LDEwIEBAIHZvaWQgQXVkaW9C dXM6OnByb2Nlc3NXaXRoR2FpbkZyb20oY29uc3QKIHsKICAgICAvLyBNYWtlIHN1cmUgd2UncmUg c3VtbWluZyBmcm9tIHNhbWUgdHlwZSBvZiBidXMuCiAgICAgLy8gV2UgKmFyZSogYWJsZSB0byBz dW0gZnJvbSBtb25vIC0+IHN0ZXJlbwotICAgIGlmIChzb3VyY2VCdXMubnVtYmVyT2ZDaGFubmVs cygpICE9IDEgJiYgIXRvcG9sb2d5TWF0Y2hlcyhzb3VyY2VCdXMpKQorICAgIGlmIChzb3VyY2VC dXMubnVtYmVyT2ZDaGFubmVscygpICE9IDEgJiYgIXRvcG9sb2d5TWF0Y2hlcyhzb3VyY2VCdXMp KSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm47CisgICAg fQogCiAgICAgLy8gRGlzcGF0Y2ggZm9yIGRpZmZlcmVudCBjaGFubmVsIGxheW91dHMKICAgICBz d2l0Y2ggKG51bWJlck9mQ2hhbm5lbHMoKSkgewpAQCAtMzUzLDYgKzM1NSwzOSBAQCB2b2lkIEF1 ZGlvQnVzOjpwcm9jZXNzV2l0aEdhaW5Gcm9tKGNvbnN0CiAgICAgfQogfQogCit2b2lkIEF1ZGlv QnVzOjpjb3B5V2l0aFNhbXBsZUFjY3VyYXRlR2FpblZhbHVlc0Zyb20oY29uc3QgQXVkaW9CdXMg JnNvdXJjZUJ1cywgZmxvYXQqIGdhaW5WYWx1ZXMsIHVuc2lnbmVkIG51bWJlck9mR2FpblZhbHVl cykKK3sKKyAgICAvLyBNYWtlIHN1cmUgd2UncmUgcHJvY2Vzc2luZyBmcm9tIHRoZSBzYW1lIHR5 cGUgb2YgYnVzLgorICAgIC8vIFdlICphcmUqIGFibGUgdG8gcHJvY2VzcyBmcm9tIG1vbm8gLT4g c3RlcmVvCisgICAgaWYgKHNvdXJjZUJ1cy5udW1iZXJPZkNoYW5uZWxzKCkgIT0gMSAmJiAhdG9w b2xvZ3lNYXRjaGVzKHNvdXJjZUJ1cykpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoIWdhaW5WYWx1ZXMgfHwgbnVtYmVy T2ZHYWluVmFsdWVzID4gc291cmNlQnVzLmxlbmd0aCgpKSB7CisgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gRklYTUU6IHRoaXMg Y2FuIHBvdGVudGlhbGx5IHVzZSBTSU1EIG9wdGltaXphdGlvbnMgd2l0aCB2ZWN0b3IgbGlicmFy aWVzLgorICAgIGlmIChudW1iZXJPZkNoYW5uZWxzKCkgPT0gc291cmNlQnVzLm51bWJlck9mQ2hh bm5lbHMoKSkgeworICAgICAgICBmb3IgKHVuc2lnbmVkIGNoYW5uZWxJbmRleCA9IDA7IGNoYW5u ZWxJbmRleCA8IG51bWJlck9mQ2hhbm5lbHMoKTsgKytjaGFubmVsSW5kZXgpIHsKKyAgICAgICAg ICAgIGNvbnN0IGZsb2F0KiBzb3VyY2UgPSBzb3VyY2VCdXMuY2hhbm5lbChjaGFubmVsSW5kZXgp LT5kYXRhKCk7CisgICAgICAgICAgICBmbG9hdCogZGVzdGluYXRpb24gPSBjaGFubmVsKGNoYW5u ZWxJbmRleCktPmRhdGEoKTsKKyAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBu dW1iZXJPZkdhaW5WYWx1ZXM7ICsraSkKKyAgICAgICAgICAgICAgICBkZXN0aW5hdGlvbltpXSA9 IHNvdXJjZVtpXSAqIGdhaW5WYWx1ZXNbaV07CisgICAgICAgIH0KKyAgICB9IGVsc2UgaWYgKHNv dXJjZUJ1cy5udW1iZXJPZkNoYW5uZWxzKCkgPT0gMSkgeworICAgICAgICBjb25zdCBmbG9hdCog c291cmNlID0gc291cmNlQnVzLmNoYW5uZWwoMCktPmRhdGEoKTsKKyAgICAgICAgZm9yICh1bnNp Z25lZCBjaGFubmVsSW5kZXggPSAwOyBjaGFubmVsSW5kZXggPCBudW1iZXJPZkNoYW5uZWxzKCk7 ICsrY2hhbm5lbEluZGV4KSB7CisgICAgICAgICAgICBmbG9hdCogZGVzdGluYXRpb24gPSBjaGFu bmVsKGNoYW5uZWxJbmRleCktPmRhdGEoKTsKKyAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBudW1iZXJPZkdhaW5WYWx1ZXM7ICsraSkKKyAgICAgICAgICAgICAgICBkZXN0aW5h dGlvbltpXSA9IHNvdXJjZVtpXSAqIGdhaW5WYWx1ZXNbaV07CisgICAgICAgIH0KKyAgICB9IGVs c2UKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cit9CisKIHZvaWQgQXVkaW9CdXM6OmNv cHlXaXRoR2FpbkZyb20oY29uc3QgQXVkaW9CdXMgJnNvdXJjZUJ1cywgZG91YmxlKiBsYXN0TWl4 R2FpbiwgZG91YmxlIHRhcmdldEdhaW4pCiB7CiAgICAgcHJvY2Vzc1dpdGhHYWluRnJvbShzb3Vy Y2VCdXMsIGxhc3RNaXhHYWluLCB0YXJnZXRHYWluLCBmYWxzZSk7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb0J1cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvQnVzLmgJKHJldmlzaW9uIDg4MDM2KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9CdXMuaAkod29ya2luZyBjb3B5KQpAQCAtMTI0 LDYgKzEyNCw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGNvcHlXaXRoR2FpbkZyb20oY29uc3QgQXVk aW9CdXMgJnNvdXJjZUJ1cywgZG91YmxlKiBsYXN0TWl4R2FpbiwgZG91YmxlIHRhcmdldEdhaW4p OwogICAgIHZvaWQgc3VtV2l0aEdhaW5Gcm9tKGNvbnN0IEF1ZGlvQnVzICZzb3VyY2VCdXMsIGRv dWJsZSogbGFzdE1peEdhaW4sIGRvdWJsZSB0YXJnZXRHYWluKTsKIAorICAgIC8vIENvcGllcyB0 aGUgc291cmNlQnVzIGJ5IHNjYWxpbmcgd2l0aCBzYW1wbGUtYWNjdXJhdGUgZ2FpbiB2YWx1ZXMu CisgICAgdm9pZCBjb3B5V2l0aFNhbXBsZUFjY3VyYXRlR2FpblZhbHVlc0Zyb20oY29uc3QgQXVk aW9CdXMgJnNvdXJjZUJ1cywgZmxvYXQqIGdhaW5WYWx1ZXMsIHVuc2lnbmVkIG51bWJlck9mR2Fp blZhbHVlcyk7CisKICAgICAvLyBSZXR1cm5zIG1heGltdW0gYWJzb2x1dGUgdmFsdWUgYWNyb3Nz IGFsbCBjaGFubmVscyAodXNlZnVsIGZvciBub3JtYWxpemF0aW9uKS4KICAgICBmbG9hdCBtYXhB YnNWYWx1ZSgpIGNvbnN0OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS93ZWJhdWRpby9BdWRpb0J1 ZmZlclNvdXJjZU5vZGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlv L0F1ZGlvQnVmZmVyU291cmNlTm9kZS5jcHAJKHJldmlzaW9uIDg4MDM2KQorKysgU291cmNlL1dl YkNvcmUvd2ViYXVkaW8vQXVkaW9CdWZmZXJTb3VyY2VOb2RlLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjYsNiArNjYsOSBAQCBBdWRpb0J1ZmZlclNvdXJjZU5vZGU6OkF1ZGlvQnVmZmVyU291cmNl CiAKICAgICBtX2dhaW4gPSBBdWRpb0dhaW46OmNyZWF0ZSgiZ2FpbiIsIDEuMCwgMC4wLCAxLjAp OwogICAgIG1fcGxheWJhY2tSYXRlID0gQXVkaW9QYXJhbTo6Y3JlYXRlKCJwbGF5YmFja1JhdGUi LCAxLjAsIDAuMCwgQXVkaW9SZXNhbXBsZXI6Ok1heFJhdGUpOworICAgIAorICAgIG1fZ2Fpbi0+ c2V0Q29udGV4dChjb250ZXh0KTsKKyAgICBtX3BsYXliYWNrUmF0ZS0+c2V0Q29udGV4dChjb250 ZXh0KTsKIAogICAgIC8vIERlZmF1bHQgdG8gbW9uby4gIEEgY2FsbCB0byBzZXRCdWZmZXIoKSB3 aWxsIHNldCB0aGUgbnVtYmVyIG9mIG91dHB1dCBjaGFubmVscyB0byB0aGF0IG9mIHRoZSBidWZm ZXIuCiAgICAgYWRkT3V0cHV0KGFkb3B0UHRyKG5ldyBBdWRpb05vZGVPdXRwdXQodGhpcywgMSkp KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlvL0F1ZGlvR2Fpbk5vZGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlvL0F1ZGlvR2Fpbk5vZGUuY3BwCShyZXZp c2lvbiA4ODAzNikKKysrIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlvL0F1ZGlvR2Fpbk5vZGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw4ICszNywxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBB dWRpb0dhaW5Ob2RlOjpBdWRpb0dhaW5Ob2RlKEF1ZGlvQ29udGV4dCogY29udGV4dCwgZG91Ymxl IHNhbXBsZVJhdGUpCiAgICAgOiBBdWRpb05vZGUoY29udGV4dCwgc2FtcGxlUmF0ZSkKICAgICAs IG1fbGFzdEdhaW4oMS4wKQorICAgICwgbV9zYW1wbGVBY2N1cmF0ZUdhaW5WYWx1ZXMoQXVkaW9O b2RlOjpQcm9jZXNzaW5nU2l6ZUluRnJhbWVzKSAvLyBGSVhNRTogY2FuIHByb2JhYmx5IHNoYXJl IHRlbXAgYnVmZmVyIGluIGNvbnRleHQKIHsKICAgICBtX2dhaW4gPSBBdWRpb0dhaW46OmNyZWF0 ZSgiZ2FpbiIsIDEuMCwgMC4wLCAxLjApOworICAgIG1fZ2Fpbi0+c2V0Q29udGV4dChjb250ZXh0 KTsKIAogICAgIGFkZElucHV0KGFkb3B0UHRyKG5ldyBBdWRpb05vZGVJbnB1dCh0aGlzKSkpOwog ICAgIGFkZE91dHB1dChhZG9wdFB0cihuZXcgQXVkaW9Ob2RlT3V0cHV0KHRoaXMsIDEpKSk7CkBA IC00OCw5ICs1MCw5IEBAIEF1ZGlvR2Fpbk5vZGU6OkF1ZGlvR2Fpbk5vZGUoQXVkaW9Db250ZXgK ICAgICBpbml0aWFsaXplKCk7CiB9CiAKLXZvaWQgQXVkaW9HYWluTm9kZTo6cHJvY2VzcyhzaXpl X3QgLypmcmFtZXNUb1Byb2Nlc3MqLykKK3ZvaWQgQXVkaW9HYWluTm9kZTo6cHJvY2VzcyhzaXpl X3QgZnJhbWVzVG9Qcm9jZXNzKQogewotICAgIC8vIEZJWE1FOiB0aGVyZSBpcyBhIG5pY2Ugb3B0 aW1pemF0aW9uIHRvIGF2b2lkIHByb2Nlc3NpbmcgaGVyZSwgYW5kIGxldCB0aGUgZ2FpbiBjaGFu Z2UKKyAgICAvLyBGSVhNRTogZm9yIHNvbWUgY2FzZXMgdGhlcmUgaXMgYSBuaWNlIG9wdGltaXph dGlvbiB0byBhdm9pZCBwcm9jZXNzaW5nIGhlcmUsIGFuZCBsZXQgdGhlIGdhaW4gY2hhbmdlCiAg ICAgLy8gaGFwcGVuIGluIHRoZSBzdW1taW5nIGp1bmN0aW9uIGlucHV0IG9mIHRoZSBBdWRpb05v ZGUgd2UncmUgY29ubmVjdGVkIHRvLgogICAgIC8vIFRoZW4gd2UgY2FuIGF2b2lkIGFsbCBvZiB0 aGUgZm9sbG93aW5nOgogCkBAIC02NCw4ICs2NiwxOCBAQCB2b2lkIEF1ZGlvR2Fpbk5vZGU6OnBy b2Nlc3Moc2l6ZV90IC8qZnJhCiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgQXVkaW9CdXMq IGlucHV0QnVzID0gaW5wdXQoMCktPmJ1cygpOwogCi0gICAgICAgICAgICAvLyBBcHBseSB0aGUg Z2FpbiB3aXRoIGRlLXppcHBlcmluZyBpbnRvIHRoZSBvdXRwdXQgYnVzLgotICAgICAgICAgICAg b3V0cHV0QnVzLT5jb3B5V2l0aEdhaW5Gcm9tKCppbnB1dEJ1cywgJm1fbGFzdEdhaW4sIGdhaW4o KS0+dmFsdWUoKSk7CisgICAgICAgICAgICBpZiAoZ2FpbigpLT5oYXNUaW1lbGluZVZhbHVlcygp KSB7CisgICAgICAgICAgICAgICAgLy8gQXBwbHkgc2FtcGxlLWFjY3VyYXRlIGdhaW4gc2NhbGlu ZyBmb3IgcHJlY2lzZSBlbnZlbG9wZXMsIGdyYWluIHdpbmRvd3MsIGV0Yy4KKyAgICAgICAgICAg ICAgICBBU1NFUlQoZnJhbWVzVG9Qcm9jZXNzIDw9IG1fc2FtcGxlQWNjdXJhdGVHYWluVmFsdWVz LnNpemUoKSk7CisgICAgICAgICAgICAgICAgaWYgKGZyYW1lc1RvUHJvY2VzcyA8PSBtX3NhbXBs ZUFjY3VyYXRlR2FpblZhbHVlcy5zaXplKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgZmxvYXQq IGdhaW5WYWx1ZXMgPSBtX3NhbXBsZUFjY3VyYXRlR2FpblZhbHVlcy5kYXRhKCk7CisgICAgICAg ICAgICAgICAgICAgIGdhaW4oKS0+Y2FsY3VsYXRlU2FtcGxlQWNjdXJhdGVWYWx1ZXMoZ2FpblZh bHVlcywgZnJhbWVzVG9Qcm9jZXNzKTsKKyAgICAgICAgICAgICAgICAgICAgb3V0cHV0QnVzLT5j b3B5V2l0aFNhbXBsZUFjY3VyYXRlR2FpblZhbHVlc0Zyb20oKmlucHV0QnVzLCBnYWluVmFsdWVz LCBmcmFtZXNUb1Byb2Nlc3MpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICAgICAgLy8gQXBwbHkgdGhlIGdhaW4gd2l0aCBkZS16aXBwZXJpbmcg aW50byB0aGUgb3V0cHV0IGJ1cy4KKyAgICAgICAgICAgICAgICBvdXRwdXRCdXMtPmNvcHlXaXRo R2FpbkZyb20oKmlucHV0QnVzLCAmbV9sYXN0R2FpbiwgZ2FpbigpLT52YWx1ZSgpKTsKKyAgICAg ICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIG1fcHJvY2Vzc0xvY2sudW5sb2NrKCk7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS93ZWJhdWRpby9BdWRpb0dhaW5Ob2RlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvd2ViYXVkaW8vQXVkaW9HYWluTm9kZS5oCShyZXZpc2lvbiA4ODAz NikKKysrIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlvL0F1ZGlvR2Fpbk5vZGUuaAkod29ya2luZyBj b3B5KQpAQCAtNjAsNiArNjAsOCBAQCBwcml2YXRlOgogICAgIGRvdWJsZSBtX2xhc3RHYWluOyAv LyBmb3IgZGUtemlwcGVyaW5nCiAgICAgUmVmUHRyPEF1ZGlvR2Fpbj4gbV9nYWluOwogCisgICAg QXVkaW9GbG9hdEFycmF5IG1fc2FtcGxlQWNjdXJhdGVHYWluVmFsdWVzOworICAgIAogICAgIC8v IFRoaXMgc3luY2hyb25pemVzIGxpdmUgY2hhbm5lbCBjb3VudCBjaGFuZ2VzIHdoaWNoIHJlcXVp cmUgYW4gdW5pbml0aWFsaXphdGlvbiAvIHJlLWluaXRpYWxpemF0aW9uLgogICAgIC8vIEZJWE1F OiB0aGlzIGNhbiBnbyBhd2F5IHdoZW4gd2UgaW1wbGVtZW50IG9wdGltaXphdGlvbiBmb3IgbWl4 aW5nIHdpdGggZ2FpbiBkaXJlY3RseSBpbiBzdW1taW5nIGp1bmN0aW9uIG9mIEF1ZGlvTm9kZUlu cHV0LgogICAgIG11dGFibGUgTXV0ZXggbV9wcm9jZXNzTG9jazsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3dlYmF1ZGlvL0hpZ2hQYXNzMkZpbHRlck5vZGUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3dlYmF1ZGlvL0hpZ2hQYXNzMkZpbHRlck5vZGUuY3BwCShyZXZpc2lvbiA4ODAz NikKKysrIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlvL0hpZ2hQYXNzMkZpbHRlck5vZGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCw5IEBAIEhpZ2hQYXNzMkZpbHRlck5vZGU6OkhpZ2hQ YXNzMkZpbHRlck5vZGUKICAgICA6IEF1ZGlvQmFzaWNQcm9jZXNzb3JOb2RlKGNvbnRleHQsIHNh bXBsZVJhdGUpCiB7CiAgICAgbV9wcm9jZXNzb3IgPSBhZG9wdFB0cihuZXcgQmlxdWFkUHJvY2Vz c29yKEJpcXVhZFByb2Nlc3Nvcjo6SGlnaFBhc3MyLCBzYW1wbGVSYXRlLCAxLCBmYWxzZSkpOwor ICAgIGJpcXVhZFByb2Nlc3NvcigpLT5wYXJhbWV0ZXIxKCktPnNldENvbnRleHQoY29udGV4dCk7 CisgICAgYmlxdWFkUHJvY2Vzc29yKCktPnBhcmFtZXRlcjIoKS0+c2V0Q29udGV4dChjb250ZXh0 KTsKKyAgICBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyMygpLT5zZXRDb250ZXh0KGNvbnRl eHQpOwogICAgIHNldFR5cGUoTm9kZVR5cGVIaWdoUGFzczJGaWx0ZXIpOwogfQogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS93ZWJhdWRpby9Mb3dQYXNzMkZpbHRlck5vZGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlvL0xvd1Bhc3MyRmlsdGVyTm9kZS5jcHAJKHJldmlz aW9uIDg4MDM2KQorKysgU291cmNlL1dlYkNvcmUvd2ViYXVkaW8vTG93UGFzczJGaWx0ZXJOb2Rl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQsNiArMzQsOSBAQCBMb3dQYXNzMkZpbHRlck5vZGU6 Okxvd1Bhc3MyRmlsdGVyTm9kZShBCiAgICAgOiBBdWRpb0Jhc2ljUHJvY2Vzc29yTm9kZShjb250 ZXh0LCBzYW1wbGVSYXRlKQogewogICAgIG1fcHJvY2Vzc29yID0gYWRvcHRQdHIobmV3IEJpcXVh ZFByb2Nlc3NvcihCaXF1YWRQcm9jZXNzb3I6Okxvd1Bhc3MyLCBzYW1wbGVSYXRlLCAxLCBmYWxz ZSkpOworICAgIGJpcXVhZFByb2Nlc3NvcigpLT5wYXJhbWV0ZXIxKCktPnNldENvbnRleHQoY29u dGV4dCk7CisgICAgYmlxdWFkUHJvY2Vzc29yKCktPnBhcmFtZXRlcjIoKS0+c2V0Q29udGV4dChj b250ZXh0KTsKKyAgICBiaXF1YWRQcm9jZXNzb3IoKS0+cGFyYW1ldGVyMygpLT5zZXRDb250ZXh0 KGNvbnRleHQpOwogICAgIHNldFR5cGUoTm9kZVR5cGVMb3dQYXNzMkZpbHRlcik7CiB9CiAK