174508 2017-07-14 09:58:08 -0700 Increase CoreAudio render audio buffer sizes for WebRTC 2017-07-14 12:34:38 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson jer.noble webkit-bug-importer oldest_to_newest 1328818 0 youennf 2017-07-14 09:58:08 -0700 This will increase a bit latency but will make audio rendering more stable 1328819 1 315437 youennf 2017-07-14 09:59:32 -0700 Created attachment 315437 Patch 1328820 2 webkit-bug-importer 2017-07-14 10:00:02 -0700 <rdar://problem/33318418> 1328833 3 315437 eric.carlson 2017-07-14 10:18:18 -0700 Comment on attachment 315437 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=315437&action=review > Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp:226 > + return AudioSession::sharedSession().sampleRate() / 100; This will result in a buffer size of 80 for 8K which is definitely too small. 50 might be better. > Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp:304 > + // For the moment we do not need to configure speaker proc as we ar not providing any reference data. Nit: "we ar not" => "we are not" 1328838 4 youennf 2017-07-14 10:27:51 -0700 Thanks for the review. (In reply to Eric Carlson from comment #3) > Comment on attachment 315437 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=315437&action=review > > > Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp:226 > > + return AudioSession::sharedSession().sampleRate() / 100; > > This will result in a buffer size of 80 for 8K which is definitely too > small. 50 might be better. How about picking the max of AudioSession::sharedSession().bufferSize() and 10ms? > > > Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp:304 > > + // For the moment we do not need to configure speaker proc as we ar not providing any reference data. > > Nit: "we ar not" => "we are not" ok 1328858 5 315447 youennf 2017-07-14 10:54:14 -0700 Created attachment 315447 Patch for landing 1328861 6 youennf 2017-07-14 10:57:15 -0700 (In reply to youenn fablet from comment #5) > Created attachment 315447 [details] > Patch for landing I removed the CoreAudioCaptureSource changes. I'll upload a separate patch removing speaker configuration 1328869 7 315452 youennf 2017-07-14 11:05:13 -0700 Created attachment 315452 Patch for landing 1328913 8 commit-queue 2017-07-14 11:52:46 -0700 The commit-queue encountered the following flaky tests while processing attachment 315452: storage/websql/database-lock-after-reload.html bug 174447 (authors: jsbell@chromium.org and rniwa@webkit.org) The commit-queue is continuing to process your patch. 1328916 9 commit-queue 2017-07-14 11:52:52 -0700 The commit-queue encountered the following flaky tests while processing attachment 315452: storage/indexeddb/modern/new-database-after-user-delete.html bug 174520 (author: beidson@apple.com) The commit-queue is continuing to process your patch. 1328943 10 315452 commit-queue 2017-07-14 12:34:36 -0700 Comment on attachment 315452 Patch for landing Clearing flags on attachment: 315452 Committed r219517: <http://trac.webkit.org/changeset/219517> 1328944 11 commit-queue 2017-07-14 12:34:38 -0700 All reviewed patches have been landed. Closing bug. 315437 2017-07-14 09:59:32 -0700 2017-07-14 10:54:13 -0700 Patch bug-174508-20170714095932.patch text/plain 3242 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE2MzQwZWUxYWM0NGFl YTVmMWQ1ZGZmNjJiYzVhMWFjOTI1NzA0Yy4uZmYzNWQ2Y2FmNzYxYzA0MGYyZTAxMDVlYTJhM2Rm Nzc2YzFlNGZiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTA3LTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNyZWFzZSBDb3JlQXVk aW8gcmVuZGVyIGF1ZGlvIGJ1ZmZlciBzaXplcyBmb3IgV2ViUlRDCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ1MDgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IG1hbnVhbGx5IHRlc3Rp bmcgYXVkaW8gcmVuZGVyaW5nIHRocm91Z2ggV2ViUlRDIHNpdGVzLgorCisgICAgICAgICogcGxh dGZvcm0vbWVkaWFzdHJlYW0vbWFjL0F1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW1Db2NvYS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2E6 OmNyZWF0ZUF1ZGlvVW5pdCk6IFNldHRpbmcgYXVkaW8gYnVmZmVyIHNpemUgZXF1aXZhbGVudCB0 byAxMCBtcy4KKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2Fw dHVyZVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb3JlQXVkaW9TaGFyZWRVbml0Ojpw cmVmZXJyZWRJT0J1ZmZlclNpemUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRp b1NoYXJlZFVuaXQ6OnNldHVwQXVkaW9Vbml0KTogUmVtb3ZpbmcgY29uZmlndXJhdGlvbiBvZiB0 aGUgYXVkaW8gc3BlYWtlciBzaW5jZSB0aGlzIGlzIG5vdCB1c2VkIGF0IHRoZSBtb21lbnQuCisK IDIwMTctMDctMTMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAg IFJlcG9ydCBDb3JlQXVkaW9DYXB0dXJlU291cmNlIGZhaWx1cmUgaW4gY2FzZSBzaGFyZWQgdW5p dCBzdG9wcyB3b3JraW5nIHByb3Blcmx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbUNvY29hLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BdWRpb1RyYWNrUHJp dmF0ZU1lZGlhU3RyZWFtQ29jb2EuY3BwCmluZGV4IDVlNjBiOWIyODM2OWRhMzQxZjY0ZGNkMDZl Nzk2MGU5MzgwMzVkNjUuLjBmZGQ5MjQwYTg0ZDFmOGJhNDlhMzg2MGM5YmZkM2VlMmRhYzJmY2Yg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BdWRp b1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9BdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2Eu Y3BwCkBAIC0zOCw4ICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY29uc3QgaW50 IHJlbmRlckJ1ZmZlclNpemUgPSAxMjg7Ci0KIEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW1D b2NvYTo6QXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbUNvY29hKE1lZGlhU3RyZWFtVHJhY2tQ cml2YXRlJiB0cmFjaykKICAgICA6IEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJlYW0odHJhY2sp CiB7CkBAIC0xNjMsNyArMTYxLDcgQEAgQXVkaW9Db21wb25lbnRJbnN0YW5jZSBBdWRpb1RyYWNr UHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2E6OmNyZWF0ZUF1ZGlvVW5pdChDQUF1ZGkKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgQXVkaW9TZXNzaW9uOjpzaGFyZWRTZXNzaW9u KCkuc2V0UHJlZmVycmVkQnVmZmVyU2l6ZShyZW5kZXJCdWZmZXJTaXplKTsKKyAgICBBdWRpb1Nl c3Npb246OnNoYXJlZFNlc3Npb24oKS5zZXRQcmVmZXJyZWRCdWZmZXJTaXplKEF1ZGlvU2Vzc2lv bjo6c2hhcmVkU2Vzc2lvbigpLnNhbXBsZVJhdGUoKSAvIDEwMCk7CiAKICAgICByZXR1cm4gcmVt b3RlSU9Vbml0OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IDBm ODQ3NjUzMDA2YTcyMTQ1NGJmZWViZjBlOGExMTE1MmFlYjE5ZDIuLmYxZmM0ZTUxM2IzM2M2ZDQw ZDhlMGM5NTcxYmI2OTIxOWZhM2FkMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlU291cmNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJj ZS5jcHAKQEAgLTIyMyw3ICsyMjMsNyBAQCB2b2lkIENvcmVBdWRpb1NoYXJlZFVuaXQ6OnJlbW92 ZUVjaG9DYW5jZWxsYXRpb25Tb3VyY2UoQXVkaW9TYW1wbGVEYXRhU291cmNlJiBzbwogCiBzaXpl X3QgQ29yZUF1ZGlvU2hhcmVkVW5pdDo6cHJlZmVycmVkSU9CdWZmZXJTaXplKCkKIHsKLSAgICBy ZXR1cm4gQXVkaW9TZXNzaW9uOjpzaGFyZWRTZXNzaW9uKCkuYnVmZmVyU2l6ZSgpOworICAgIHJl dHVybiBBdWRpb1Nlc3Npb246OnNoYXJlZFNlc3Npb24oKS5zYW1wbGVSYXRlKCkgLyAxMDA7CiB9 CiAKIE9TU3RhdHVzIENvcmVBdWRpb1NoYXJlZFVuaXQ6OnNldHVwQXVkaW9Vbml0KCkKQEAgLTMw MSw5ICszMDEsNyBAQCBPU1N0YXR1cyBDb3JlQXVkaW9TaGFyZWRVbml0OjpzZXR1cEF1ZGlvVW5p dCgpCiAgICAgaWYgKGVycikKICAgICAgICAgcmV0dXJuIGVycjsKIAotICAgIGVyciA9IGNvbmZp Z3VyZVNwZWFrZXJQcm9jKCk7Ci0gICAgaWYgKGVycikKLSAgICAgICAgcmV0dXJuIGVycjsKKyAg ICAvLyBGb3IgdGhlIG1vbWVudCB3ZSBkbyBub3QgbmVlZCB0byBjb25maWd1cmUgc3BlYWtlciBw cm9jIGFzIHdlIGFyIG5vdCBwcm92aWRpbmcgYW55IHJlZmVyZW5jZSBkYXRhLgogCiAgICAgZXJy ID0gQXVkaW9Vbml0SW5pdGlhbGl6ZShtX2lvVW5pdCk7CiAgICAgaWYgKGVycikgewo= 315447 2017-07-14 10:54:14 -0700 2017-07-14 11:05:11 -0700 Patch for landing bug-174508-20170714105414.patch text/plain 1904 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE2MzQwZWUxYWM0NGFl YTVmMWQ1ZGZmNjJiYzVhMWFjOTI1NzA0Yy4uNGJjNTZkMzBjOWY5ZTQ5YTNlMDk0YWFjZWYwMTMx ZDlmMjdkNTQ4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA3LTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNyZWFzZSBDb3JlQXVk aW8gcmVuZGVyIGF1ZGlvIGJ1ZmZlciBzaXplcyBmb3IgV2ViUlRDCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ1MDgKKworICAgICAgICBSZXZpZXdl ZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgQ292ZXJlZCBieSBtYW51YWxseSB0ZXN0aW5n IGF1ZGlvIHJlbmRlcmluZyB0aHJvdWdoIFdlYlJUQyBzaXRlcy4KKworICAgICAgICAqIHBsYXRm b3JtL21lZGlhc3RyZWFtL21hYy9BdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2EuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbUNvY29hOjpj cmVhdGVBdWRpb1VuaXQpOiBTZXR0aW5nIGF1ZGlvIGJ1ZmZlciBzaXplIGVxdWl2YWxlbnQgdG8g MTAgbXMuCisKIDIwMTctMDctMTMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIFJlcG9ydCBDb3JlQXVkaW9DYXB0dXJlU291cmNlIGZhaWx1cmUgaW4gY2FzZSBz aGFyZWQgdW5pdCBzdG9wcyB3b3JraW5nIHByb3Blcmx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVh bUNvY29hLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BdWRp b1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2EuY3BwCmluZGV4IDVlNjBiOWIyODM2OWRhMzQx ZjY0ZGNkMDZlNzk2MGU5MzgwMzVkNjUuLjBmZGQ5MjQwYTg0ZDFmOGJhNDlhMzg2MGM5YmZkM2Vl MmRhYzJmY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9BdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2EuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3Ry ZWFtQ29jb2EuY3BwCkBAIC0zOCw4ICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot Y29uc3QgaW50IHJlbmRlckJ1ZmZlclNpemUgPSAxMjg7Ci0KIEF1ZGlvVHJhY2tQcml2YXRlTWVk aWFTdHJlYW1Db2NvYTo6QXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbUNvY29hKE1lZGlhU3Ry ZWFtVHJhY2tQcml2YXRlJiB0cmFjaykKICAgICA6IEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJl YW0odHJhY2spCiB7CkBAIC0xNjMsNyArMTYxLDcgQEAgQXVkaW9Db21wb25lbnRJbnN0YW5jZSBB dWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2E6OmNyZWF0ZUF1ZGlvVW5pdChDQUF1ZGkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgQXVkaW9TZXNzaW9uOjpzaGFy ZWRTZXNzaW9uKCkuc2V0UHJlZmVycmVkQnVmZmVyU2l6ZShyZW5kZXJCdWZmZXJTaXplKTsKKyAg ICBBdWRpb1Nlc3Npb246OnNoYXJlZFNlc3Npb24oKS5zZXRQcmVmZXJyZWRCdWZmZXJTaXplKEF1 ZGlvU2Vzc2lvbjo6c2hhcmVkU2Vzc2lvbigpLnNhbXBsZVJhdGUoKSAvIDEwMCk7CiAKICAgICBy ZXR1cm4gcmVtb3RlSU9Vbml0OwogfQo= 315452 2017-07-14 11:05:13 -0700 2017-07-14 12:34:36 -0700 Patch for landing bug-174508-20170714110512.patch text/plain 1903 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE2MzQwZWUxYWM0NGFl YTVmMWQ1ZGZmNjJiYzVhMWFjOTI1NzA0Yy4uYzUzMDIxZjEzZDYwNTU0OTQ0MzAxZmY0YjhhMDM1 MTE5MWQxODVkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA3LTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNyZWFzZSBDb3JlQXVk aW8gcmVuZGVyIGF1ZGlvIGJ1ZmZlciBzaXplcyBmb3IgV2ViUlRDCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ1MDgKKworICAgICAgICBSZXZpZXdl ZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgQ292ZXJlZCBieSBtYW51YWxseSB0ZXN0aW5n IGF1ZGlvIHJlbmRlcmluZyB0aHJvdWdoIFdlYlJUQyBzaXRlcy4KKworICAgICAgICAqIHBsYXRm b3JtL21lZGlhc3RyZWFtL21hYy9BdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2EuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbUNvY29hOjpj cmVhdGVBdWRpb1VuaXQpOiBTZXR0aW5nIGF1ZGlvIGJ1ZmZlciBzaXplIGVxdWl2YWxlbnQgdG8g MjAgbXMuCisKIDIwMTctMDctMTMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIFJlcG9ydCBDb3JlQXVkaW9DYXB0dXJlU291cmNlIGZhaWx1cmUgaW4gY2FzZSBz aGFyZWQgdW5pdCBzdG9wcyB3b3JraW5nIHByb3Blcmx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVh bUNvY29hLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BdWRp b1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2EuY3BwCmluZGV4IDVlNjBiOWIyODM2OWRhMzQx ZjY0ZGNkMDZlNzk2MGU5MzgwMzVkNjUuLmRkY2FmY2NiNTk3YmVmYWNmNjM4MzVkZDI3ZjlhZjFk MTAyMWQxMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9BdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2EuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BdWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3Ry ZWFtQ29jb2EuY3BwCkBAIC0zOCw4ICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot Y29uc3QgaW50IHJlbmRlckJ1ZmZlclNpemUgPSAxMjg7Ci0KIEF1ZGlvVHJhY2tQcml2YXRlTWVk aWFTdHJlYW1Db2NvYTo6QXVkaW9UcmFja1ByaXZhdGVNZWRpYVN0cmVhbUNvY29hKE1lZGlhU3Ry ZWFtVHJhY2tQcml2YXRlJiB0cmFjaykKICAgICA6IEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTdHJl YW0odHJhY2spCiB7CkBAIC0xNjMsNyArMTYxLDcgQEAgQXVkaW9Db21wb25lbnRJbnN0YW5jZSBB dWRpb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtQ29jb2E6OmNyZWF0ZUF1ZGlvVW5pdChDQUF1ZGkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgQXVkaW9TZXNzaW9uOjpzaGFy ZWRTZXNzaW9uKCkuc2V0UHJlZmVycmVkQnVmZmVyU2l6ZShyZW5kZXJCdWZmZXJTaXplKTsKKyAg ICBBdWRpb1Nlc3Npb246OnNoYXJlZFNlc3Npb24oKS5zZXRQcmVmZXJyZWRCdWZmZXJTaXplKEF1 ZGlvU2Vzc2lvbjo6c2hhcmVkU2Vzc2lvbigpLnNhbXBsZVJhdGUoKSAvIDUwKTsKIAogICAgIHJl dHVybiByZW1vdGVJT1VuaXQ7CiB9Cg==