220654 2021-01-15 03:54:21 -0800 [GStreamer][Playbin3] Support for CEA-608 closed captioned media 2021-02-12 11:59:36 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 220418 1 pnormand pnormand calvaris cgarcia eric.carlson ews-watchlist glenn gustavo jenner jer.noble menard philipj sergio vjaquez webkit-bug-importer oldest_to_newest 1719838 0 pnormand 2021-01-15 03:54:21 -0800 . 1722970 1 418546 pnormand 2021-01-27 07:28:18 -0800 Created attachment 418546 Patch 1723325 2 418546 calvaris 2021-01-28 01:35:17 -0800 Comment on attachment 418546 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418546&action=review > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:93 > + WTFLogAlways("GStreamer closedcaption plugins are missing. Please install gst-plugins-bad and gst-plugins-rs"); I would GST_ERROR on this as well, but up to you. 1723386 3 pnormand 2021-01-28 09:23:12 -0800 (In reply to Xabier Rodríguez Calvar from comment #2) > Comment on attachment 418546 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=418546&action=review > > > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:93 > > + WTFLogAlways("GStreamer closedcaption plugins are missing. Please install gst-plugins-bad and gst-plugins-rs"); > > I would GST_ERROR on this as well, but up to you. Well the whole pipeline would fail in this case anyway due to the unlinked pad. I'm not sure another GST_ERROR is needed :) 1723673 4 pnormand 2021-01-29 02:37:03 -0800 Committed r272055: <https://trac.webkit.org/changeset/272055> 1723674 5 webkit-bug-importer 2021-01-29 02:38:26 -0800 <rdar://problem/73747252> 1728708 6 jenner 2021-02-12 11:50:16 -0800 It appears that this revision has broken then test in macOS and iOS: media/track/track-in-band-style.html Bug created: https://bugs.webkit.org/show_bug.cgi?id=221835 1728713 7 jenner 2021-02-12 11:59:36 -0800 Jer has informed us, that this is a rebaseline. We are going to rebaseline with: https://bugs.webkit.org/show_bug.cgi?id=221835 418546 2021-01-27 07:28:18 -0800 2021-01-28 01:35:17 -0800 Patch bug-220654-20210127072817.patch text/plain 15105 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxOTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2FiYjVkMGJmNThmOGQw MTRlMDdkYzNmYmRjYjk3ZmEwNmY2NjgwMi4uNjYwOTQzNGQyMGNlODU2MzY5YjNiYjIzZWQwNTll OWJiZTM5MWYyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIxLTAxLTI3ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XVtQbGF5YmluM10gU3VwcG9ydCBmb3IgQ0VBLTYwOCBjbG9zZWQgY2FwdGlvbmVkIG1lZGlhCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA2NTQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQbGF5YmluMiBj dXJyZW50bHkgZG9lc24ndCBzdXBwb3J0IGNsb3NlZC1jYXB0aW9uIGZvcm1hdHMgc3VjaCBhcyBD RUEtNjA4IGFuZCBDRUEtNzA4LgorICAgICAgICBIb3dldmVyIHBsYXliaW4zJ3MgZGVjb2RlYmlu MyB3aWxsIGV4cG9zZSBhIHNvdXJjZSBwYWQgZm9yIHRoZXNlLCBzbyBvdXIgdGV4dCBjb21iaW5l ciBjYW4KKyAgICAgICAgaGFuZGxlIHRoaXMgZm9ybWF0LCBieSBhZGRpbmcgYSBjdXN0b20gZW5j b2RlciB0aGF0IGNvbnZlcnRzIENFQS02MDggdG8gV2ViVlRULgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cywgYWx0aG91Z2ggbWVkaWEvbWVkaWEtY2FwdGlvbnMuaHRtbCBhbmQgbWVkaWEvdHJhY2sv dHJhY2staW4tYmFuZC1zdHlsZS5odG1sCisgICAgICAgIHdpbGwgbm93IHBhc3Mgd2hlbiB0aGlz IGVudiB2YXIgaXMgc2V0IFdFQktJVF9HU1RfVVNFX1BMQVlCSU4zPTEuCisKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0Fkd2FpdGEuY3NzOiBTeW5jaHJvbml6 ZSB0ZXh0LXRyYWNrLWNvbnRhaW5lciBhbmQgY3VlCisgICAgICAgIENTUyB3aXRoIG1lZGlhQ29u dHJvbHNCYXNlLmNzcy4KKyAgICAgICAgKHZpZGVvOjotd2Via2l0LW1lZGlhLXRleHQtdHJhY2st Y29udGFpbmVyLCk6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWNv bnRhaW5lcik6CisgICAgICAgICh2aWRlbzo6Y3VlKToKKyAgICAgICAgKHZpZGVvOjpjdWUoOmZ1 dHVyZSkpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbmJhbmRUZXh0 VHJhY2tQcml2YXRlR1N0cmVhbWVyLmNwcDogU2V0IHRyYWNrIGtpbmQgYWNjb3JkaW5nCisgICAg ICAgIHRvIHRoZSBHc3RTdHJlYW0gZm9ybWF0IHRoaXMgdHJhY2sgcmVwcmVzZW50cy4KKyAgICAg ICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXI6OkluYmFuZFRleHRU cmFja1ByaXZhdGVHU3RyZWFtZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9JbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyLmg6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6IERy aXZlLWJ5LCBjaGVjaworICAgICAgICBXRUJLSVRfR1NUX1VTRV9QTEFZQklOMyBjb250ZW50cyBh bmQgc3ByaW5rbGUgYSBmZXcgbW9yZSBkZWJ1ZyBjYWxscy4KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZG9TZWVrKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dGltZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVHU1RQbGF5QmluKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVGV4dENvbWJpbmVyR1N0cmVhbWVyLmNw cDogUGx1ZyBjdXN0b20gZW5jb2RlciBoYW5kbGluZworICAgICAgICBjb252ZXJzaW9uIG9mIENF QS02MDggdG8gV2ViVlRULgorICAgICAgICAod2ViS2l0VGV4dENvbWJpbmVySGFuZGxlQ2Fwc0V2 ZW50KToKKyAgICAgICAgKHdlYmtpdFRleHRDb21iaW5lclJlbGVhc2VQYWQpOgorICAgICAgICAo d2ViS2l0VGV4dENvbWJpbmVyQ29uc3RydWN0ZWQpOgorCiAyMDIxLTAxLTI3ICBNYXJ0aW4gUm9i aW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBVc2UgU2Nyb2xsU25hcE9m ZnNldHNJbmZvIGluIHRoZSBzY3JvbGxpbmcgdHJlZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBZHdhaXRhLmNzcyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQWR3YWl0YS5jc3MK aW5kZXggZmQwY2ExZDFlZTQwOWNiM2UyODUwNGRkOTlhZTU2ZTdjNTI3OTJjZi4uMzg3N2RmNTQ1 NmYyNDQ3YjkzZTYyN2M0YmUyY2ZmZTFmMjZlMTUyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBZHdhaXRhLmNzcworKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0Fkd2FpdGEu Y3NzCkBAIC00NjksMyArNDY5LDM4IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBh bmVsIGJ1dHRvbltkaXNhYmxlZF0sCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5l bCBidXR0b25bZGlzYWJsZWRdIHsKICAgICBmaWx0ZXI6IGJyaWdodG5lc3MoNTAlKTsKIH0KKwor dmlkZW86Oi13ZWJraXQtbWVkaWEtdGV4dC10cmFjay1jb250YWluZXIsCithdWRpbzo6LXdlYmtp dC1tZWRpYS10ZXh0LXRyYWNrLWNvbnRhaW5lciB7CisgICAgcG9zaXRpb246IHJlbGF0aXZlOwor ICAgIC13ZWJraXQtZmxleDogMSAxIGF1dG87Cit9CisKK3ZpZGVvOjotd2Via2l0LW1lZGlhLXRl eHQtdHJhY2stY29udGFpbmVyIHsKKyAgICBvdmVyZmxvdzogaGlkZGVuOworICAgIHBhZGRpbmct Ym90dG9tOiA1cHg7CisgICAgei1pbmRleDogMDsKKworICAgIHRleHQtYWxpZ246IGNlbnRlcjsK KyAgICBjb2xvcjogcmdiYSgyNTUsIDI1NSwgMjU1LCAxKTsKKworICAgIGxldHRlci1zcGFjaW5n OiBub3JtYWw7CisgICAgd29yZC1zcGFjaW5nOiBub3JtYWw7CisgICAgdGV4dC10cmFuc2Zvcm06 IG5vbmU7CisgICAgdGV4dC1pbmRlbnQ6IDA7CisgICAgdGV4dC1kZWNvcmF0aW9uOiBub25lOwor ICAgIHBvaW50ZXItZXZlbnRzOiBub25lOworICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmU7 CisKKyAgICBmbGV4OiAxIDEgYXV0bzsKKworICAgIC13ZWJraXQtbGluZS1ib3gtY29udGFpbjog YmxvY2sgaW5saW5lLWJveCByZXBsYWNlZDsKK30KKwordmlkZW86OmN1ZSB7CisgICAgYmFja2dy b3VuZC1jb2xvcjogcmdiYSgwLCAwLCAwLCAwLjgpOworfQorCit2aWRlbzo6Y3VlKDpmdXR1cmUp IHsKKyAgICBjb2xvcjogZ3JheTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbmJhbmRUZXh0 VHJhY2tQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBlOTY5YjFiZWEzZjZkYWNmN2JmMWVhMzg0 NTg0ZjM0MzY1YmQxMzkyLi5hOGVlZjUyYTEzYTc3ZWVkNzdjZjE0ZTk4NzM2NzgwYWI5OWZlMDQ2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0luYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFt ZXIuY3BwCkBAIC00Miw2ICs0Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIEluYmFuZFRleHRU cmFja1ByaXZhdGVHU3RyZWFtZXI6OkluYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXIoZ2lu dCBpbmRleCwgR1JlZlB0cjxHc3RQYWQ+IHBhZCkKICAgICA6IEluYmFuZFRleHRUcmFja1ByaXZh dGUoQ3VlRm9ybWF0OjpXZWJWVFQpCiAgICAgLCBUcmFja1ByaXZhdGVCYXNlR1N0cmVhbWVyKHRo aXMsIGluZGV4LCBwYWQpCisgICAgLCBtX2tpbmQoS2luZDo6U3VidGl0bGVzKQogewogICAgIG1f ZXZlbnRQcm9iZSA9IGdzdF9wYWRfYWRkX3Byb2JlKG1fcGFkLmdldCgpLCBHU1RfUEFEX1BST0JF X1RZUEVfRVZFTlRfRE9XTlNUUkVBTSwgW10gKEdzdFBhZCosIEdzdFBhZFByb2JlSW5mbyogaW5m bywgZ3BvaW50ZXIgdXNlckRhdGEpIC0+IEdzdFBhZFByb2JlUmV0dXJuIHsKICAgICAgICAgYXV0 byogdHJhY2sgPSBzdGF0aWNfY2FzdDxJbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyKj4o dXNlckRhdGEpOwpAQCAtNjQsNiArNjUsMTEgQEAgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJl YW1lcjo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUdTdHJlYW1lcihnaW50IGluZGV4LCBHUmUKIHsK ICAgICBtX3N0cmVhbUlkID0gZ3N0X3N0cmVhbV9nZXRfc3RyZWFtX2lkKHN0cmVhbS5nZXQoKSk7 CiAgICAgR1NUX0lORk8oIlRyYWNrICVkIGdvdCBzdHJlYW0gc3RhcnQgZm9yIHN0cmVhbSAlcy4i LCBtX2luZGV4LCBtX3N0cmVhbUlkLnV0ZjgoKS5kYXRhKCkpOworCisgICAgR1NUX0RFQlVHKCJT dHJlYW0gJSIgR1NUX1BUUl9GT1JNQVQsIHN0cmVhbS5nZXQoKSk7CisgICAgYXV0byBjYXBzID0g YWRvcHRHUmVmKGdzdF9zdHJlYW1fZ2V0X2NhcHMoc3RyZWFtLmdldCgpKSk7CisgICAgY29uc3Qg Y2hhciogbWVkaWFUeXBlID0gY2Fwc01lZGlhVHlwZShjYXBzLmdldCgpKTsKKyAgICBtX2tpbmQg PSBnX3N0cl9oYXNfcHJlZml4KG1lZGlhVHlwZSwgImNsb3NlZGNhcHRpb24vIikgPyBLaW5kOjpD YXB0aW9ucyA6IEtpbmQ6OlN1YnRpdGxlczsKIH0KIAogdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2 YXRlR1N0cmVhbWVyOjpkaXNjb25uZWN0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVy LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvSW5iYW5kVGV4 dFRyYWNrUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IGM5ZDE2OGRkMDUyZjJhNDgyN2U0ZThmMWI2 YWI0YzgyZWM4YjEyYzcuLjY5MTIyNjRjMGZiOTMxZTRiNDBjN2EwZmQ4ZjU2MWE4YTE0M2M1YmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9J bmJhbmRUZXh0VHJhY2tQcml2YXRlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0luYmFuZFRleHRUcmFja1ByaXZhdGVHU3RyZWFtZXIu aApAQCAtNTEsNiArNTEsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGRpc2Nvbm5lY3QoKSBvdmVy cmlkZTsKIAorICAgIEtpbmQga2luZCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fa2luZDsg fQorCiAgICAgQXRvbVN0cmluZyBsYWJlbCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fbGFi ZWw7IH0KICAgICBBdG9tU3RyaW5nIGxhbmd1YWdlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4g bV9sYW5ndWFnZTsgfQogCkBAIC03MSw2ICs3Myw3IEBAIHByaXZhdGU6CiAgICAgZ3Vsb25nIG1f ZXZlbnRQcm9iZTsKICAgICBWZWN0b3I8R1JlZlB0cjxHc3RTYW1wbGU+PiBtX3BlbmRpbmdTYW1w bGVzOwogICAgIFN0cmluZyBtX3N0cmVhbUlkOworICAgIEtpbmQgbV9raW5kOwogICAgIExvY2sg bV9zYW1wbGVNdXRleDsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAKaW5kZXggY2YxMTBlNDE3MWJhNDEyZTEwODJkMTJhMTIwNzIxNjUyODIy NzU2Ny4uMzQyMjA3OWU3MDdkMGViNjUxZDljMmVlNTg3MjI2NDAxYmNkM2ZhZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTQ4OCw2ICs0 ODgsNyBAQCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZG9TZWVrKGNvbnN0IE1l ZGlhVGltZSYgcG9zaXRpb24sIGZsb2F0IHJhdGUsCiAgICAgaWYgKCFyYXRlKQogICAgICAgICBy YXRlID0gMS4wOwogCisgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiW1NlZWtdIFBl cmZvcm1pbmcgYWN0dWFsIHNlZWsgdG8gJSIgR1NUX1RJTUVfRk9STUFUICIgKGVuZFRpbWU6ICUi IEdTVF9USU1FX0ZPUk1BVCAiKSBhdCByYXRlICVmIiwgR1NUX1RJTUVfQVJHUyh0b0dzdENsb2Nr VGltZShzdGFydFRpbWUpKSwgR1NUX1RJTUVfQVJHUyh0b0dzdENsb2NrVGltZShlbmRUaW1lKSks IHJhdGUpOwogICAgIHJldHVybiBnc3RfZWxlbWVudF9zZWVrKG1fcGlwZWxpbmUuZ2V0KCksIHJh dGUsIEdTVF9GT1JNQVRfVElNRSwgc2Vla1R5cGUsCiAgICAgICAgIEdTVF9TRUVLX1RZUEVfU0VU LCB0b0dzdENsb2NrVGltZShzdGFydFRpbWUpLCBHU1RfU0VFS19UWVBFX1NFVCwgdG9Hc3RDbG9j a1RpbWUoZW5kVGltZSkpOwogfQpAQCAtMTMxMyw2ICsxMzE0LDcgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OmxvYWRTdGF0ZUNoYW5nZWQoKQogdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OnRpbWVDaGFuZ2VkKCkKIHsKICAgICB1cGRhdGVTdGF0ZXMoKTsKKyAg ICBHU1RfREVCVUdfT0JKRUNUKHBpcGVsaW5lKCksICJFbWl0dGluZyB0aW1lQ2hhbmdlZCBub3Rp ZmljYXRpb24iKTsKICAgICBtX3BsYXllci0+dGltZUNoYW5nZWQoKTsKIH0KIApAQCAtMjY5OSw3 ICsyNzAxLDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0ZUdTVFBs YXlCaW4oY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYKICAgICAvLyBNU0UgZG9lc24ndCBz dXBwb3J0IHBsYXliaW4zLiBNZWRpYXN0cmVhbSByZXF1aXJlcyBwbGF5YmluMy4gUmVndWxhcgog ICAgIC8vIHBsYXliYWNrIGNhbiB1c2UgcGxheWJpbjMgb24tZGVtYW5kIHdpdGggdGhlIFdFQktJ VF9HU1RfVVNFX1BMQVlCSU4zCiAgICAgLy8gZW52aXJvbm1lbnQgdmFyaWFibGUuCi0gICAgaWYg KCghaXNNZWRpYVNvdXJjZSgpICYmIGdfZ2V0ZW52KCJXRUJLSVRfR1NUX1VTRV9QTEFZQklOMyIp KSB8fCB1cmwucHJvdG9jb2xJcygibWVkaWFzdHJlYW0iKSkKKyAgICBjb25zdCBjaGFyKiB1c2VQ bGF5YmluMyA9IGdfZ2V0ZW52KCJXRUJLSVRfR1NUX1VTRV9QTEFZQklOMyIpOworICAgIGlmICgo IWlzTWVkaWFTb3VyY2UoKSAmJiB1c2VQbGF5YmluMyAmJiBlcXVhbCh1c2VQbGF5YmluMywgIjEi KSkgfHwgdXJsLnByb3RvY29sSXMoIm1lZGlhc3RyZWFtIikpCiAgICAgICAgIHBsYXliaW5OYW1l ID0gInBsYXliaW4zIjsKIAogICAgIGlmIChtX3BpcGVsaW5lKSB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvVGV4dENvbWJpbmVyR1N0cmVh bWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9UZXh0 Q29tYmluZXJHU3RyZWFtZXIuY3BwCmluZGV4IDMyNjI1NzBmMjMzOTZkYTYxODdkMzRiMmYzMDkw NmM5NGQxMGQ3M2UuLjcyOTVlMjMyNDk2YTNlNmVlMzg0ZTViNGU5NGEwY2ZlY2JlMWM2MTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9UZXh0 Q29tYmluZXJHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwCkBAIC02NCw2ICs2NCw3IEBA IHZvaWQgd2ViS2l0VGV4dENvbWJpbmVySGFuZGxlQ2Fwc0V2ZW50KFdlYktpdFRleHRDb21iaW5l ciogY29tYmluZXIsIEdzdFBhZCogcGFkCiAgICAgR1JlZlB0cjxHc3RQYWQ+IGludGVybmFsUGFk OwogICAgIGdfb2JqZWN0X2dldChjb21iaW5lclBhZCwgImlubmVyLWNvbWJpbmVyLXBhZCIsICZp bnRlcm5hbFBhZC5vdXRQdHIoKSwgbnVsbHB0cik7CiAKKyAgICBhdXRvIGNlYTYwOENhcHMgPSBh ZG9wdEdSZWYoZ3N0X2NhcHNfbmV3X2VtcHR5X3NpbXBsZSgiY2xvc2VkY2FwdGlvbi94LWNlYS02 MDgiKSk7CiAgICAgYXV0byB0ZXh0Q2FwcyA9IGFkb3B0R1JlZihnc3RfY2Fwc19uZXdfZW1wdHlf c2ltcGxlKCJ0ZXh0L3gtcmF3IikpOwogICAgIGlmIChnc3RfY2Fwc19jYW5faW50ZXJzZWN0KHRl eHRDYXBzLmdldCgpLCBjYXBzKSkgewogICAgICAgICAvLyBDYXBzIGFyZSBwbGFpbiB0ZXh0LCB3 ZSB3YW50IGEgV2ViVlRUIGVuY29kZXIgYmV0d2VlbiB0aGUgZ2hvc3RwYWQgYW5kIHRoZSBjb21i aW5lckVsZW1lbnQuCkBAIC04NywxMiArODgsNDggQEAgdm9pZCB3ZWJLaXRUZXh0Q29tYmluZXJI YW5kbGVDYXBzRXZlbnQoV2ViS2l0VGV4dENvbWJpbmVyKiBjb21iaW5lciwgR3N0UGFkKiBwYWQK IAogICAgICAgICAgICAgZ3N0X3BhZF9saW5rKHNyY1BhZC5nZXQoKSwgaW50ZXJuYWxQYWQuZ2V0 KCkpOwogICAgICAgICB9IC8vIEVsc2U6IHBpcGVsaW5lIGlzIGFscmVhZHkgY29ycmVjdC4KKyAg ICB9IGVsc2UgaWYgKGdzdF9jYXBzX2Nhbl9pbnRlcnNlY3QoY2VhNjA4Q2Fwcy5nZXQoKSwgY2Fw cykpIHsKKyAgICAgICAgaWYgKCFpc0dTdHJlYW1lclBsdWdpbkF2YWlsYWJsZSgicnNjbG9zZWRj YXB0aW9uIikgfHwgIWlzR1N0cmVhbWVyUGx1Z2luQXZhaWxhYmxlKCJjbG9zZWRjYXB0aW9uIikp IHsKKyAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiR1N0cmVhbWVyIGNsb3NlZGNhcHRpb24gcGx1 Z2lucyBhcmUgbWlzc2luZy4gUGxlYXNlIGluc3RhbGwgZ3N0LXBsdWdpbnMtYmFkIGFuZCBnc3Qt cGx1Z2lucy1ycyIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAg R1NUX0RFQlVHX09CSkVDVChjb21iaW5lciwgIkNvbnZlcnRpbmcgQ0VBLTYwOCBjbG9zZWQgY2Fw dGlvbnMgdG8gV2ViVlRULiIpOworICAgICAgICBhdXRvKiBlbmNvZGVyID0gZ3N0X2Jpbl9uZXco bnVsbHB0cik7CisgICAgICAgIGF1dG8qIHF1ZXVlID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtl KCJxdWV1ZSIsIG51bGxwdHIpOworICAgICAgICBhdXRvKiBjb252ZXJ0ZXIgPSBnc3RfZWxlbWVu dF9mYWN0b3J5X21ha2UoImNjY29udmVydGVyIiwgbnVsbHB0cik7CisgICAgICAgIGF1dG8qIHJh d0NhcHNGaWx0ZXIgPSBnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoImNhcHNmaWx0ZXIiLCBudWxs cHRyKTsKKyAgICAgICAgYXV0byogd2VidnR0RW5jb2RlciA9IGdzdF9lbGVtZW50X2ZhY3Rvcnlf bWFrZSgiY2VhNjA4dG90dCIsIG51bGxwdHIpOworICAgICAgICBhdXRvKiB2dHRDYXBzRmlsdGVy ID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJjYXBzZmlsdGVyIiwgbnVsbHB0cik7CisKKyAg ICAgICAgYXV0byByYXdDYXBzID0gYWRvcHRHUmVmKGdzdF9jYXBzX25ld19zaW1wbGUoImNsb3Nl ZGNhcHRpb24veC1jZWEtNjA4IiwgImZvcm1hdCIsIEdfVFlQRV9TVFJJTkcsICJyYXciLCBudWxs cHRyKSk7CisgICAgICAgIGdfb2JqZWN0X3NldChyYXdDYXBzRmlsdGVyLCAiY2FwcyIsIHJhd0Nh cHMuZ2V0KCksIG51bGxwdHIpOworICAgICAgICBhdXRvIHZ0dENhcHMgPSBhZG9wdEdSZWYoZ3N0 X2NhcHNfbmV3X2VtcHR5X3NpbXBsZSgiYXBwbGljYXRpb24veC1zdWJ0aXRsZS12dHQiKSk7Cisg ICAgICAgIGdfb2JqZWN0X3NldCh2dHRDYXBzRmlsdGVyLCAiY2FwcyIsIHZ0dENhcHMuZ2V0KCks IG51bGxwdHIpOworCisgICAgICAgIGdzdF9iaW5fYWRkX21hbnkoR1NUX0JJTl9DQVNUKGVuY29k ZXIpLCBxdWV1ZSwgY29udmVydGVyLCByYXdDYXBzRmlsdGVyLCB3ZWJ2dHRFbmNvZGVyLCB2dHRD YXBzRmlsdGVyLCBudWxscHRyKTsKKyAgICAgICAgZ3N0X2VsZW1lbnRfbGlua19tYW55KHF1ZXVl LCBjb252ZXJ0ZXIsIHJhd0NhcHNGaWx0ZXIsIHdlYnZ0dEVuY29kZXIsIHZ0dENhcHNGaWx0ZXIs IG51bGxwdHIpOworCisgICAgICAgIGF1dG8gZW5jb2RlclNpbmtQYWQgPSBhZG9wdEdSZWYoZ3N0 X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQocXVldWUsICJzaW5rIikpOworICAgICAgICBhdXRvKiBn aG9zdFNpbmtQYWQgPSBnc3RfZ2hvc3RfcGFkX25ldygic2luayIsIGVuY29kZXJTaW5rUGFkLmdl dCgpKTsKKyAgICAgICAgZ3N0X2VsZW1lbnRfYWRkX3BhZChlbmNvZGVyLCBnaG9zdFNpbmtQYWQp OworCisgICAgICAgIGF1dG8gZW5jb2RlclNyY1BhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9n ZXRfc3RhdGljX3BhZCh2dHRDYXBzRmlsdGVyLCAic3JjIikpOworICAgICAgICBhdXRvKiBnaG9z dFNyY1BhZCA9IGdzdF9naG9zdF9wYWRfbmV3KCJzcmMiLCBlbmNvZGVyU3JjUGFkLmdldCgpKTsK KyAgICAgICAgZ3N0X2VsZW1lbnRfYWRkX3BhZChlbmNvZGVyLCBnaG9zdFNyY1BhZCk7CisKKyAg ICAgICAgZ3N0X2Jpbl9hZGQoR1NUX0JJTl9DQVNUKGNvbWJpbmVyKSwgZW5jb2Rlcik7CisgICAg ICAgIGdzdF9lbGVtZW50X3N5bmNfc3RhdGVfd2l0aF9wYXJlbnQoZW5jb2Rlcik7CisKKyAgICAg ICAgZ3N0X2dob3N0X3BhZF9zZXRfdGFyZ2V0KEdTVF9HSE9TVF9QQUQocGFkKSwgZ2hvc3RTaW5r UGFkKTsKKyAgICAgICAgZ3N0X3BhZF9saW5rKGdob3N0U3JjUGFkLCBpbnRlcm5hbFBhZC5nZXQo KSk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgLy8gQ2FwcyBhcmUgbm90IHBsYWluIHRleHQsIHdl IGFzc3VtZSBpdCdzIFdlYlZUVC4KKyAgICAgICAgLy8gQ2FwcyBhcmUgbm90IHBsYWluIHRleHQg b3IgQ0VBLTYwOCwgd2UgYXNzdW1lIGl0J3MgV2ViVlRULgogCiAgICAgICAgIC8vIFJlbW92ZSB0 aGUgV2ViVlRUIGVuY29kZXIgaWYgcHJlc2VudC4KLSAgICAgICAgaWYgKHRhcmdldCAmJiBnc3RF bGVtZW50RmFjdG9yeUVxdWFscyh0YXJnZXRQYXJlbnQuZ2V0KCksICJ3ZWJ2dHRlbmMiX3MpKSB7 CisgICAgICAgIGlmICh0YXJnZXQgJiYgdGFyZ2V0UGFyZW50KSB7CiAgICAgICAgICAgICBHU1Rf REVCVUdfT0JKRUNUKGNvbWJpbmVyLCAiUmVtb3ZpbmcgV2ViVlRUIGVuY29kZXIiKTsKKyAgICAg ICAgICAgIGdzdF9lbGVtZW50X3NldF9zdGF0ZSh0YXJnZXRQYXJlbnQuZ2V0KCksIEdTVF9TVEFU RV9OVUxMKTsKICAgICAgICAgICAgIGdzdF9iaW5fcmVtb3ZlKEdTVF9CSU5fQ0FTVChjb21iaW5l ciksIHRhcmdldFBhcmVudC5nZXQoKSk7CiAgICAgICAgICAgICB0YXJnZXQgPSBudWxscHRyOwog ICAgICAgICAgICAgdGFyZ2V0UGFyZW50ID0gbnVsbHB0cjsKQEAgLTEzMSw3ICsxNjgsNyBAQCBz dGF0aWMgdm9pZCB3ZWJraXRUZXh0Q29tYmluZXJSZWxlYXNlUGFkKEdzdEVsZW1lbnQqIGVsZW1l bnQsIEdzdFBhZCogcGFkKQogICAgIGlmIChhdXRvIHRhcmdldCA9IGFkb3B0R1JlZihnc3RfZ2hv c3RfcGFkX2dldF90YXJnZXQoR1NUX0dIT1NUX1BBRChwYWQpKSkpIHsKICAgICAgICAgYXV0byBw YXJlbnQgPSBhZG9wdEdSZWYoZ3N0X3BhZF9nZXRfcGFyZW50X2VsZW1lbnQodGFyZ2V0LmdldCgp KSk7CiAgICAgICAgIEFTU0VSVChwYXJlbnQpOwotICAgICAgICBpZiAoZ3N0RWxlbWVudEZhY3Rv cnlFcXVhbHMocGFyZW50LmdldCgpLCAid2VidnR0ZW5jIl9zKSkgeworICAgICAgICBpZiAocGFy ZW50KSB7CiAgICAgICAgICAgICBnc3RfZWxlbWVudF9zZXRfc3RhdGUocGFyZW50LmdldCgpLCBH U1RfU1RBVEVfTlVMTCk7CiAgICAgICAgICAgICBnc3RfYmluX3JlbW92ZShHU1RfQklOX0NBU1Qo Y29tYmluZXIpLCBwYXJlbnQuZ2V0KCkpOwogICAgICAgICB9CkBAIC0xNTAsOSArMTg3LDkgQEAg c3RhdGljIHZvaWQgd2ViS2l0VGV4dENvbWJpbmVyQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0 KQogICAgIGF1dG8qIGNvbWJpbmVyID0gV0VCS0lUX1RFWFRfQ09NQklORVIob2JqZWN0KTsKICAg ICBhdXRvKiBwcml2ID0gY29tYmluZXItPnByaXY7CiAKLSAgICAvLyBGb3Igbm93IGEgZnVubmVs IGlzIHVzZWQsIGJ1dCBhIGJldHRlciBjb21iaW5lciwgY29tcGF0aWJsZSB3aXRoIHBsYXliaW4z IHVzZS1jYXNlcywgd291bGQgYmUgY29uY2F0LgotICAgIHByaXYtPmNvbWJpbmVyRWxlbWVudCA9 IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFrZSgiZnVubmVsIiwgbnVsbHB0cik7CisgICAgcHJpdi0+ Y29tYmluZXJFbGVtZW50ID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJjb25jYXQiLCBudWxs cHRyKTsKICAgICBBU1NFUlQocHJpdi0+Y29tYmluZXJFbGVtZW50KTsKKyAgICBnX29iamVjdF9z ZXQocHJpdi0+Y29tYmluZXJFbGVtZW50LmdldCgpLCAiYWRqdXN0LWJhc2UiLCBGQUxTRSwgbnVs bHB0cik7CiAKICAgICBnc3RfYmluX2FkZChHU1RfQklOX0NBU1QoY29tYmluZXIpLCBwcml2LT5j b21iaW5lckVsZW1lbnQuZ2V0KCkpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDQ3OGVjODZlNjIxNTY1MGU0ZGEzODVj YTg0ZTE2ZjQ0OTE3ZGIzMi4uZTJjMTNkYzRlMGFjOWE3MzRkY2I2MGYyOGRiNGI4YmZkYWFlM2Nm MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTAxLTI3ICBQaGlsaXBwZSBOb3JtYW5kICA8 cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtQbGF5YmluM10gU3Vw cG9ydCBmb3IgQ0VBLTYwOCBjbG9zZWQgY2FwdGlvbmVkIG1lZGlhCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA2NTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL3RyYWNrL3RyYWNrLWluLWJh bmQtc3R5bGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL3RyYWNrL3RyYWNrLWluLWJh bmQtc3R5bGUuaHRtbDoKKwogMjAyMS0wMS0yNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjY4OTQ3KSBTb21lIHRhYmxlIGVs ZW1lbnRzIGJlY29tZSBibGFuayB3aGVuIHNjcm9sbC1iYXIgaXMgdG9nZ2xlZApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2staW4tYmFuZC1zdHlsZS1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1pbi1iYW5kLXN0eWxlLWV4cGVjdGVk LnR4dAppbmRleCAzMjdhNDg0ZmNiNzIzMDE3NDhmOGZjMDJlNjU5MDJhZjJjYjJlOTJiLi4yMzQ3 MmM1YzMxZTJkNGY2YWZhNWI1MjI0MzI1NGJlNzRhNDUzMjcwIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9tZWRpYS90cmFjay90cmFjay1pbi1iYW5kLXN0eWxlLWV4cGVjdGVkLnR4dAorKysgYi9M YXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1pbi1iYW5kLXN0eWxlLWV4cGVjdGVkLnR4dApA QCAtMTMsNyArMTMsNyBAQCBSVU4odmlkZW8ucGxheSgpKQogRVZFTlQoY3VlY2hhbmdlKQogCiAq KiBUZXN0IGN1cnJlbnQgY3VlIGNvbG9ycwotRVhQRUNURUQgKGN1ZU5vZGUuc3R5bGUuY29sb3Ig PT0gJ3JnYigyNTUsIDI1NSwgMjU1KScpIE9LCi1FWFBFQ1RFRCAoY3VlTm9kZS5zdHlsZS5iYWNr Z3JvdW5kQ29sb3IgPT0gJ3JnYigwLCAwLCAwKScpIE9LCitFWFBFQ1RFRCAoZ2V0Q29tcHV0ZWRT dHlsZShjdWVOb2RlKS5jb2xvciA9PSAncmdiKDI1NSwgMjU1LCAyNTUpJykgT0sKK0VYUEVDVEVE IChnZXRDb21wdXRlZFN0eWxlKGN1ZU5vZGUpLmJhY2tncm91bmRDb2xvciA9PSAncmdiYSgwLCAw LCAwLCAwLjgpJykgT0sKIEVORCBPRiBURVNUCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21l ZGlhL3RyYWNrL3RyYWNrLWluLWJhbmQtc3R5bGUuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3Ry YWNrL3RyYWNrLWluLWJhbmQtc3R5bGUuaHRtbAppbmRleCAxNWZjNzcwNTAwZDViMzJmZjJkYjgz Y2I0NzFjMTQzMDA0ZjI4NDBiLi4xOTlmNTlkOTM4MzhkODFkMmIzOTU4NTk4ZjkxOGNjMTk4YmEx ODg3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS90cmFjay90cmFjay1pbi1iYW5kLXN0 eWxlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdHJhY2svdHJhY2staW4tYmFuZC1zdHls ZS5odG1sCkBAIC0yNSw5ICsyNSw5IEBACiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAKICAg ICAgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+PGk+KiogVGVzdCBjdXJyZW50IGN1 ZSBjb2xvcnM8IiArICIvaT4iKTsKLSAgICAgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJj dWVOb2RlLnN0eWxlLmNvbG9yIiwgInJnYigyNTUsIDI1NSwgMjU1KSIpOwotICAgICAgICAgICAg ICAgICAgICB0ZXN0RXhwZWN0ZWQoImN1ZU5vZGUuc3R5bGUuYmFja2dyb3VuZENvbG9yIiwgInJn YigwLCAwLCAwKSIpOwotICAgIAorICAgICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImdl dENvbXB1dGVkU3R5bGUoY3VlTm9kZSkuY29sb3IiLCAicmdiKDI1NSwgMjU1LCAyNTUpIik7Cisg ICAgICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZ2V0Q29tcHV0ZWRTdHlsZShjdWVOb2Rl KS5iYWNrZ3JvdW5kQ29sb3IiLCAicmdiYSgwLCAwLCAwLCAwLjgpIik7CisKICAgICAgICAgICAg ICAgICAgICAgZW5kVGVzdCgpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAK