236884 2022-02-19 09:05:13 -0800 [GStreamer] Switch media player to playbin3 2025-05-20 02:33:08 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified REOPENED InRadar P2 Normal --- 237326 277327 292951 1 pnormand pnormand calvaris commit-queue philn webkit-bug-importer oldest_to_newest 1843858 0 pnormand 2022-02-19 09:05:13 -0800 MSE and Mediastream require playbin3. Regular playback uses playbin3 if GStreamer >= 1.20 is detected, unless the WEBKIT_GST_USE_PLAYBIN2 environment variable is set to 1. 1843860 1 452642 pnormand 2022-02-19 09:12:25 -0800 Created attachment 452642 Patch 1843861 2 452643 pnormand 2022-02-19 09:15:58 -0800 Created attachment 452643 Patch 1844808 3 ews-feeder 2022-02-22 11:35:57 -0800 Committed r290325 (247647@main): <https://commits.webkit.org/247647@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452643. 1844809 4 webkit-bug-importer 2022-02-22 11:36:19 -0800 <rdar://problem/89307315> 1846454 5 452643 pnormand 2022-02-27 09:46:10 -0800 Comment on attachment 452643 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452643&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:2671 > + auto usePlaybin2 = usePlaybin2Override ? parseInteger<unsigned>(usePlaybin2Override) : 0; Clearly I didn't test this properly, nice auto footgun. This is actually an optional<unsigned>. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:2672 > + if ((usePlaybin2 || !webkitGstCheckVersion(1, 20, 0)) && !isMediaSource() && !url.protocolIs("mediastream")) so the usePlaybin2 test here always returns true. I'll follow-up in a new patch, there are layout test updates needed. 1847040 6 commit-queue 2022-03-01 09:03:14 -0800 Re-opened since this is blocked by bug 237326 1896154 7 pnormand 2022-09-04 09:51:51 -0700 Pull request: https://github.com/WebKit/WebKit/pull/4007 1911543 8 philn 2022-11-10 08:35:01 -0800 (In reply to Philippe Normand from comment #7) > Pull request: https://github.com/WebKit/WebKit/pull/4007 I've found a couple more playbin3 issues which make me think this is not production-ready yet, at least until 1.22: - https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1419 which was closed actually. Download buffering is not runtime toggle-able in playbin3 - https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1562 URI redirects are not supported yet - https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1418 some tests failing due to this one, though I think it's a wpt-specific corner case... So I think we shouldn't flip the switch yet, it's too early. 1958594 9 philn 2023-05-29 04:22:06 -0700 (In reply to Philippe Normand from comment #8) > (In reply to Philippe Normand from comment #7) > > Pull request: https://github.com/WebKit/WebKit/pull/4007 > > I've found a couple more playbin3 issues which make me think this is not > production-ready yet, at least until 1.22: > > - https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1419 which was > closed actually. Download buffering is not runtime toggle-able in playbin3 Nothing we can do about this. > - https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1562 URI > redirects are not supported yet Fixed upstream (scheduled to ship in 1.24). > - https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1418 some > tests failing due to this one, though I think it's a wpt-specific corner > case... > MR fixing this: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4725 > So I think we shouldn't flip the switch yet, it's too early. Playbin3 support for decoder/sinks is going to be another requirement. 2018360 10 philn 2024-03-04 03:43:59 -0800 AFAICT the last big blocker is https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4391 playbin3 in 1.24 is no longer advertised as experimental. 2018456 11 pnormand 2024-03-04 09:58:58 -0800 Pull request: https://github.com/WebKit/WebKit/pull/25429 2018690 12 calvaris 2024-03-04 22:32:41 -0800 (In reply to Philippe Normand from comment #10) > AFAICT the last big blocker is > https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4391 > > playbin3 in 1.24 is no longer advertised as experimental. That PR is not landing. I witnessed Edward's review in person and he is not accepting that. So we'll have to live with the current custom solutions for the corresponding platforms. 2018707 13 philn 2024-03-05 00:51:53 -0800 (In reply to Xabier Rodríguez Calvar from comment #12) > (In reply to Philippe Normand from comment #10) > > AFAICT the last big blocker is > > https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4391 > > > > playbin3 in 1.24 is no longer advertised as experimental. > > That PR is not landing. I witnessed Edward's review in person and he is not > accepting that. So we'll have to live with the current custom solutions for > the corresponding platforms. We could provide a playbin2 quirk for those :) 452642 2022-02-19 09:12:25 -0800 2022-02-19 09:15:53 -0800 Patch bug-236884-20220219091224.patch text/plain 5678 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJiZTdmNTFiNjZkZThm MTYzZmFjMjRjOTcwYTFkYjNiMzg1YTE0NC4uY2Y0MTljZWFiMjM4ODM5ZmIwYjM5Y2VhOTUzNGVi N2QyNWVmOWMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAyLTE5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTd2l0Y2ggbWVkaWEgcGxheWVyIHRvIHBsYXliaW4zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY4ODQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaXRoIEdTdHJlYW1lciAxLjIwIHBsYXliaW4zIGlz IHF1aXRlIHVzYWJsZSBub3csIHNvIGdpdmUgaXQgYSB0cnkgYXMgZGVmYXVsdCBwbGF5YmFjawor ICAgICAgICBlbmdpbmUgZHVyaW5nIHRoZSAyLjM4IGN5Y2xlLiBJZiBvbmUgd2FudHMgdG8gb3B0 IG91dCwgc2V0IHRoZSBXRUJLSVRfR1NUX1VTRV9QTEFZQklOMgorICAgICAgICBlbnZpcm9ubWVu dCB2YXJpYWJsZSB0byAxLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlz dGluZyBtZWRpYSBsYXlvdXQgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlR1NUUGxheUJpbik6CisKIDIw MjItMDItMTkgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtXUEVdW0dUS10gRW5hYmxlIFRodW5kZXIgYW5kIHJlbW92ZSBvbGQgQ2xlYXJrZXkgQ0RN L0RlY3J5cHRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcAppbmRleCBkZjQyY2QwMDQyNWU2Mjk2ZGQzNzE0ZjAzM2RlNDc3ODI5OWNmYmNhLi4zY2Nk YzU5MjA2MzkyZGEyNTgzM2NmNGZiZmU3NWQxZTkzZTFhMTM0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtOTQsNiArOTQsNyBAQAogI2lu Y2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlTnVtYmVycy5oPgogI2luY2x1ZGUgPHd0 Zi9VUkwuaD4KICNpbmNsdWRlIDx3dGYvV2FsbFRpbWUuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9T dHJpbmdUb0ludGVnZXJDb252ZXJzaW9uLmg+CiAKICNpZiBVU0UoR1NUUkVBTUVSX01QRUdUUykK ICNkZWZpbmUgR1NUX1VTRV9VTlNUQUJMRV9BUEkKQEAgLTI2NjIsMTMgKzI2NjMsMTQgQEAgc3Rh dGljIHZvaWQgc2V0UGxheWJhY2tGbGFncyhHc3RFbGVtZW50KiBwaXBlbGluZSkKIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVHU1RQbGF5QmluKGNvbnN0IFVSTCYgdXJs KQogewogICAgIEdTVF9JTkZPKCJDcmVhdGluZyBwaXBlbGluZSBmb3IgJXMgcGxheWVyIiwgbV9w bGF5ZXItPmlzVmlkZW9QbGF5ZXIoKSA/ICJ2aWRlbyIgOiAiYXVkaW8iKTsKLSAgICBjb25zdCBj aGFyKiBwbGF5YmluTmFtZSA9ICJwbGF5YmluIjsKIAotICAgIC8vIE1TRSBhbmQgTWVkaWFzdHJl YW0gcmVxdWlyZSBwbGF5YmluMy4gUmVndWxhciBwbGF5YmFjayBjYW4gdXNlIHBsYXliaW4zIG9u LWRlbWFuZCB3aXRoIHRoZQotICAgIC8vIFdFQktJVF9HU1RfVVNFX1BMQVlCSU4zIGVudmlyb25t ZW50IHZhcmlhYmxlLgotICAgIGNvbnN0IGNoYXIqIHVzZVBsYXliaW4zID0gZ19nZXRlbnYoIldF QktJVF9HU1RfVVNFX1BMQVlCSU4zIik7Ci0gICAgaWYgKChpc01lZGlhU291cmNlKCkgfHwgdXJs LnByb3RvY29sSXMoIm1lZGlhc3RyZWFtIikgfHwgKHVzZVBsYXliaW4zICYmIGVxdWFsKHVzZVBs YXliaW4zLCAiMSIpKSkpCi0gICAgICAgIHBsYXliaW5OYW1lID0gInBsYXliaW4zIjsKKyAgICAv LyBNU0UgYW5kIE1lZGlhc3RyZWFtIHJlcXVpcmUgcGxheWJpbjMuIFJlZ3VsYXIgcGxheWJhY2sg dXNlcyBwbGF5YmluMyBpZiBHU3RyZWFtZXIgPj0gMS4yMCBpcworICAgIC8vIGRldGVjdGVkLCB1 bmxlc3MgdGhlIFdFQktJVF9HU1RfVVNFX1BMQVlCSU4yIGVudmlyb25tZW50IHZhcmlhYmxlIGlz IHNldCB0byAxLgorICAgIGNvbnN0IGNoYXIqIHBsYXliaW5OYW1lID0gInBsYXliaW4zIjsKKyAg ICBjb25zdCBjaGFyKiB1c2VQbGF5YmluMk92ZXJyaWRlID0gZ19nZXRlbnYoIldFQktJVF9HU1Rf VVNFX1BMQVlCSU4yIik7CisgICAgYXV0byB1c2VQbGF5YmluMiA9IHVzZVBsYXliaW4yT3ZlcnJp ZGUgPyBwYXJzZUludGVnZXI8dW5zaWduZWQ+KHVzZVBsYXliaW4yT3ZlcnJpZGUpIDogMDsKKyAg ICBpZiAoKHVzZVBsYXliaW4yIHx8ICF3ZWJraXRHc3RDaGVja1ZlcnNpb24oMSwgMjAsIDApKSAm JiAoIWlzTWVkaWFTb3VyY2UoKSAmJiAhdXJsLnByb3RvY29sSXMoIm1lZGlhc3RyZWFtIikpKQor ICAgICAgICBwbGF5YmluTmFtZSA9ICJwbGF5YmluIjsKIAogICAgIEFTU0VSVCghbV9waXBlbGlu ZSk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCBlMDEwY2M0NTExMjAyMDA2OWM2NGQ3Y2JkMGY0MjlkODdjYTM0NzM2Li5hNmEzYzY4MmEwOTA3 MTAyZDY1MDJkYTdkNTRjMDNkMDhkYzBlMTBiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDItMTkgIFBoaWxp cHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHU3RyZWFtZXJd IFN3aXRjaCBtZWRpYSBwbGF5ZXIgdG8gcGxheWJpbjMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjg4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgV0VCS0lUX0dTVF9VU0VfUExBWUJJTjMg d2l0aCBXRUJLSVRfR1NUX1VTRV9QTEFZQklOMiB0aGF0IGFsbG93cyB0byBvcHQtb3V0IG9mCisg ICAgICAgIHBsYXliaW4zLCBpZiB0aGlzIGlzIGRlc2lyZWQuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3BvcnQvZ3RrLnB5OgorICAgICAgICAoR3RrUG9ydC5zZXR1cF9lbnZpcm9uX2Zv cl9zZXJ2ZXIpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHk6CisgICAg ICAgIChXUEVQb3J0LnNldHVwX2Vudmlyb25fZm9yX3NlcnZlcik6CisKIDIwMjItMDItMTggIERh dmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBbVG9vbHNdIFNhbml0 aXplciBidWlsZHMgc2hvdWxkIG9iZXkgYHNldC13ZWJraXQtY29uZmlndXJhdGlvbiAtLWZvcmNl LW9wdGltaXphdGlvbi1sZXZlbGAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9ndGsucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5CmluZGV4IDU3 YjA2NmM1ODQ2NTQ1NDBiOWJlMjZmNTA5NDVmNTkwMjBiY2JjNTcuLjFhYTlkOGEzYTM2MWEwYTQ2 YjcyM2I3ZmQxYWNkZTYwMTc2NmU4NzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9ndGsucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQpA QCAtMTIxLDcgKzEyMSw3IEBAIGNsYXNzIEd0a1BvcnQoUG9ydCk6CiAgICAgICAgIHNlbGYuX2Nv cHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJVF9KSEJVSUxE JykKICAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVudmlyb25t ZW50LCAnV0VCS0lUX1RPUF9MRVZFTCcpCiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9l bnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJVF9ERUJVRycpCi0gICAgICAgIHNlbGYu X2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJVF9HU1Rf VVNFX1BMQVlCSU4zJykKKyAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmlyb25faWZf c2V0KGVudmlyb25tZW50LCAnV0VCS0lUX0dTVF9VU0VfUExBWUJJTjInKQogICAgICAgICBmb3Ig Z3N0X3ZhcmlhYmxlIGluICgnREVCVUcnLCAnREVCVUdfRFVNUF9ET1RfRElSJywgJ0RFQlVHX0ZJ TEUnLCAnREVCVUdfTk9fQ09MT1InLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnUExV R0lOX1NDQU5ORVInLCAnUExVR0lOX1BBVEgnLCAnUExVR0lOX1NZU1RFTV9QQVRIJywgJ1JFR0lT VFJZJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1BMVUdJTl9QQVRIXzFfMCcpOgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkKaW5kZXggYzk0MzRmM2Q1MWQ5MWJmZmFkZGI4OTJi YmE1OTFjZDRhNTM3M2Y0MS4uNTAwNTRjM2ExZWNhYzUzOTdlMTZhNzNjZjAzMDFlNDVhYmJhMWU0 MSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5CkBAIC05Miw3ICs5Miw3IEBAIGNsYXNz IFdQRVBvcnQoUG9ydCk6CiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lm X3NldChlbnZpcm9ubWVudCwgJ1BVTFNFX1NFUlZFUicpCiAgICAgICAgIHNlbGYuX2NvcHlfdmFs dWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1BVTFNFX0NMSUVOVENPTkZJRycp CiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVu dCwgJ1hSX1JVTlRJTUVfSlNPTicpCi0gICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZp cm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJVF9HU1RfVVNFX1BMQVlCSU4zJykKKyAgICAg ICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnV0VC S0lUX0dTVF9VU0VfUExBWUJJTjInKQogICAgICAgICBmb3IgZ3N0X3ZhcmlhYmxlIGluICgnREVC VUcnLCAnREVCVUdfRFVNUF9ET1RfRElSJywgJ0RFQlVHX0ZJTEUnLCAnREVCVUdfTk9fQ09MT1In LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnUExVR0lOX1NDQU5ORVInLCAnUExVR0lO X1BBVEgnLCAnUExVR0lOX1NZU1RFTV9QQVRIJywgJ1JFR0lTVFJZJywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ1BMVUdJTl9QQVRIXzFfMCcpOgo= 452643 2022-02-19 09:15:58 -0800 2022-02-22 11:35:59 -0800 Patch bug-236884-20220219091557.patch text/plain 5676 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJiZTdmNTFiNjZkZThm MTYzZmFjMjRjOTcwYTFkYjNiMzg1YTE0NC4uY2Y0MTljZWFiMjM4ODM5ZmIwYjM5Y2VhOTUzNGVi N2QyNWVmOWMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAyLTE5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTd2l0Y2ggbWVkaWEgcGxheWVyIHRvIHBsYXliaW4zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY4ODQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaXRoIEdTdHJlYW1lciAxLjIwIHBsYXliaW4zIGlz IHF1aXRlIHVzYWJsZSBub3csIHNvIGdpdmUgaXQgYSB0cnkgYXMgZGVmYXVsdCBwbGF5YmFjawor ICAgICAgICBlbmdpbmUgZHVyaW5nIHRoZSAyLjM4IGN5Y2xlLiBJZiBvbmUgd2FudHMgdG8gb3B0 IG91dCwgc2V0IHRoZSBXRUJLSVRfR1NUX1VTRV9QTEFZQklOMgorICAgICAgICBlbnZpcm9ubWVu dCB2YXJpYWJsZSB0byAxLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlz dGluZyBtZWRpYSBsYXlvdXQgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlR1NUUGxheUJpbik6CisKIDIw MjItMDItMTkgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtXUEVdW0dUS10gRW5hYmxlIFRodW5kZXIgYW5kIHJlbW92ZSBvbGQgQ2xlYXJrZXkgQ0RN L0RlY3J5cHRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcAppbmRleCBkZjQyY2QwMDQyNWU2Mjk2ZGQzNzE0ZjAzM2RlNDc3ODI5OWNmYmNhLi45ZmM4 ZGYwMTllNTE0NjA1YTUzMDdmZmM5MDJiMTAwZTQ5MjllODMzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtOTQsNiArOTQsNyBAQAogI2lu Y2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlTnVtYmVycy5oPgogI2luY2x1ZGUgPHd0 Zi9VUkwuaD4KICNpbmNsdWRlIDx3dGYvV2FsbFRpbWUuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9T dHJpbmdUb0ludGVnZXJDb252ZXJzaW9uLmg+CiAKICNpZiBVU0UoR1NUUkVBTUVSX01QRUdUUykK ICNkZWZpbmUgR1NUX1VTRV9VTlNUQUJMRV9BUEkKQEAgLTI2NjIsMTMgKzI2NjMsMTQgQEAgc3Rh dGljIHZvaWQgc2V0UGxheWJhY2tGbGFncyhHc3RFbGVtZW50KiBwaXBlbGluZSkKIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVHU1RQbGF5QmluKGNvbnN0IFVSTCYgdXJs KQogewogICAgIEdTVF9JTkZPKCJDcmVhdGluZyBwaXBlbGluZSBmb3IgJXMgcGxheWVyIiwgbV9w bGF5ZXItPmlzVmlkZW9QbGF5ZXIoKSA/ICJ2aWRlbyIgOiAiYXVkaW8iKTsKLSAgICBjb25zdCBj aGFyKiBwbGF5YmluTmFtZSA9ICJwbGF5YmluIjsKIAotICAgIC8vIE1TRSBhbmQgTWVkaWFzdHJl YW0gcmVxdWlyZSBwbGF5YmluMy4gUmVndWxhciBwbGF5YmFjayBjYW4gdXNlIHBsYXliaW4zIG9u LWRlbWFuZCB3aXRoIHRoZQotICAgIC8vIFdFQktJVF9HU1RfVVNFX1BMQVlCSU4zIGVudmlyb25t ZW50IHZhcmlhYmxlLgotICAgIGNvbnN0IGNoYXIqIHVzZVBsYXliaW4zID0gZ19nZXRlbnYoIldF QktJVF9HU1RfVVNFX1BMQVlCSU4zIik7Ci0gICAgaWYgKChpc01lZGlhU291cmNlKCkgfHwgdXJs LnByb3RvY29sSXMoIm1lZGlhc3RyZWFtIikgfHwgKHVzZVBsYXliaW4zICYmIGVxdWFsKHVzZVBs YXliaW4zLCAiMSIpKSkpCi0gICAgICAgIHBsYXliaW5OYW1lID0gInBsYXliaW4zIjsKKyAgICAv LyBNU0UgYW5kIE1lZGlhc3RyZWFtIHJlcXVpcmUgcGxheWJpbjMuIFJlZ3VsYXIgcGxheWJhY2sg dXNlcyBwbGF5YmluMyBpZiBHU3RyZWFtZXIgPj0gMS4yMCBpcworICAgIC8vIGRldGVjdGVkLCB1 bmxlc3MgdGhlIFdFQktJVF9HU1RfVVNFX1BMQVlCSU4yIGVudmlyb25tZW50IHZhcmlhYmxlIGlz IHNldCB0byAxLgorICAgIGNvbnN0IGNoYXIqIHBsYXliaW5OYW1lID0gInBsYXliaW4zIjsKKyAg ICBjb25zdCBjaGFyKiB1c2VQbGF5YmluMk92ZXJyaWRlID0gZ19nZXRlbnYoIldFQktJVF9HU1Rf VVNFX1BMQVlCSU4yIik7CisgICAgYXV0byB1c2VQbGF5YmluMiA9IHVzZVBsYXliaW4yT3ZlcnJp ZGUgPyBwYXJzZUludGVnZXI8dW5zaWduZWQ+KHVzZVBsYXliaW4yT3ZlcnJpZGUpIDogMDsKKyAg ICBpZiAoKHVzZVBsYXliaW4yIHx8ICF3ZWJraXRHc3RDaGVja1ZlcnNpb24oMSwgMjAsIDApKSAm JiAhaXNNZWRpYVNvdXJjZSgpICYmICF1cmwucHJvdG9jb2xJcygibWVkaWFzdHJlYW0iKSkKKyAg ICAgICAgcGxheWJpbk5hbWUgPSAicGxheWJpbiI7CiAKICAgICBBU1NFUlQoIW1fcGlwZWxpbmUp OwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg ZTAxMGNjNDUxMTIwMjAwNjljNjRkN2NiZDBmNDI5ZDg3Y2EzNDczNi4uYTZhM2M2ODJhMDkwNzEw MmQ2NTAyZGE3ZDU0YzAzZDA4ZGMwZTEwYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAyLTE5ICBQaGlsaXBw ZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBT d2l0Y2ggbWVkaWEgcGxheWVyIHRvIHBsYXliaW4zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY4ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIFdFQktJVF9HU1RfVVNFX1BMQVlCSU4zIHdp dGggV0VCS0lUX0dTVF9VU0VfUExBWUJJTjIgdGhhdCBhbGxvd3MgdG8gb3B0LW91dCBvZgorICAg ICAgICBwbGF5YmluMywgaWYgdGhpcyBpcyBkZXNpcmVkLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9wb3J0L2d0ay5weToKKyAgICAgICAgKEd0a1BvcnQuc2V0dXBfZW52aXJvbl9mb3Jf c2VydmVyKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5OgorICAgICAg ICAoV1BFUG9ydC5zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIpOgorCiAyMDIyLTAyLTE4ICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgW1Rvb2xzXSBTYW5pdGl6 ZXIgYnVpbGRzIHNob3VsZCBvYmV5IGBzZXQtd2Via2l0LWNvbmZpZ3VyYXRpb24gLS1mb3JjZS1v cHRpbWl6YXRpb24tbGV2ZWxgCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvZ3RrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQppbmRleCA1N2Iw NjZjNTg0NjU0NTQwYjliZTI2ZjUwOTQ1ZjU5MDIwYmNiYzU3Li4xYWE5ZDhhM2EzNjFhMGE0NmI3 MjNiN2ZkMWFjZGU2MDE3NjZlODcyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvZ3RrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKQEAg LTEyMSw3ICsxMjEsNyBAQCBjbGFzcyBHdGtQb3J0KFBvcnQpOgogICAgICAgICBzZWxmLl9jb3B5 X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdXRUJLSVRfSkhCVUlMRCcp CiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVu dCwgJ1dFQktJVF9UT1BfTEVWRUwnKQogICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52 aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdXRUJLSVRfREVCVUcnKQotICAgICAgICBzZWxmLl9j b3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdXRUJLSVRfR1NUX1VT RV9QTEFZQklOMycpCisgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3Nl dChlbnZpcm9ubWVudCwgJ1dFQktJVF9HU1RfVVNFX1BMQVlCSU4yJykKICAgICAgICAgZm9yIGdz dF92YXJpYWJsZSBpbiAoJ0RFQlVHJywgJ0RFQlVHX0RVTVBfRE9UX0RJUicsICdERUJVR19GSUxF JywgJ0RFQlVHX05PX0NPTE9SJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1BMVUdJ Tl9TQ0FOTkVSJywgJ1BMVUdJTl9QQVRIJywgJ1BMVUdJTl9TWVNURU1fUEFUSCcsICdSRUdJU1RS WScsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdQTFVHSU5fUEFUSF8xXzAnKToKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5CmluZGV4IGM5NDM0ZjNkNTFkOTFiZmZhZGRiODkyYmJh NTkxY2Q0YTUzNzNmNDEuLjUwMDU0YzNhMWVjYWM1Mzk3ZTE2YTczY2YwMzAxZTQ1YWJiYTFlNDEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weQpAQCAtOTIsNyArOTIsNyBAQCBjbGFzcyBX UEVQb3J0KFBvcnQpOgogICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9z ZXQoZW52aXJvbm1lbnQsICdQVUxTRV9TRVJWRVInKQogICAgICAgICBzZWxmLl9jb3B5X3ZhbHVl X2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdQVUxTRV9DTElFTlRDT05GSUcnKQog ICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQs ICdYUl9SVU5USU1FX0pTT04nKQotICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJv bl9pZl9zZXQoZW52aXJvbm1lbnQsICdXRUJLSVRfR1NUX1VTRV9QTEFZQklOMycpCisgICAgICAg IHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJ VF9HU1RfVVNFX1BMQVlCSU4yJykKICAgICAgICAgZm9yIGdzdF92YXJpYWJsZSBpbiAoJ0RFQlVH JywgJ0RFQlVHX0RVTVBfRE9UX0RJUicsICdERUJVR19GSUxFJywgJ0RFQlVHX05PX0NPTE9SJywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1BMVUdJTl9TQ0FOTkVSJywgJ1BMVUdJTl9Q QVRIJywgJ1BMVUdJTl9TWVNURU1fUEFUSCcsICdSRUdJU1RSWScsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICdQTFVHSU5fUEFUSF8xXzAnKToK