168796 2017-02-23 13:09:51 -0800 [WebRTC] RealtimeOutgoingAudioSource does not need to upsample audio buffers 2017-02-23 15:07:37 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf commit-queue eric.carlson jer.noble oldest_to_newest 1280455 0 youennf 2017-02-23 13:09:51 -0800 libwebrtc will do it on its own if needed 1280458 1 302566 youennf 2017-02-23 13:12:10 -0800 Created attachment 302566 Patch 1280486 2 302566 jer.noble 2017-02-23 14:12:21 -0800 Comment on attachment 302566 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302566&action=review > Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp:40 > -static inline AudioStreamBasicDescription libwebrtcAudioFormat(size_t channelCount) > +static inline AudioStreamBasicDescription libwebrtcAudioFormat(size_t sampleRate, size_t channelCount) sampleRate should probably be a float (or a Float64). 1280495 3 302576 youennf 2017-02-23 14:23:33 -0800 Created attachment 302576 Patch for landing 1280498 4 youennf 2017-02-23 14:24:09 -0800 Thanks for the review (In reply to comment #2) > Comment on attachment 302566 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=302566&action=review > > > Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp:40 > > -static inline AudioStreamBasicDescription libwebrtcAudioFormat(size_t channelCount) > > +static inline AudioStreamBasicDescription libwebrtcAudioFormat(size_t sampleRate, size_t channelCount) > > sampleRate should probably be a float (or a Float64). Done 1280521 5 302576 commit-queue 2017-02-23 15:07:33 -0800 Comment on attachment 302576 Patch for landing Clearing flags on attachment: 302576 Committed r212928: <http://trac.webkit.org/changeset/212928> 1280522 6 commit-queue 2017-02-23 15:07:37 -0800 All reviewed patches have been landed. Closing bug. 302566 2017-02-23 13:12:10 -0800 2017-02-23 14:23:30 -0800 Patch bug-168796-20170223130922.patch text/plain 4910 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzg4NmY2M2I3ODRhYWEx YmJmNTI5NDUyNWYyY2VlMmY2NThmNGNmOS4uMjgzNzFiYTQzOWI3MDVmOGU5ZmVlMmM4ZDk1NzI1 ZGY2MDA3NDM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE3LTAyLTIzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBbV2ViUlRDXSBSZWFsdGlt ZU91dGdvaW5nQXVkaW9Tb3VyY2UgZG9lcyBub3QgbmVlZCB0byB1cHNhbXBsZSBhdWRpbyBidWZm ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg3 OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3Zl cmVkIGJ5IG1hbnVhbCB0ZXN0aW5nLgorICAgICAgICBMaW1pdGluZyBSZWFsdGltZU91dGdvaW5n QXVkaW9Tb3VyY2UgY29udmVyc2lvbiB0byBpbnRlcmxlYXZpbmcgYW5kIGZsb2F0LXRvLWludGVn ZXIuCisgICAgICAgIFJlbW92ZWQgdGhlIHNhbXBsZSByYXRlIGNvbnZlcnNpb24uCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxpYndlYnJ0Y0F1ZGlvRm9ybWF0KToKKyAgICAgICAg KFdlYkNvcmU6OlJlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZTo6YXVkaW9TYW1wbGVzQXZhaWxh YmxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZTo6cHVs bEF1ZGlvRGF0YSk6CisKKzIwMTctMDItMjMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgorCiAgICAgICAgIFtXZWJSVENdIE91dGdvaW5nIHZpZGVvIHF1YWxpdHkgaXMgcG9vcgog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4Nzc4CiAg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDY3NDY3Mz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lT3V0 Z29pbmdBdWRpb1NvdXJjZS5jcHAKaW5kZXggOTYyM2ZiMmFkODgwNTg0Y2FlZjE2ZTk4ODk1MTFj ZTJmOWE5MzViZC4uMDk5OGY2NWZmNGE3MjQ3YmZkMTVlNzgwNGZhZTQxNGNhYzcwNDBjNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1l T3V0Z29pbmdBdWRpb1NvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL1JlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZS5jcHAKQEAgLTM3LDEwICsz NywxMCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBpbmxpbmUgQXVkaW9TdHJl YW1CYXNpY0Rlc2NyaXB0aW9uIGxpYndlYnJ0Y0F1ZGlvRm9ybWF0KHNpemVfdCBjaGFubmVsQ291 bnQpCitzdGF0aWMgaW5saW5lIEF1ZGlvU3RyZWFtQmFzaWNEZXNjcmlwdGlvbiBsaWJ3ZWJydGNB dWRpb0Zvcm1hdChzaXplX3Qgc2FtcGxlUmF0ZSwgc2l6ZV90IGNoYW5uZWxDb3VudCkKIHsKICAg ICBBdWRpb1N0cmVhbUJhc2ljRGVzY3JpcHRpb24gc3RyZWFtRm9ybWF0OwotICAgIEZpbGxPdXRB U0JERm9yTFBDTShzdHJlYW1Gb3JtYXQsIExpYldlYlJUQ0F1ZGlvRm9ybWF0OjpzYW1wbGVSYXRl LCBjaGFubmVsQ291bnQsIExpYldlYlJUQ0F1ZGlvRm9ybWF0OjpzYW1wbGVTaXplLCBMaWJXZWJS VENBdWRpb0Zvcm1hdDo6c2FtcGxlU2l6ZSwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OmlzRmxvYXQs IExpYldlYlJUQ0F1ZGlvRm9ybWF0Ojppc0JpZ0VuZGlhbiwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6 OmlzTm9uSW50ZXJsZWF2ZWQpOworICAgIEZpbGxPdXRBU0JERm9yTFBDTShzdHJlYW1Gb3JtYXQs IHNhbXBsZVJhdGUsIGNoYW5uZWxDb3VudCwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVNp emUsIExpYldlYlJUQ0F1ZGlvRm9ybWF0OjpzYW1wbGVTaXplLCBMaWJXZWJSVENBdWRpb0Zvcm1h dDo6aXNGbG9hdCwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OmlzQmlnRW5kaWFuLCBMaWJXZWJSVENB dWRpb0Zvcm1hdDo6aXNOb25JbnRlcmxlYXZlZCk7CiAgICAgcmV0dXJuIHN0cmVhbUZvcm1hdDsK IH0KIApAQCAtNjUsMTIgKzY1LDE0IEBAIHZvaWQgUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNl Ojpzb3VyY2VFbmFibGVkQ2hhbmdlZCgpCiAKIHZvaWQgUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291 cmNlOjphdWRpb1NhbXBsZXNBdmFpbGFibGUoY29uc3QgTWVkaWFUaW1lJiB0aW1lLCBjb25zdCBQ bGF0Zm9ybUF1ZGlvRGF0YSYgYXVkaW9EYXRhLCBjb25zdCBBdWRpb1N0cmVhbURlc2NyaXB0aW9u JiBzdHJlYW1EZXNjcmlwdGlvbiwgc2l6ZV90IHNhbXBsZUNvdW50KQogeworICAgIEFTU0VSVChz dHJlYW1EZXNjcmlwdGlvbi5udW1iZXJPZkNoYW5uZWxzKCkgPD0gMik7CisKICAgICBpZiAobV9p bnB1dFN0cmVhbURlc2NyaXB0aW9uICE9IHN0cmVhbURlc2NyaXB0aW9uKSB7CiAgICAgICAgIG1f aW5wdXRTdHJlYW1EZXNjcmlwdGlvbiA9IHRvQ0FBdWRpb1N0cmVhbURlc2NyaXB0aW9uKHN0cmVh bURlc2NyaXB0aW9uKTsKICAgICAgICAgYXV0byBzdGF0dXMgID0gbV9zYW1wbGVDb252ZXJ0ZXIt PnNldElucHV0Rm9ybWF0KG1faW5wdXRTdHJlYW1EZXNjcmlwdGlvbik7CiAgICAgICAgIEFTU0VS VF9VTlVTRUQoc3RhdHVzLCAhc3RhdHVzKTsKIAotICAgICAgICBzdGF0dXMgPSBtX3NhbXBsZUNv bnZlcnRlci0+c2V0T3V0cHV0Rm9ybWF0KGxpYndlYnJ0Y0F1ZGlvRm9ybWF0KHN0cmVhbURlc2Ny aXB0aW9uLm51bWJlck9mQ2hhbm5lbHMoKSkpOworICAgICAgICBzdGF0dXMgPSBtX3NhbXBsZUNv bnZlcnRlci0+c2V0T3V0cHV0Rm9ybWF0KGxpYndlYnJ0Y0F1ZGlvRm9ybWF0KHN0cmVhbURlc2Ny aXB0aW9uLnNhbXBsZVJhdGUoKSwgc3RyZWFtRGVzY3JpcHRpb24ubnVtYmVyT2ZDaGFubmVscygp KSk7CiAgICAgICAgIEFTU0VSVCghc3RhdHVzKTsKICAgICB9CiAgICAgbV9zYW1wbGVDb252ZXJ0 ZXItPnB1c2hTYW1wbGVzKHRpbWUsIGF1ZGlvRGF0YSwgc2FtcGxlQ291bnQpOwpAQCAtODIsNyAr ODQsOSBAQCB2b2lkIFJlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZTo6YXVkaW9TYW1wbGVzQXZh aWxhYmxlKGNvbnN0IE1lZGlhVGltZSYgdGltZSwgYwogCiB2b2lkIFJlYWx0aW1lT3V0Z29pbmdB dWRpb1NvdXJjZTo6cHVsbEF1ZGlvRGF0YSgpCiB7Ci0gICAgc2l6ZV90IGJ1ZmZlclNpemUgPSBM aWJXZWJSVENBdWRpb0Zvcm1hdDo6Y2h1bmtTYW1wbGVDb3VudCAqIExpYldlYlJUQ0F1ZGlvRm9y bWF0OjpzYW1wbGVCeXRlU2l6ZSAqIG1faW5wdXRTdHJlYW1EZXNjcmlwdGlvbi5udW1iZXJPZkNo YW5uZWxzKCk7CisgICAgLy8gbGlid2VicnRjIGV4cGVjdHMgMTAgbXMgY2h1bmtzLgorICAgIHNp emVfdCBjaHVua1NhbXBsZUNvdW50ID0gbV9pbnB1dFN0cmVhbURlc2NyaXB0aW9uLnNhbXBsZVJh dGUoKSAvIDEwMDsKKyAgICBzaXplX3QgYnVmZmVyU2l6ZSA9IGNodW5rU2FtcGxlQ291bnQgKiBM aWJXZWJSVENBdWRpb0Zvcm1hdDo6c2FtcGxlQnl0ZVNpemUgKiBtX2lucHV0U3RyZWFtRGVzY3Jp cHRpb24ubnVtYmVyT2ZDaGFubmVscygpOwogICAgIG1fYXVkaW9CdWZmZXIucmVzZXJ2ZUNhcGFj aXR5KGJ1ZmZlclNpemUpOwogCiAgICAgQXVkaW9CdWZmZXJMaXN0IGJ1ZmZlckxpc3Q7CkBAIC05 MSwxMCArOTUsMTAgQEAgdm9pZCBSZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2U6OnB1bGxBdWRp b0RhdGEoKQogICAgIGJ1ZmZlckxpc3QubUJ1ZmZlcnNbMF0ubURhdGFCeXRlU2l6ZSA9IGJ1ZmZl clNpemU7CiAgICAgYnVmZmVyTGlzdC5tQnVmZmVyc1swXS5tRGF0YSA9IG1fYXVkaW9CdWZmZXIu ZGF0YSgpOwogCi0gICAgbV9zYW1wbGVDb252ZXJ0ZXItPnB1bGxBdmFsYWlibGVTYW1wbGVzQXND aHVua3MoYnVmZmVyTGlzdCwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OmNodW5rU2FtcGxlQ291bnQs IG1fc3RhcnRGcmFtZSwgW3RoaXNdIHsKLSAgICAgICAgbV9zdGFydEZyYW1lICs9IExpYldlYlJU Q0F1ZGlvRm9ybWF0OjpjaHVua1NhbXBsZUNvdW50OworICAgIG1fc2FtcGxlQ29udmVydGVyLT5w dWxsQXZhbGFpYmxlU2FtcGxlc0FzQ2h1bmtzKGJ1ZmZlckxpc3QsIGNodW5rU2FtcGxlQ291bnQs IG1fc3RhcnRGcmFtZSwgW3RoaXMsIGNodW5rU2FtcGxlQ291bnRdIHsKKyAgICAgICAgbV9zdGFy dEZyYW1lICs9IGNodW5rU2FtcGxlQ291bnQ7CiAgICAgICAgIGZvciAoYXV0byBzaW5rIDogbV9z aW5rcykKLSAgICAgICAgICAgIHNpbmstPk9uRGF0YShtX2F1ZGlvQnVmZmVyLmRhdGEoKSwgTGli V2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVNpemUsIExpYldlYlJUQ0F1ZGlvRm9ybWF0OjpzYW1w bGVSYXRlLCBtX2lucHV0U3RyZWFtRGVzY3JpcHRpb24ubnVtYmVyT2ZDaGFubmVscygpLCBMaWJX ZWJSVENBdWRpb0Zvcm1hdDo6Y2h1bmtTYW1wbGVDb3VudCk7CisgICAgICAgICAgICBzaW5rLT5P bkRhdGEobV9hdWRpb0J1ZmZlci5kYXRhKCksIExpYldlYlJUQ0F1ZGlvRm9ybWF0OjpzYW1wbGVT aXplLCBtX2lucHV0U3RyZWFtRGVzY3JpcHRpb24uc2FtcGxlUmF0ZSgpLCBtX2lucHV0U3RyZWFt RGVzY3JpcHRpb24ubnVtYmVyT2ZDaGFubmVscygpLCBjaHVua1NhbXBsZUNvdW50KTsKICAgICB9 KTsKIH0KIAo= 302576 2017-02-23 14:23:33 -0800 2017-02-23 15:07:33 -0800 Patch for landing bug-168796-20170223142044.patch text/plain 4849 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyOTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc5ZjFjZmQ0NjY3ZjI4 OTIzMzM1YjhlOWI0NjQxYjk0MmRiYjc0My4uNjEwNjdhOGZlMzI4NTM4MTRkNzkxODM4MGE1MjNh NTk3NTkwZWMxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAyLTIzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBbV2ViUlRDXSBSZWFsdGlt ZU91dGdvaW5nQXVkaW9Tb3VyY2UgZG9lcyBub3QgbmVlZCB0byB1cHNhbXBsZSBhdWRpbyBidWZm ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg3 OTYKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAgQ292ZXJlZCBi eSBtYW51YWwgdGVzdGluZy4KKyAgICAgICAgTGltaXRpbmcgUmVhbHRpbWVPdXRnb2luZ0F1ZGlv U291cmNlIGNvbnZlcnNpb24gdG8gaW50ZXJsZWF2aW5nIGFuZCBmbG9hdC10by1pbnRlZ2VyLgor ICAgICAgICBSZW1vdmVkIHRoZSBzYW1wbGUgcmF0ZSBjb252ZXJzaW9uLgorCisgICAgICAgICog cGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpsaWJ3ZWJydGNBdWRpb0Zvcm1hdCk6CisgICAgICAgIChXZWJD b3JlOjpSZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2U6OmF1ZGlvU2FtcGxlc0F2YWlsYWJsZSk6 CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2U6OnB1bGxBdWRp b0RhdGEpOgorCiAyMDE3LTAyLTIzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVwb3J0IGRvbWFpbnMgdXNpbmcgYWJub3JtYWxseSBoaWdoIENQVSB1c2FnZSB2 aWEgZW5oYW5jZWQgcHJpdmFjeSBsb2dnaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZU91dGdvaW5n QXVkaW9Tb3VyY2UuY3BwCmluZGV4IDk2MjNmYjJhZDg4MDU4NGNhZWYxNmU5ODg5NTExY2UyZjlh OTM1YmQuLjJmNjVjNGEyOWViNDE3OTZlNTA3ZDI2NTc0NmM3Yjg3YmZlZWMzYTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZU91dGdv aW5nQXVkaW9Tb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL21hYy9SZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2UuY3BwCkBAIC0zNywxMCArMzcsMTAg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgaW5saW5lIEF1ZGlvU3RyZWFtQmFz aWNEZXNjcmlwdGlvbiBsaWJ3ZWJydGNBdWRpb0Zvcm1hdChzaXplX3QgY2hhbm5lbENvdW50KQor c3RhdGljIGlubGluZSBBdWRpb1N0cmVhbUJhc2ljRGVzY3JpcHRpb24gbGlid2VicnRjQXVkaW9G b3JtYXQoRmxvYXQ2NCBzYW1wbGVSYXRlLCBzaXplX3QgY2hhbm5lbENvdW50KQogewogICAgIEF1 ZGlvU3RyZWFtQmFzaWNEZXNjcmlwdGlvbiBzdHJlYW1Gb3JtYXQ7Ci0gICAgRmlsbE91dEFTQkRG b3JMUENNKHN0cmVhbUZvcm1hdCwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVJhdGUsIGNo YW5uZWxDb3VudCwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVNpemUsIExpYldlYlJUQ0F1 ZGlvRm9ybWF0OjpzYW1wbGVTaXplLCBMaWJXZWJSVENBdWRpb0Zvcm1hdDo6aXNGbG9hdCwgTGli V2ViUlRDQXVkaW9Gb3JtYXQ6OmlzQmlnRW5kaWFuLCBMaWJXZWJSVENBdWRpb0Zvcm1hdDo6aXNO b25JbnRlcmxlYXZlZCk7CisgICAgRmlsbE91dEFTQkRGb3JMUENNKHN0cmVhbUZvcm1hdCwgc2Ft cGxlUmF0ZSwgY2hhbm5lbENvdW50LCBMaWJXZWJSVENBdWRpb0Zvcm1hdDo6c2FtcGxlU2l6ZSwg TGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVNpemUsIExpYldlYlJUQ0F1ZGlvRm9ybWF0Ojpp c0Zsb2F0LCBMaWJXZWJSVENBdWRpb0Zvcm1hdDo6aXNCaWdFbmRpYW4sIExpYldlYlJUQ0F1ZGlv Rm9ybWF0Ojppc05vbkludGVybGVhdmVkKTsKICAgICByZXR1cm4gc3RyZWFtRm9ybWF0OwogfQog CkBAIC02NSwxMiArNjUsMTQgQEAgdm9pZCBSZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2U6OnNv dXJjZUVuYWJsZWRDaGFuZ2VkKCkKIAogdm9pZCBSZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2U6 OmF1ZGlvU2FtcGxlc0F2YWlsYWJsZShjb25zdCBNZWRpYVRpbWUmIHRpbWUsIGNvbnN0IFBsYXRm b3JtQXVkaW9EYXRhJiBhdWRpb0RhdGEsIGNvbnN0IEF1ZGlvU3RyZWFtRGVzY3JpcHRpb24mIHN0 cmVhbURlc2NyaXB0aW9uLCBzaXplX3Qgc2FtcGxlQ291bnQpCiB7CisgICAgQVNTRVJUKHN0cmVh bURlc2NyaXB0aW9uLm51bWJlck9mQ2hhbm5lbHMoKSA8PSAyKTsKKwogICAgIGlmIChtX2lucHV0 U3RyZWFtRGVzY3JpcHRpb24gIT0gc3RyZWFtRGVzY3JpcHRpb24pIHsKICAgICAgICAgbV9pbnB1 dFN0cmVhbURlc2NyaXB0aW9uID0gdG9DQUF1ZGlvU3RyZWFtRGVzY3JpcHRpb24oc3RyZWFtRGVz Y3JpcHRpb24pOwogICAgICAgICBhdXRvIHN0YXR1cyAgPSBtX3NhbXBsZUNvbnZlcnRlci0+c2V0 SW5wdXRGb3JtYXQobV9pbnB1dFN0cmVhbURlc2NyaXB0aW9uKTsKICAgICAgICAgQVNTRVJUX1VO VVNFRChzdGF0dXMsICFzdGF0dXMpOwogCi0gICAgICAgIHN0YXR1cyA9IG1fc2FtcGxlQ29udmVy dGVyLT5zZXRPdXRwdXRGb3JtYXQobGlid2VicnRjQXVkaW9Gb3JtYXQoc3RyZWFtRGVzY3JpcHRp b24ubnVtYmVyT2ZDaGFubmVscygpKSk7CisgICAgICAgIHN0YXR1cyA9IG1fc2FtcGxlQ29udmVy dGVyLT5zZXRPdXRwdXRGb3JtYXQobGlid2VicnRjQXVkaW9Gb3JtYXQoc3RyZWFtRGVzY3JpcHRp b24uc2FtcGxlUmF0ZSgpLCBzdHJlYW1EZXNjcmlwdGlvbi5udW1iZXJPZkNoYW5uZWxzKCkpKTsK ICAgICAgICAgQVNTRVJUKCFzdGF0dXMpOwogICAgIH0KICAgICBtX3NhbXBsZUNvbnZlcnRlci0+ cHVzaFNhbXBsZXModGltZSwgYXVkaW9EYXRhLCBzYW1wbGVDb3VudCk7CkBAIC04Miw3ICs4NCw5 IEBAIHZvaWQgUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlOjphdWRpb1NhbXBsZXNBdmFpbGFi bGUoY29uc3QgTWVkaWFUaW1lJiB0aW1lLCBjCiAKIHZvaWQgUmVhbHRpbWVPdXRnb2luZ0F1ZGlv U291cmNlOjpwdWxsQXVkaW9EYXRhKCkKIHsKLSAgICBzaXplX3QgYnVmZmVyU2l6ZSA9IExpYldl YlJUQ0F1ZGlvRm9ybWF0OjpjaHVua1NhbXBsZUNvdW50ICogTGliV2ViUlRDQXVkaW9Gb3JtYXQ6 OnNhbXBsZUJ5dGVTaXplICogbV9pbnB1dFN0cmVhbURlc2NyaXB0aW9uLm51bWJlck9mQ2hhbm5l bHMoKTsKKyAgICAvLyBsaWJ3ZWJydGMgZXhwZWN0cyAxMCBtcyBjaHVua3MuCisgICAgc2l6ZV90 IGNodW5rU2FtcGxlQ291bnQgPSBtX2lucHV0U3RyZWFtRGVzY3JpcHRpb24uc2FtcGxlUmF0ZSgp IC8gMTAwOworICAgIHNpemVfdCBidWZmZXJTaXplID0gY2h1bmtTYW1wbGVDb3VudCAqIExpYldl YlJUQ0F1ZGlvRm9ybWF0OjpzYW1wbGVCeXRlU2l6ZSAqIG1faW5wdXRTdHJlYW1EZXNjcmlwdGlv bi5udW1iZXJPZkNoYW5uZWxzKCk7CiAgICAgbV9hdWRpb0J1ZmZlci5yZXNlcnZlQ2FwYWNpdHko YnVmZmVyU2l6ZSk7CiAKICAgICBBdWRpb0J1ZmZlckxpc3QgYnVmZmVyTGlzdDsKQEAgLTkxLDEw ICs5NSwxMCBAQCB2b2lkIFJlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZTo6cHVsbEF1ZGlvRGF0 YSgpCiAgICAgYnVmZmVyTGlzdC5tQnVmZmVyc1swXS5tRGF0YUJ5dGVTaXplID0gYnVmZmVyU2l6 ZTsKICAgICBidWZmZXJMaXN0Lm1CdWZmZXJzWzBdLm1EYXRhID0gbV9hdWRpb0J1ZmZlci5kYXRh KCk7CiAKLSAgICBtX3NhbXBsZUNvbnZlcnRlci0+cHVsbEF2YWxhaWJsZVNhbXBsZXNBc0NodW5r cyhidWZmZXJMaXN0LCBMaWJXZWJSVENBdWRpb0Zvcm1hdDo6Y2h1bmtTYW1wbGVDb3VudCwgbV9z dGFydEZyYW1lLCBbdGhpc10gewotICAgICAgICBtX3N0YXJ0RnJhbWUgKz0gTGliV2ViUlRDQXVk aW9Gb3JtYXQ6OmNodW5rU2FtcGxlQ291bnQ7CisgICAgbV9zYW1wbGVDb252ZXJ0ZXItPnB1bGxB dmFsYWlibGVTYW1wbGVzQXNDaHVua3MoYnVmZmVyTGlzdCwgY2h1bmtTYW1wbGVDb3VudCwgbV9z dGFydEZyYW1lLCBbdGhpcywgY2h1bmtTYW1wbGVDb3VudF0geworICAgICAgICBtX3N0YXJ0RnJh bWUgKz0gY2h1bmtTYW1wbGVDb3VudDsKICAgICAgICAgZm9yIChhdXRvIHNpbmsgOiBtX3Npbmtz KQotICAgICAgICAgICAgc2luay0+T25EYXRhKG1fYXVkaW9CdWZmZXIuZGF0YSgpLCBMaWJXZWJS VENBdWRpb0Zvcm1hdDo6c2FtcGxlU2l6ZSwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVJh dGUsIG1faW5wdXRTdHJlYW1EZXNjcmlwdGlvbi5udW1iZXJPZkNoYW5uZWxzKCksIExpYldlYlJU Q0F1ZGlvRm9ybWF0OjpjaHVua1NhbXBsZUNvdW50KTsKKyAgICAgICAgICAgIHNpbmstPk9uRGF0 YShtX2F1ZGlvQnVmZmVyLmRhdGEoKSwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVNpemUs IG1faW5wdXRTdHJlYW1EZXNjcmlwdGlvbi5zYW1wbGVSYXRlKCksIG1faW5wdXRTdHJlYW1EZXNj cmlwdGlvbi5udW1iZXJPZkNoYW5uZWxzKCksIGNodW5rU2FtcGxlQ291bnQpOwogICAgIH0pOwog fQogCg==