209969 2020-04-03 08:56:05 -0700 Remove unnecessary memory allocation from RealtimeIncomingAudioSourceCocoa::OnData 2026-02-25 05:15:30 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 308636 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1637373 0 youennf 2020-04-03 08:56:05 -0700 Remove unnecessary memory allocation from RealtimeIncomingAudioSourceCocoa::OnData 1638053 1 395554 youennf 2020-04-06 01:28:16 -0700 Created attachment 395554 Patch 1638115 2 395554 eric.carlson 2020-04-06 09:25:38 -0700 Comment on attachment 395554 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395554&action=review > Source/WebCore/ChangeLog:9 > + Create a WebAudioBufferList once (without any buffer allocation) and set the audio buffer pointer s/Create/create/ > Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSourceCocoa.cpp:81 > + if (!m_audioBufferList || m_sampleRate != sampleRate || m_numberOfChannels != numberOfChannels) { > + m_streamDescription = streamDescription(sampleRate, numberOfChannels); > + m_audioBufferList = makeUnique<WebAudioBufferList>(m_streamDescription); > + } Don't you need to set m_sampleRate and m_numberOfChannels? 1638255 3 395554 youennf 2020-04-06 12:57:22 -0700 Comment on attachment 395554 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395554&action=review > Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSourceCocoa.cpp:71 > + ALWAYS_LOG_IF(loggerPtr() && !(++m_chunksReceived % 200), LOGIDENTIFIER, "chunk ", m_chunksReceived); Will also dispatch that logging to the main thread since that might disrupt the audio pipeline otherwise. 1638485 4 395663 youennf 2020-04-07 01:46:19 -0700 Created attachment 395663 Patch for landing 1638502 5 ews-feeder 2020-04-07 04:14:06 -0700 Committed r259632: <https://trac.webkit.org/changeset/259632> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395663. 1638505 6 webkit-bug-importer 2020-04-07 04:15:15 -0700 <rdar://problem/61387440> 395554 2020-04-06 01:28:16 -0700 2020-04-07 01:46:15 -0700 Patch bug-209969-20200406102814.patch text/plain 5126 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDMxNzJkNTNmMzA5ZTk4 MjM0ODhkZDY1MjI1MDdlNWRmMGE5NWViYi4uY2M0YTI2YTI0NzQ5ODk3OTZkMzcyNGQxMDI5NTA0 ZmJlZmEwYzljZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA0LTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3Nh cnkgbWVtb3J5IGFsbG9jYXRpb24gZnJvbSBSZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VDb2Nv YTo6T25EYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDk5NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbnN0ZWFkIG9mIGFsbG9jYXRpbmcgYSBuZXcgYnVmZmVyIGZvciBldmVyeSBhdWRpbyBjaHVu ayBhbmQgY29weSB0aGUgYXVkaW8gY2h1bmssCisgICAgICAgIENyZWF0ZSBhIFdlYkF1ZGlvQnVm ZmVyTGlzdCBvbmNlICh3aXRob3V0IGFueSBidWZmZXIgYWxsb2NhdGlvbikgYW5kIHNldCB0aGUg YXVkaW8gYnVmZmVyIHBvaW50ZXIKKyAgICAgICAgZ2l2ZW4gYnkgbGlid2VicnRjIGFzIHRoZSBX ZWJBdWRpb0J1ZmZlckxpc3QgYnVmZmVyIHBvaW50ZXIuCisgICAgICAgIFdlIGRvIG5vdCB0YWtl IGNhcmUgb2YgbXV0ZWQgc3RhdGUgYW55bW9yZSBzaW5jZSB0aGlzIGlzIGRvbmUgYnkgY29uc3Vt ZXJzIGFueXdheS4KKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAg ICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VD b2NvYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VD b2NvYTo6T25EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRp bWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2EuaDoKKwogMjAyMC0wNC0wNSAgUm9iIEJ1aXMgIDxy YnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlbW92ZSBjb2RlIHRoYXQgaGFzIG5vIGVmZmVj dCBmcm9tIGxvYWRVUkwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VDb2NvYS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291 cmNlQ29jb2EuY3BwCmluZGV4IDhmMTJjMWQzMzUyODIxYzdkNDczMmQwNjJhZjYyNTgxZjQ1YWM2 MjUuLmRkMjU2MjY3ZDUzNjE3NDlmYTMxMDFiNjhjYTcwZThiMWI0ZGNkYmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5n QXVkaW9Tb3VyY2VDb2NvYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29hLmNwcApAQCAtMzQsOCAr MzQsNiBAQAogI2luY2x1ZGUgIkNBQXVkaW9TdHJlYW1EZXNjcmlwdGlvbi5oIgogI2luY2x1ZGUg IkxpYldlYlJUQ0F1ZGlvRm9ybWF0LmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgotI2luY2x1ZGUg IldlYkF1ZGlvQnVmZmVyTGlzdC5oIgotI2luY2x1ZGUgIldlYkF1ZGlvU291cmNlUHJvdmlkZXJB VkZPYmpDLmgiCiAjaW5jbHVkZSA8cGFsL2F2Zm91bmRhdGlvbi9NZWRpYVRpbWVBVkZvdW5kYXRp b24uaD4KIAogI2luY2x1ZGUgPHBhbC9jZi9Db3JlTWVkaWFTb2Z0TGluay5oPgpAQCAtNjksMjgg KzY3LDI1IEBAIHN0YXRpYyBpbmxpbmUgQXVkaW9TdHJlYW1CYXNpY0Rlc2NyaXB0aW9uIHN0cmVh bURlc2NyaXB0aW9uKHNpemVfdCBzYW1wbGVSYXRlLCBzCiAKIHZvaWQgUmVhbHRpbWVJbmNvbWlu Z0F1ZGlvU291cmNlQ29jb2E6Ok9uRGF0YShjb25zdCB2b2lkKiBhdWRpb0RhdGEsIGludCBiaXRz UGVyU2FtcGxlLCBpbnQgc2FtcGxlUmF0ZSwgc2l6ZV90IG51bWJlck9mQ2hhbm5lbHMsIHNpemVf dCBudW1iZXJPZkZyYW1lcykKIHsKKyNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKKyAgICBBTFdB WVNfTE9HX0lGKGxvZ2dlclB0cigpICYmICEoKyttX2NodW5rc1JlY2VpdmVkICUgMjAwKSwgTE9H SURFTlRJRklFUiwgImNodW5rICIsIG1fY2h1bmtzUmVjZWl2ZWQpOworI2VuZGlmCisKICAgICBD TVRpbWUgc3RhcnRUaW1lID0gQ01UaW1lTWFrZShtX251bWJlck9mRnJhbWVzLCBzYW1wbGVSYXRl KTsKICAgICBhdXRvIG1lZGlhVGltZSA9IFBBTDo6dG9NZWRpYVRpbWUoc3RhcnRUaW1lKTsKICAg ICBtX251bWJlck9mRnJhbWVzICs9IG51bWJlck9mRnJhbWVzOwogCi0gICAgQXVkaW9TdHJlYW1C YXNpY0Rlc2NyaXB0aW9uIG5ld0Rlc2NyaXB0aW9uID0gc3RyZWFtRGVzY3JpcHRpb24oc2FtcGxl UmF0ZSwgbnVtYmVyT2ZDaGFubmVscyk7Ci0KLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG5vdCBu ZWVkIHRvIGRvIHRoZSBleHRyYSBtZW1vcnkgYWxsb2NhdGlvbiBhbmQgY29weS4KLSAgICAvLyBJ bnN0ZWFkLCB3ZSBzaG91bGQgYmUgYWJsZSB0byBkaXJlY3RseSBwYXNzIGF1ZGlvRGF0YSBwb2lu dGVyLgotICAgIFdlYkF1ZGlvQnVmZmVyTGlzdCBhdWRpb0J1ZmZlckxpc3QgeyBDQUF1ZGlvU3Ry ZWFtRGVzY3JpcHRpb24obmV3RGVzY3JpcHRpb24pLCBXVEY6OnNhZmVDYXN0PHVpbnQzMl90Pihu dW1iZXJPZkZyYW1lcykgfTsKLSAgICBhdWRpb0J1ZmZlckxpc3QuYnVmZmVyKDApLT5tRGF0YUJ5 dGVTaXplID0gbnVtYmVyT2ZDaGFubmVscyAqIG51bWJlck9mRnJhbWVzICogYml0c1BlclNhbXBs ZSAvIDg7Ci0gICAgYXVkaW9CdWZmZXJMaXN0LmJ1ZmZlcigwKS0+bU51bWJlckNoYW5uZWxzID0g bnVtYmVyT2ZDaGFubmVsczsKKyAgICBpZiAoIW1fYXVkaW9CdWZmZXJMaXN0IHx8IG1fc2FtcGxl UmF0ZSAhPSBzYW1wbGVSYXRlIHx8IG1fbnVtYmVyT2ZDaGFubmVscyAhPSBudW1iZXJPZkNoYW5u ZWxzKSB7CisgICAgICAgIG1fc3RyZWFtRGVzY3JpcHRpb24gPSBzdHJlYW1EZXNjcmlwdGlvbihz YW1wbGVSYXRlLCBudW1iZXJPZkNoYW5uZWxzKTsKKyAgICAgICAgbV9hdWRpb0J1ZmZlckxpc3Qg PSBtYWtlVW5pcXVlPFdlYkF1ZGlvQnVmZmVyTGlzdD4obV9zdHJlYW1EZXNjcmlwdGlvbik7Cisg ICAgfQogCi0gICAgaWYgKG11dGVkKCkpCi0gICAgICAgIG1lbXNldChhdWRpb0J1ZmZlckxpc3Qu YnVmZmVyKDApLT5tRGF0YSwgMCwgYXVkaW9CdWZmZXJMaXN0LmJ1ZmZlcigwKS0+bURhdGFCeXRl U2l6ZSk7Ci0gICAgZWxzZQotICAgICAgICBtZW1jcHkoYXVkaW9CdWZmZXJMaXN0LmJ1ZmZlcigw KS0+bURhdGEsIGF1ZGlvRGF0YSwgYXVkaW9CdWZmZXJMaXN0LmJ1ZmZlcigwKS0+bURhdGFCeXRl U2l6ZSk7Ci0KLSNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICBBTFdBWVNfTE9HX0lGKGxv Z2dlclB0cigpICYmICEoKyttX2NodW5rc1JlY2VpdmVkICUgMjAwKSwgTE9HSURFTlRJRklFUiwg ImNodW5rICIsIG1fY2h1bmtzUmVjZWl2ZWQpOwotI2VuZGlmCisgICAgYXV0byYgYnVmZmVyTGlz dCA9ICptX2F1ZGlvQnVmZmVyTGlzdC0+YnVmZmVyKDApOworICAgIGJ1ZmZlckxpc3QubURhdGFC eXRlU2l6ZSA9IG51bWJlck9mQ2hhbm5lbHMgKiBudW1iZXJPZkZyYW1lcyAqIGJpdHNQZXJTYW1w bGUgLyA4OworICAgIGJ1ZmZlckxpc3QubU51bWJlckNoYW5uZWxzID0gbnVtYmVyT2ZDaGFubmVs czsKKyAgICBidWZmZXJMaXN0Lm1EYXRhID0gY29uc3RfY2FzdDx2b2lkKj4oYXVkaW9EYXRhKTsK IAotICAgIGF1ZGlvU2FtcGxlc0F2YWlsYWJsZShtZWRpYVRpbWUsIGF1ZGlvQnVmZmVyTGlzdCwg Q0FBdWRpb1N0cmVhbURlc2NyaXB0aW9uKG5ld0Rlc2NyaXB0aW9uKSwgbnVtYmVyT2ZGcmFtZXMp OworICAgIGF1ZGlvU2FtcGxlc0F2YWlsYWJsZShtZWRpYVRpbWUsICptX2F1ZGlvQnVmZmVyTGlz dCwgbV9zdHJlYW1EZXNjcmlwdGlvbiwgbnVtYmVyT2ZGcmFtZXMpOwogfQogCiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNv bWluZ0F1ZGlvU291cmNlQ29jb2EuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VDb2NvYS5oCmluZGV4IDM3MjU2ODhh MWE4YWVlYzRkZDAzZDhhZGMyZDExMmM3NDg2MzA5OTYuLjE0ZGQ0ZDkxNjcyMGEzMDVjZTNlNzM1 ZDI1YTBiZjg5NmJjZGQ4NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VDb2NvYS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVk aW9Tb3VyY2VDb2NvYS5oCkBAIC0zMCw3ICszMCw3IEBACiAjaWYgVVNFKExJQldFQlJUQykKIAog I2luY2x1ZGUgIlJlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZS5oIgotCisjaW5jbHVkZSAiV2Vi QXVkaW9CdWZmZXJMaXN0LmgiCiAjaW5jbHVkZSA8Q29yZUF1ZGlvL0NvcmVBdWRpb1R5cGVzLmg+ CiAKIHR5cGVkZWYgY29uc3Qgc3RydWN0IG9wYXF1ZUNNRm9ybWF0RGVzY3JpcHRpb24gKkNNRm9y bWF0RGVzY3JpcHRpb25SZWY7CkBAIC01MSw2ICs1MSwxMCBAQCBwcml2YXRlOgogCiAgICAgdWlu dDY0X3QgbV9udW1iZXJPZkZyYW1lcyB7IDAgfTsKIAorICAgIGludCBtX3NhbXBsZVJhdGUgeyAw IH07CisgICAgc2l6ZV90IG1fbnVtYmVyT2ZDaGFubmVscyB7IDAgfTsKKyAgICBDQUF1ZGlvU3Ry ZWFtRGVzY3JpcHRpb24gbV9zdHJlYW1EZXNjcmlwdGlvbjsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8 V2ViQXVkaW9CdWZmZXJMaXN0PiBtX2F1ZGlvQnVmZmVyTGlzdDsKICNpZiAhUkVMRUFTRV9MT0df RElTQUJMRUQKICAgICBzaXplX3QgbV9jaHVua3NSZWNlaXZlZCB7IDAgfTsKICNlbmRpZgo= 395663 2020-04-07 01:46:19 -0700 2020-04-07 04:14:06 -0700 Patch for landing bug-209969-20200407104617.patch text/plain 5656 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDMxNzJkNTNmMzA5ZTk4 MjM0ODhkZDY1MjI1MDdlNWRmMGE5NWViYi4uNDIyOThiOWFhMGU4MmI1ODE3ZDFmNzU3YzhhMWMx MDMyMDNkMTE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA0LTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3Nh cnkgbWVtb3J5IGFsbG9jYXRpb24gZnJvbSBSZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VDb2Nv YTo6T25EYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDk5NjkKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAg SW5zdGVhZCBvZiBhbGxvY2F0aW5nIGEgbmV3IGJ1ZmZlciBmb3IgZXZlcnkgYXVkaW8gY2h1bmsg YW5kIGNvcHkgdGhlIGF1ZGlvIGNodW5rLAorICAgICAgICBDcmVhdGUgYSBXZWJBdWRpb0J1ZmZl ckxpc3Qgb25jZSAod2l0aG91dCBhbnkgYnVmZmVyIGFsbG9jYXRpb24pIGFuZCBzZXQgdGhlIGF1 ZGlvIGJ1ZmZlciBwb2ludGVyCisgICAgICAgIGdpdmVuIGJ5IGxpYndlYnJ0YyBhcyB0aGUgV2Vi QXVkaW9CdWZmZXJMaXN0IGJ1ZmZlciBwb2ludGVyLgorICAgICAgICBXZSBkbyBub3QgdGFrZSBj YXJlIG9mIG11dGVkIHN0YXRlIGFueW1vcmUgc2luY2UgdGhpcyBpcyBkb25lIGJ5IGNvbnN1bWVy cyBhbnl3YXkuCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29j b2EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29j b2E6Ok9uRGF0YSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1l SW5jb21pbmdBdWRpb1NvdXJjZUNvY29hLmg6CisKIDIwMjAtMDQtMDUgIFJvYiBCdWlzICA8cmJ1 aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZW1vdmUgY29kZSB0aGF0IGhhcyBubyBlZmZlY3Qg ZnJvbSBsb2FkVVJMCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlQ29jb2EuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJj ZUNvY29hLmNwcAppbmRleCA4ZjEyYzFkMzM1MjgyMWM3ZDQ3MzJkMDYyYWY2MjU4MWY0NWFjNjI1 Li5iZDNiYWE4ZDkxOGYzOWY0NGI3YTQ3YTdkNGViYTliNzIwNTMyODBiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvUmVhbHRpbWVJbmNvbWluZ0F1 ZGlvU291cmNlQ29jb2EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VDb2NvYS5jcHAKQEAgLTM0LDggKzM0 LDYgQEAKICNpbmNsdWRlICJDQUF1ZGlvU3RyZWFtRGVzY3JpcHRpb24uaCIKICNpbmNsdWRlICJM aWJXZWJSVENBdWRpb0Zvcm1hdC5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKLSNpbmNsdWRlICJX ZWJBdWRpb0J1ZmZlckxpc3QuaCIKLSNpbmNsdWRlICJXZWJBdWRpb1NvdXJjZVByb3ZpZGVyQVZG T2JqQy5oIgogI2luY2x1ZGUgPHBhbC9hdmZvdW5kYXRpb24vTWVkaWFUaW1lQVZGb3VuZGF0aW9u Lmg+CiAKICNpbmNsdWRlIDxwYWwvY2YvQ29yZU1lZGlhU29mdExpbmsuaD4KQEAgLTY5LDI4ICs2 NywzNSBAQCBzdGF0aWMgaW5saW5lIEF1ZGlvU3RyZWFtQmFzaWNEZXNjcmlwdGlvbiBzdHJlYW1E ZXNjcmlwdGlvbihzaXplX3Qgc2FtcGxlUmF0ZSwgcwogCiB2b2lkIFJlYWx0aW1lSW5jb21pbmdB dWRpb1NvdXJjZUNvY29hOjpPbkRhdGEoY29uc3Qgdm9pZCogYXVkaW9EYXRhLCBpbnQgYml0c1Bl clNhbXBsZSwgaW50IHNhbXBsZVJhdGUsIHNpemVfdCBudW1iZXJPZkNoYW5uZWxzLCBzaXplX3Qg bnVtYmVyT2ZGcmFtZXMpCiB7CisjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECisgICAgaWYgKCEo KyttX2NodW5rc1JlY2VpdmVkICUgMjAwKSkgeworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtp ZGVudGlmaWVyID0gTE9HSURFTlRJRklFUiwgdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYo KnRoaXMpLCBjaHVua3NSZWNlaXZlZCA9IG1fY2h1bmtzUmVjZWl2ZWRdIHsKKyAgICAgICAgICAg IEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCksIGlkZW50aWZpZXIsICJjaHVuayAiLCBjaHVua3NS ZWNlaXZlZCk7CisgICAgICAgIH0pOworICAgIH0KKyNlbmRpZgorCiAgICAgQ01UaW1lIHN0YXJ0 VGltZSA9IENNVGltZU1ha2UobV9udW1iZXJPZkZyYW1lcywgc2FtcGxlUmF0ZSk7CiAgICAgYXV0 byBtZWRpYVRpbWUgPSBQQUw6OnRvTWVkaWFUaW1lKHN0YXJ0VGltZSk7CiAgICAgbV9udW1iZXJP ZkZyYW1lcyArPSBudW1iZXJPZkZyYW1lczsKIAotICAgIEF1ZGlvU3RyZWFtQmFzaWNEZXNjcmlw dGlvbiBuZXdEZXNjcmlwdGlvbiA9IHN0cmVhbURlc2NyaXB0aW9uKHNhbXBsZVJhdGUsIG51bWJl ck9mQ2hhbm5lbHMpOworICAgIGlmICghbV9hdWRpb0J1ZmZlckxpc3QgfHwgbV9zYW1wbGVSYXRl ICE9IHNhbXBsZVJhdGUgfHwgbV9udW1iZXJPZkNoYW5uZWxzICE9IG51bWJlck9mQ2hhbm5lbHMp IHsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbaWRlbnRpZmllciA9IExPR0lERU5USUZJRVIs IHRoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgc2FtcGxlUmF0ZSwgbnVtYmVy T2ZDaGFubmVsc10geworICAgICAgICAgICAgQUxXQVlTX0xPR19JRihsb2dnZXJQdHIoKSwgaWRl bnRpZmllciwgIm5ldyBhdWRpbyBidWZmZXIgbGlzdCBmb3Igc2FtcGxlUmF0ZSAiLCBzYW1wbGVS YXRlLCAiIGFuZCAiLCBudW1iZXJPZkNoYW5uZWxzLCAiIGNoYW5uZWwocykiKTsKKyAgICAgICAg fSk7CiAKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG5vdCBuZWVkIHRvIGRvIHRoZSBleHRyYSBt ZW1vcnkgYWxsb2NhdGlvbiBhbmQgY29weS4KLSAgICAvLyBJbnN0ZWFkLCB3ZSBzaG91bGQgYmUg YWJsZSB0byBkaXJlY3RseSBwYXNzIGF1ZGlvRGF0YSBwb2ludGVyLgotICAgIFdlYkF1ZGlvQnVm ZmVyTGlzdCBhdWRpb0J1ZmZlckxpc3QgeyBDQUF1ZGlvU3RyZWFtRGVzY3JpcHRpb24obmV3RGVz Y3JpcHRpb24pLCBXVEY6OnNhZmVDYXN0PHVpbnQzMl90PihudW1iZXJPZkZyYW1lcykgfTsKLSAg ICBhdWRpb0J1ZmZlckxpc3QuYnVmZmVyKDApLT5tRGF0YUJ5dGVTaXplID0gbnVtYmVyT2ZDaGFu bmVscyAqIG51bWJlck9mRnJhbWVzICogYml0c1BlclNhbXBsZSAvIDg7Ci0gICAgYXVkaW9CdWZm ZXJMaXN0LmJ1ZmZlcigwKS0+bU51bWJlckNoYW5uZWxzID0gbnVtYmVyT2ZDaGFubmVsczsKKyAg ICAgICAgbV9zYW1wbGVSYXRlID0gc2FtcGxlUmF0ZTsKKyAgICAgICAgbV9udW1iZXJPZkNoYW5u ZWxzID0gbnVtYmVyT2ZDaGFubmVsczsKKyAgICAgICAgbV9zdHJlYW1EZXNjcmlwdGlvbiA9IHN0 cmVhbURlc2NyaXB0aW9uKHNhbXBsZVJhdGUsIG51bWJlck9mQ2hhbm5lbHMpOworICAgICAgICBt X2F1ZGlvQnVmZmVyTGlzdCA9IG1ha2VVbmlxdWU8V2ViQXVkaW9CdWZmZXJMaXN0PihtX3N0cmVh bURlc2NyaXB0aW9uKTsKKyAgICB9CiAKLSAgICBpZiAobXV0ZWQoKSkKLSAgICAgICAgbWVtc2V0 KGF1ZGlvQnVmZmVyTGlzdC5idWZmZXIoMCktPm1EYXRhLCAwLCBhdWRpb0J1ZmZlckxpc3QuYnVm ZmVyKDApLT5tRGF0YUJ5dGVTaXplKTsKLSAgICBlbHNlCi0gICAgICAgIG1lbWNweShhdWRpb0J1 ZmZlckxpc3QuYnVmZmVyKDApLT5tRGF0YSwgYXVkaW9EYXRhLCBhdWRpb0J1ZmZlckxpc3QuYnVm ZmVyKDApLT5tRGF0YUJ5dGVTaXplKTsKLQotI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAg IEFMV0FZU19MT0dfSUYobG9nZ2VyUHRyKCkgJiYgISgrK21fY2h1bmtzUmVjZWl2ZWQgJSAyMDAp LCBMT0dJREVOVElGSUVSLCAiY2h1bmsgIiwgbV9jaHVua3NSZWNlaXZlZCk7Ci0jZW5kaWYKKyAg ICBhdXRvJiBidWZmZXJMaXN0ID0gKm1fYXVkaW9CdWZmZXJMaXN0LT5idWZmZXIoMCk7CisgICAg YnVmZmVyTGlzdC5tRGF0YUJ5dGVTaXplID0gbnVtYmVyT2ZDaGFubmVscyAqIG51bWJlck9mRnJh bWVzICogYml0c1BlclNhbXBsZSAvIDg7CisgICAgYnVmZmVyTGlzdC5tTnVtYmVyQ2hhbm5lbHMg PSBudW1iZXJPZkNoYW5uZWxzOworICAgIGJ1ZmZlckxpc3QubURhdGEgPSBjb25zdF9jYXN0PHZv aWQqPihhdWRpb0RhdGEpOwogCi0gICAgYXVkaW9TYW1wbGVzQXZhaWxhYmxlKG1lZGlhVGltZSwg YXVkaW9CdWZmZXJMaXN0LCBDQUF1ZGlvU3RyZWFtRGVzY3JpcHRpb24obmV3RGVzY3JpcHRpb24p LCBudW1iZXJPZkZyYW1lcyk7CisgICAgYXVkaW9TYW1wbGVzQXZhaWxhYmxlKG1lZGlhVGltZSwg Km1fYXVkaW9CdWZmZXJMaXN0LCBtX3N0cmVhbURlc2NyaXB0aW9uLCBudW1iZXJPZkZyYW1lcyk7 CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9SZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VDb2NvYS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29h LmgKaW5kZXggMzcyNTY4OGExYThhZWVjNGRkMDNkOGFkYzJkMTEyYzc0ODYzMDk5Ni4uMTRkZDRk OTE2NzIwYTMwNWNlM2U3MzVkMjVhMGJmODk2YmNkZDg1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJj ZUNvY29hLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL1Jl YWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUNvY29hLmgKQEAgLTMwLDcgKzMwLDcgQEAKICNpZiBV U0UoTElCV0VCUlRDKQogCiAjaW5jbHVkZSAiUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlLmgi Ci0KKyNpbmNsdWRlICJXZWJBdWRpb0J1ZmZlckxpc3QuaCIKICNpbmNsdWRlIDxDb3JlQXVkaW8v Q29yZUF1ZGlvVHlwZXMuaD4KIAogdHlwZWRlZiBjb25zdCBzdHJ1Y3Qgb3BhcXVlQ01Gb3JtYXRE ZXNjcmlwdGlvbiAqQ01Gb3JtYXREZXNjcmlwdGlvblJlZjsKQEAgLTUxLDYgKzUxLDEwIEBAIHBy aXZhdGU6CiAKICAgICB1aW50NjRfdCBtX251bWJlck9mRnJhbWVzIHsgMCB9OwogCisgICAgaW50 IG1fc2FtcGxlUmF0ZSB7IDAgfTsKKyAgICBzaXplX3QgbV9udW1iZXJPZkNoYW5uZWxzIHsgMCB9 OworICAgIENBQXVkaW9TdHJlYW1EZXNjcmlwdGlvbiBtX3N0cmVhbURlc2NyaXB0aW9uOworICAg IHN0ZDo6dW5pcXVlX3B0cjxXZWJBdWRpb0J1ZmZlckxpc3Q+IG1fYXVkaW9CdWZmZXJMaXN0Owog I2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgIHNpemVfdCBtX2NodW5rc1JlY2VpdmVkIHsg MCB9OwogI2VuZGlmCg==