232427 2021-10-28 01:43:23 -0700 Fix CARingBuffer mix mode 2021-10-28 08:33:05 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1809606 0 youennf 2021-10-28 01:43:23 -0700 Fix CARingBuffer mix mode 1809607 1 webkit-bug-importer 2021-10-28 01:44:00 -0700 <rdar://problem/84747657> 1809613 2 442684 youennf 2021-10-28 02:15:55 -0700 Created attachment 442684 Patch 1809679 3 ews-feeder 2021-10-28 08:33:03 -0700 Committed r284980 (243628@main): <https://commits.webkit.org/243628@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442684. 442684 2021-10-28 02:15:55 -0700 2021-10-28 08:33:04 -0700 Patch bug-232427-20211028111554.patch text/plain 6041 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFlMDM5MmJhMjJkZmEx ZTBlMzg4YWUzNWQ1MTVjYzBkM2RlNGI5OC4uMWU2ZThiODgxOTc0OGJiZWM2MzcwZjA3ODg3ZTc1 N2Y5YWQ2ZmU5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEwLTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggQ0FSaW5nQnVmZmVy IG1peCBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzI0MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBMaWtlIGRvbmUgZm9yIENvcHksIHdlIG5lZWQgdG8gdXNlIHRoZSBkZXN0aW5hdGlvbiBvZmZz ZXQgdG8gd3JpdGUgZGF0YSBwcm9wZXJseS4KKworICAgICAgICBDb3ZlcmVkIGJ5IEFQSSB0ZXN0 LgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vY29jb2EvQ0FSaW5nQnVmZmVyLmNwcDoKKwog MjAyMS0xMC0yNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAg RW5zdXJlIHN5bmNocm9uaXplZCByZW5kZXJpbmcgb2YgaW5jb21pbmcgYXVkaW8gdHJhY2tzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9DQVJpbmdCdWZm ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvQ0FSaW5nQnVmZmVy LmNwcAppbmRleCA0MjA3MjM4M2ZhZTA5NjdhMDI0ZDExOGMwOTcwMTY3ZWU4M2ExYTIyLi4xYjFk NDFjNDM0ZWU2YzBlZTAwZmI4ODBmZjY1YjIyMDM2MTNkMmM5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9DQVJpbmdCdWZmZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29hL0NBUmluZ0J1ZmZlci5jcHAKQEAgLTE2Niwz MSArMTY2LDMzIEBAIHN0YXRpYyB2b2lkIEZldGNoQUJMKEF1ZGlvQnVmZmVyTGlzdCogbGlzdCwg c2l6ZV90IGRlc3RPZmZzZXQsIFZlY3RvcjxCeXRlKj4mIHBvCiAgICAgICAgIGlmIChkZXN0T2Zm c2V0ID4gZGVzdC0+bURhdGFCeXRlU2l6ZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCisgICAg ICAgIGF1dG8qIGRlc3RpbmF0aW9uRGF0YSA9IHN0YXRpY19jYXN0PEJ5dGUqPihkZXN0LT5tRGF0 YSkgKyBkZXN0T2Zmc2V0OworICAgICAgICBhdXRvKiBzb3VyY2VEYXRhID0gcG9pbnRlciArIHNy Y09mZnNldDsKICAgICAgICAgbmJ5dGVzID0gc3RkOjptaW48c2l6ZV90PihuYnl0ZXMsIGRlc3Qt Pm1EYXRhQnl0ZVNpemUgLSBkZXN0T2Zmc2V0KTsKICAgICAgICAgaWYgKG1vZGUgPT0gQ0FSaW5n QnVmZmVyOjpDb3B5KQotICAgICAgICAgICAgbWVtY3B5KHN0YXRpY19jYXN0PEJ5dGUqPihkZXN0 LT5tRGF0YSkgKyBkZXN0T2Zmc2V0LCBwb2ludGVyICsgc3JjT2Zmc2V0LCBuYnl0ZXMpOworICAg ICAgICAgICAgbWVtY3B5KGRlc3RpbmF0aW9uRGF0YSwgc291cmNlRGF0YSwgbmJ5dGVzKTsKICAg ICAgICAgZWxzZSB7CiAgICAgICAgICAgICBzd2l0Y2ggKGZvcm1hdCkgewogICAgICAgICAgICAg Y2FzZSBBdWRpb1N0cmVhbURlc2NyaXB0aW9uOjpJbnQxNjogewotICAgICAgICAgICAgICAgIGlu dDE2X3QqIGRlc3RpbmF0aW9uID0gc3RhdGljX2Nhc3Q8aW50MTZfdCo+KGRlc3QtPm1EYXRhKTsK LSAgICAgICAgICAgICAgICBpbnQxNl90KiBzb3VyY2UgPSByZWludGVycHJldF9jYXN0PGludDE2 X3QqPihwb2ludGVyICsgc3JjT2Zmc2V0KTsKKyAgICAgICAgICAgICAgICBhdXRvKiBkZXN0aW5h dGlvbiA9IHJlaW50ZXJwcmV0X2Nhc3Q8aW50MTZfdCo+KGRlc3RpbmF0aW9uRGF0YSk7CisgICAg ICAgICAgICAgICAgYXV0byogc291cmNlID0gcmVpbnRlcnByZXRfY2FzdDxpbnQxNl90Kj4oc291 cmNlRGF0YSk7CiAgICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBuYnl0ZXMg LyBzaXplb2YoaW50MTZfdCk7IGkrKykKICAgICAgICAgICAgICAgICAgICAgZGVzdGluYXRpb25b aV0gKz0gc291cmNlW2ldOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQog ICAgICAgICAgICAgY2FzZSBBdWRpb1N0cmVhbURlc2NyaXB0aW9uOjpJbnQzMjogewotICAgICAg ICAgICAgICAgIGludDMyX3QqIGRlc3RpbmF0aW9uID0gc3RhdGljX2Nhc3Q8aW50MzJfdCo+KGRl c3QtPm1EYXRhKTsKLSAgICAgICAgICAgICAgICB2RFNQX3ZhZGRpKGRlc3RpbmF0aW9uLCAxLCBy ZWludGVycHJldF9jYXN0PGludDMyX3QqPihwb2ludGVyICsgc3JjT2Zmc2V0KSwgMSwgZGVzdGlu YXRpb24sIDEsIG5ieXRlcyAvIHNpemVvZihpbnQzMl90KSk7CisgICAgICAgICAgICAgICAgYXV0 byogZGVzdGluYXRpb24gPSByZWludGVycHJldF9jYXN0PGludDMyX3QqPihkZXN0aW5hdGlvbkRh dGEpOworICAgICAgICAgICAgICAgIHZEU1BfdmFkZGkoZGVzdGluYXRpb24sIDEsIHJlaW50ZXJw cmV0X2Nhc3Q8aW50MzJfdCo+KHNvdXJjZURhdGEpLCAxLCBkZXN0aW5hdGlvbiwgMSwgbmJ5dGVz IC8gc2l6ZW9mKGludDMyX3QpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIGNhc2UgQXVkaW9TdHJlYW1EZXNjcmlwdGlvbjo6RmxvYXQzMjogewot ICAgICAgICAgICAgICAgIGZsb2F0KiBkZXN0aW5hdGlvbiA9IHN0YXRpY19jYXN0PGZsb2F0Kj4o ZGVzdC0+bURhdGEpOwotICAgICAgICAgICAgICAgIHZEU1BfdmFkZChkZXN0aW5hdGlvbiwgMSwg cmVpbnRlcnByZXRfY2FzdDxmbG9hdCo+KHBvaW50ZXIgKyBzcmNPZmZzZXQpLCAxLCBkZXN0aW5h dGlvbiwgMSwgbmJ5dGVzIC8gc2l6ZW9mKGZsb2F0KSk7CisgICAgICAgICAgICAgICAgYXV0byog ZGVzdGluYXRpb24gPSByZWludGVycHJldF9jYXN0PGZsb2F0Kj4oZGVzdGluYXRpb25EYXRhKTsK KyAgICAgICAgICAgICAgICB2RFNQX3ZhZGQoZGVzdGluYXRpb24sIDEsIHJlaW50ZXJwcmV0X2Nh c3Q8ZmxvYXQqPihzb3VyY2VEYXRhKSwgMSwgZGVzdGluYXRpb24sIDEsIG5ieXRlcyAvIHNpemVv ZihmbG9hdCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAg ICAgICAgY2FzZSBBdWRpb1N0cmVhbURlc2NyaXB0aW9uOjpGbG9hdDY0OiB7Ci0gICAgICAgICAg ICAgICAgZG91YmxlKiBkZXN0aW5hdGlvbiA9IHN0YXRpY19jYXN0PGRvdWJsZSo+KGRlc3QtPm1E YXRhKTsKLSAgICAgICAgICAgICAgICB2RFNQX3ZhZGREKGRlc3RpbmF0aW9uLCAxLCByZWludGVy cHJldF9jYXN0PGRvdWJsZSo+KHBvaW50ZXIgKyBzcmNPZmZzZXQpLCAxLCBkZXN0aW5hdGlvbiwg MSwgbmJ5dGVzIC8gc2l6ZW9mKGRvdWJsZSkpOworICAgICAgICAgICAgICAgIGF1dG8qIGRlc3Rp bmF0aW9uID0gcmVpbnRlcnByZXRfY2FzdDxkb3VibGUqPihkZXN0aW5hdGlvbkRhdGEpOworICAg ICAgICAgICAgICAgIHZEU1BfdmFkZEQoZGVzdGluYXRpb24sIDEsIHJlaW50ZXJwcmV0X2Nhc3Q8 ZG91YmxlKj4oc291cmNlRGF0YSksIDEsIGRlc3RpbmF0aW9uLCAxLCBuYnl0ZXMgLyBzaXplb2Yo ZG91YmxlKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICBjYXNlIEF1ZGlvU3RyZWFtRGVzY3JpcHRpb246Ok5vbmU6CmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGZkNjUwZTg4MTY3N2JhZjFkNGYw OGI5MDczOGRlMDllMDlmYTRkZC4uMmE3ZjAwZmUxZDlkMjUwNTk3ZDJiNGU5YTJjNjY0ODQwYTJh OGU3ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDIxLTEwLTI4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KKworICAgICAgICBGaXggQ0FSaW5nQnVmZmVyIG1peCBtb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0MjcKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg0NzQ3NjU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0NBUmluZ0J1ZmZlci5j cHA6CisKIDIwMjEtMTAtMjUgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAK ICAgICAgICAgQ2hhbmdlIGRlZmF1bHQgaU9TIHNpbXVsYXRvciB0byBvbmUgd2l0aCBhIGxhcmdl ciBzY3JlZW4gc2l6ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJD b3JlL0NBUmluZ0J1ZmZlci5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUv Q0FSaW5nQnVmZmVyLmNwcAppbmRleCBmMjBiZWZmNjAwMzNhYTdlNDVhMzdlYmM2MjZiNGM5MmFl MWIzMTg3Li41MzkwYmJlM2EwYzRmNzgyYmUwZjUxOTMxNzU0NzU4M2UzMjUyMTgyIDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvQ0FSaW5nQnVmZmVyLmNwcAor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvQ0FSaW5nQnVmZmVyLmNwcApA QCAtMTUyLDcgKzE1Miw3IEBAIGNsYXNzIE1peGluZ1Rlc3QgewogcHVibGljOgogICAgIHN0YXRp YyB2b2lkIHJ1bihDQVJpbmdCdWZmZXJUZXN0JiB0ZXN0KQogICAgIHsKLSAgICAgICAgY29uc3Qg aW50IHNhbXBsZUNvdW50ID0gNjQ7CisgICAgICAgIGNvbnN0IGludCBzYW1wbGVDb3VudCA9IDQ0 MTsKIAogICAgICAgICBDQUF1ZGlvU3RyZWFtRGVzY3JpcHRpb246OlBDTUZvcm1hdCBmb3JtYXQ7 CiAgICAgICAgIGlmIChzdGQ6OmlzX3NhbWU8dHlwZSwgZmxvYXQ+Ojp2YWx1ZSkKQEAgLTE5Nyw2 ICsxOTcsMjAgQEAgcHVibGljOgogICAgICAgICAKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkg PCBzYW1wbGVDb3VudDsgaSsrKQogICAgICAgICAgICAgRVhQRUNUX0VRKHJlYWRCdWZmZXJbaV0s IHJlZmVyZW5jZUJ1ZmZlcltpXSkgPDwgIlJpbmcgYnVmZmVyIHZhbHVlIGRpZmZlcnMgYXQgaW5k ZXggIiA8PCBpOworCisgICAgICAgIHRlc3QucmluZ0J1ZmZlcigpLmZldGNoKCZ0ZXN0LmJ1ZmZl ckxpc3QoKSwgc2FtcGxlQ291bnQsIDAsIENBUmluZ0J1ZmZlcjo6RmV0Y2hNb2RlOjpDb3B5KTsK KyAgICAgICAgZXJyID0gdGVzdC5yaW5nQnVmZmVyKCkuc3RvcmUoJnRlc3QuYnVmZmVyTGlzdCgp LCBzYW1wbGVDb3VudCwgc2FtcGxlQ291bnQpOworICAgICAgICBFWFBFQ1RfRVEoZXJyLCBDQVJp bmdCdWZmZXI6OkVycm9yOjpPayk7CisKKyAgICAgICAgdGVzdC5yaW5nQnVmZmVyKCkuZmV0Y2go JnRlc3QuYnVmZmVyTGlzdCgpLCBzYW1wbGVDb3VudCwgc2FtcGxlQ291bnQsIENBUmluZ0J1ZmZl cjo6RmV0Y2hNb2RlOjpDb3B5KTsKKyAgICAgICAgdGVzdC5yaW5nQnVmZmVyKCkuZmV0Y2goJnRl c3QuYnVmZmVyTGlzdCgpLCBzYW1wbGVDb3VudCwgc2FtcGxlQ291bnQsIENBUmluZ0J1ZmZlcjo6 RmV0Y2hNb2RlOjpNaXgpOworICAgICAgICB0ZXN0LnJpbmdCdWZmZXIoKS5mZXRjaCgmdGVzdC5i dWZmZXJMaXN0KCksIHNhbXBsZUNvdW50LCBzYW1wbGVDb3VudCwgQ0FSaW5nQnVmZmVyOjpGZXRj aE1vZGU6Ok1peCk7CisKKyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBzYW1wbGVDb3VudDsg aSsrKQorICAgICAgICAgICAgcmVmZXJlbmNlQnVmZmVyW2ldID0gc291cmNlQnVmZmVyW2ldICog MzsKKworICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IHNhbXBsZUNvdW50OyBpKyspCisgICAg ICAgICAgICBFWFBFQ1RfRVEocmVhZEJ1ZmZlcltpXSwgcmVmZXJlbmNlQnVmZmVyW2ldKSA8PCAi UmluZyBidWZmZXIgdmFsdWUgZGlmZmVycyBhdCBpbmRleCAiIDw8IGk7CiAgICAgfQogfTsKIAo=