235870 2022-01-30 07:52:35 -0800 [GStreamer] Support for vpx in webrtc encoder 2022-02-01 09:19:17 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris cgarcia eric.carlson ews-watchlist glenn gustavo hta jer.noble menard philipj sergio tommyw vjaquez webkit-bug-importer oldest_to_newest 1835380 0 pnormand 2022-01-30 07:52:35 -0800 . 1835381 1 450360 pnormand 2022-01-30 07:57:55 -0800 Created attachment 450360 Patch 1835387 2 450362 pnormand 2022-01-30 08:30:20 -0800 Created attachment 450362 Patch 1835867 3 vjaquez 2022-02-01 01:53:12 -0800 heh... another patch that I cooked long ago and it bitrotten in my branch. 1835868 4 450362 vjaquez 2022-02-01 01:56:49 -0800 Comment on attachment 450362 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450362&action=review > Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoEncoder.cpp:38 > +static GstStaticPadTemplate srcTemplate = GST_STATIC_PAD_TEMPLATE("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-h264;video/x-vp8;video/x-vp9")); What have worried my about this static (something that had hit me in gstreamer-vaapi) is that the element is offering all these codecs, but we don't effectively assure we have them before offering them via caps template. 1836002 5 pnormand 2022-02-01 09:13:04 -0800 Thanks for raising this issue :) I'll try to address it in a follow-up patch! 1836006 6 ews-feeder 2022-02-01 09:18:21 -0800 Committed r288883 (246635@main): <https://commits.webkit.org/246635@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450362. 1836008 7 webkit-bug-importer 2022-02-01 09:19:17 -0800 <rdar://problem/88331669> 450360 2022-01-30 07:57:55 -0800 2022-01-30 08:30:14 -0800 Patch bug-235870-20220130075753.patch text/plain 5862 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4Nzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNjODA5ZGNhODk1YjRi MWMyMDUwNTBmMjkyODQ3ZmI0YjczYTJkMi4uN2JiZWNmYzFjY2ViYjVjZmI5NDkyNjFhNTM5Y2Jl NzdlMWZkMTBmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAxLTMwICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTdXBwb3J0IGZvciB2cHggaW4gd2VicnRjIGVuY29kZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTg3MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBlbmNvZGluZyB0byBW UDggYW5kIFZQOS4gVGhlIGVuY29kZXIgaXMgbm93IGF2YWlsYWJsZSBvdXRzaWRlIG9mIHRoZSBX ZWJSVEMKKyAgICAgICAgYmFja2VuZCwgc28gdGhhdCBpdCBjYW4gcG90ZW50aWFsbHkgYmUgYXV0 by1wbHVnZ2VkICh3aGljaCB3aWxsIGJlIHVzZWZ1bCBmb3IgdGhlCisgICAgICAgIE1lZGlhUmVj b3JkZXIgc3VwcG9ydCkuIEluIG9yZGVyIHRvIGFsbG93IHRoaXMgbWV0YWRhdGEgYW5kIHBhZCB0 ZW1wbGF0ZXMgd2VyZSBhbHNvIGFkZGVkIHRvCisgICAgICAgIHRoZSBlbGVtZW50LgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpyZWdpc3RlcldlYktpdEdTdHJlYW1lckVsZW1lbnRzKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVyVmlkZW9FbmNvZGVy LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJydGNfdmlkZW9fZW5jb2Rlcl9jbGFzc19pbml0KToK KwogMjAyMi0wMS0zMCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0dTdHJlYW1lcl0gR3N0U3RydWN0dXJlIHRvIEpTT04gc2VyaWFsaXphdGlvbgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dT dHJlYW1lckNvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmNwcAppbmRleCBlMGFkZDU5MGZkZThjYjdkNTg5MTE3Yzlk ZGJhMWIwMjE2MmI5OTQ3Li5mNjcyZDUxMTU1NmM1MzAxYzkxN2EzY2QxZTkzZGMyYzNlMDY2Mzc1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv R1N0cmVhbWVyQ29tbW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmNwcApAQCAtNTYsNiArNTYsNyBAQAogCiAjaWYg RU5BQkxFKE1FRElBX1NUUkVBTSkKICNpbmNsdWRlICJHU3RyZWFtZXJNZWRpYVN0cmVhbVNvdXJj ZS5oIgorI2luY2x1ZGUgIkdTdHJlYW1lclZpZGVvRW5jb2Rlci5oIgogI2VuZGlmCiAKICNpZiBF TkFCTEUoRU5DUllQVEVEX01FRElBKQpAQCAtMzE3LDYgKzMxOCw3IEBAIHZvaWQgcmVnaXN0ZXJX ZWJLaXRHU3RyZWFtZXJFbGVtZW50cygpCiAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQogICAg ICAgICBnc3RfZWxlbWVudF9yZWdpc3RlcihudWxscHRyLCAibWVkaWFzdHJlYW1zcmMiLCBHU1Rf UkFOS19QUklNQVJZLCBXRUJLSVRfVFlQRV9NRURJQV9TVFJFQU1fU1JDKTsKKyAgICAgICAgZ3N0 X2VsZW1lbnRfcmVnaXN0ZXIobnVsbHB0ciwgIndlYnJ0Y3ZpZGVvZW5jb2RlciIsIEdTVF9SQU5L X1BSSU1BUlkgKyAxMDAsIFdFQktJVF9UWVBFX1dFQlJUQ19WSURFT19FTkNPREVSKTsKICNlbmRp ZgogCiAjaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJWaWRlb0VuY29kZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1l clZpZGVvRW5jb2Rlci5jcHAKaW5kZXggM2ZmZTNmZmMxY2I0YWViYTQ4OWU3ODA2NmM5MTRjMGJk ZDFmMjY2ZS4uZjM3YWEwMThhNzc3NDdhZmRiZWUzMzliY2QyY2JhMzcxOWM0MzNhNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJl YW1lclZpZGVvRW5jb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lclZpZGVvRW5jb2Rlci5jcHAKQEAgLTM1LDcgKzM1LDcg QEAgR1NUX0RFQlVHX0NBVEVHT1JZKHdlYnJ0Y192ZW5jX2RlYnVnKTsKICNkZWZpbmUgS0JJVF9U T19CSVQgMTAyNAogCiBzdGF0aWMgR3N0U3RhdGljUGFkVGVtcGxhdGUgc2lua1RlbXBsYXRlID0g R1NUX1NUQVRJQ19QQURfVEVNUExBVEUoInNpbmsiLCBHU1RfUEFEX1NJTkssIEdTVF9QQURfQUxX QVlTLCBHU1RfU1RBVElDX0NBUFMoInZpZGVvL3gtcmF3KEFOWSkiKSk7Ci1zdGF0aWMgR3N0U3Rh dGljUGFkVGVtcGxhdGUgc3JjVGVtcGxhdGUgPSBHU1RfU1RBVElDX1BBRF9URU1QTEFURSgic3Jj IiwgR1NUX1BBRF9TUkMsIEdTVF9QQURfQUxXQVlTLCBHU1RfU1RBVElDX0NBUFMoInZpZGVvL3gt aDI2NCIpKTsKK3N0YXRpYyBHc3RTdGF0aWNQYWRUZW1wbGF0ZSBzcmNUZW1wbGF0ZSA9IEdTVF9T VEFUSUNfUEFEX1RFTVBMQVRFKCJzcmMiLCBHU1RfUEFEX1NSQywgR1NUX1BBRF9BTFdBWVMsIEdT VF9TVEFUSUNfQ0FQUygidmlkZW8veC1oMjY0O3ZpZGVvL3gtdnA4O3ZpZGVvL3gtdnA5IikpOwog CiB1c2luZyBTZXRCaXRyYXRlRnVuYyA9IEZ1bmN0aW9uPHZvaWQoR09iamVjdCogZW5jb2Rlciwg Y29uc3QgY2hhciogcHJvcGVydHlOYW1lLCBpbnQgYml0cmF0ZSk+OwogdXNpbmcgU2V0dXBGdW5j ID0gRnVuY3Rpb248dm9pZChXZWJLaXRXZWJydGNWaWRlb0VuY29kZXIqKT47CkBAIC01MSw3ICs1 MSwxNCBAQCBzdHJ1Y3QgRW5jb2RlckRlZmluaXRpb24gewogICAgIGNvbnN0IGNoYXIqIGtleWZy YW1lSW50ZXJ2YWxQcm9wZXJ0eU5hbWU7CiB9OwogCi1lbnVtIEVuY29kZXJJZCB7IE5vbmUsIFgy NjQsIE9wZW5IMjY0LCBPbXhIMjY0IH07CitlbnVtIEVuY29kZXJJZCB7CisgICAgTm9uZSwKKyAg ICBYMjY0LAorICAgIE9wZW5IMjY0LAorICAgIE9teEgyNjQsCisgICAgVnA4LAorICAgIFZwOQor fTsKIAogY2xhc3MgRW5jb2RlcnMgewogcHVibGljOgpAQCAtOTcsNyArMTA0LDcgQEAgc3RydWN0 IF9XZWJLaXRXZWJydGNWaWRlb0VuY29kZXJQcml2YXRlIHsKIAogI2RlZmluZSB3ZWJraXRfd2Vi cnRjX3ZpZGVvX2VuY29kZXJfcGFyZW50X2NsYXNzIHBhcmVudF9jbGFzcwogV0VCS0lUX0RFRklO RV9UWVBFX1dJVEhfQ09ERShXZWJLaXRXZWJydGNWaWRlb0VuY29kZXIsIHdlYmtpdF93ZWJydGNf dmlkZW9fZW5jb2RlciwgR1NUX1RZUEVfQklOLAotICAgIEdTVF9ERUJVR19DQVRFR09SWV9JTklU KHdlYnJ0Y192ZW5jX2RlYnVnLCAid2VicnRjZW5jb2RlciIsIDAsICJWaWRlbyBlbmNvZGVyIGZv ciBXZWJSVEMiKSkKKyAgICBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJydGNfdmVuY19kZWJ1 ZywgIndlYmtpdHdlYnJ0Y2VuY29kZXIiLCAwLCAiVmlkZW8gZW5jb2RlciBmb3IgV2ViUlRDIikp CiAKIGVudW0gewogICAgIFBST1BfRk9STUFUID0gMSwKQEAgLTI1OCw2ICsyNjUsMTEgQEAgc3Rh dGljIHZvaWQgd2Via2l0X3dlYnJ0Y192aWRlb19lbmNvZGVyX2NsYXNzX2luaXQoV2ViS2l0V2Vi cnRjVmlkZW9FbmNvZGVyQ2xhc3MKICAgICBvYmplY3RDbGFzcy0+Z2V0X3Byb3BlcnR5ID0gd2Vi cnRjVmlkZW9FbmNvZGVyR2V0UHJvcGVydHk7CiAgICAgb2JqZWN0Q2xhc3MtPnNldF9wcm9wZXJ0 eSA9IHdlYnJ0Y1ZpZGVvRW5jb2RlclNldFByb3BlcnR5OwogCisgICAgR3N0RWxlbWVudENsYXNz KiBlbGVtZW50Q2xhc3MgPSBHU1RfRUxFTUVOVF9DTEFTUyhrbGFzcyk7CisgICAgZ3N0X2VsZW1l bnRfY2xhc3Nfc2V0X3N0YXRpY19tZXRhZGF0YShlbGVtZW50Q2xhc3MsICJXZWJLaXQgV2ViUlRD IHZpZGVvIGVuY29kZXIiLCAiQ29kZWMvRW5jb2Rlci9WaWRlbyIsICJFbmNvZGVzIHZpZGVvIGZv ciBzdHJlYW1pbmciLCAiSWdhbGlhIik7CisgICAgZ3N0X2VsZW1lbnRfY2xhc3NfYWRkX3BhZF90 ZW1wbGF0ZShlbGVtZW50Q2xhc3MsIGdzdF9zdGF0aWNfcGFkX3RlbXBsYXRlX2dldCgmc2lua1Rl bXBsYXRlKSk7CisgICAgZ3N0X2VsZW1lbnRfY2xhc3NfYWRkX3BhZF90ZW1wbGF0ZShlbGVtZW50 Q2xhc3MsIGdzdF9zdGF0aWNfcGFkX3RlbXBsYXRlX2dldCgmc3JjVGVtcGxhdGUpKTsKKwogICAg IGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2JqZWN0Q2xhc3MsIFBST1BfRk9STUFU LCBnX3BhcmFtX3NwZWNfYm94ZWQoImZvcm1hdCIsICJGb3JtYXQgYXMgY2FwcyIsICJTZXQgdGhl IGNhcHMgb2YgdGhlIGZvcm1hdCB0byBiZSB1c2VkLiIsIEdTVF9UWVBFX0NBUFMsIFdFQktJVF9Q QVJBTV9SRUFEV1JJVEUpKTsKIAogICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHko b2JqZWN0Q2xhc3MsIFBST1BfRU5DT0RFUiwgZ19wYXJhbV9zcGVjX29iamVjdCgiZW5jb2RlciIs ICJUaGUgYWN0dWFsIGVuY29kZXIgZWxlbWVudCIsICJUaGUgZW5jb2RlciBlbGVtZW50IiwgR1NU X1RZUEVfRUxFTUVOVCwgV0VCS0lUX1BBUkFNX1JFQURBQkxFKSk7CkBAIC0yODUsNiArMjk3LDE0 IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJydGNfdmlkZW9fZW5jb2Rlcl9jbGFzc19pbml0KFdl YktpdFdlYnJ0Y1ZpZGVvRW5jb2RlckNsYXNzCiAgICAgICAgIFtdKFdlYktpdFdlYnJ0Y1ZpZGVv RW5jb2Rlciogc2VsZikgewogICAgICAgICAgICAgZ19vYmplY3Rfc2V0KHNlbGYtPnByaXYtPnBh cnNlci5nZXQoKSwgImNvbmZpZy1pbnRlcnZhbCIsIDEsIG51bGxwdHIpOwogICAgICAgICB9LCAi Yml0cmF0ZSIsIHNldEJpdHJhdGVCaXRQZXJTZWMsICJnb3Atc2l6ZSIpOworICAgIEVuY29kZXJz OjpyZWdpc3RlckVuY29kZXIoVnA4LCAidnA4ZW5jIiwgbnVsbHB0ciwgInZpZGVvL3gtdnA4Iiwg bnVsbHB0ciwKKyAgICAgICAgW10oV2ViS2l0V2VicnRjVmlkZW9FbmNvZGVyKiBzZWxmKSB7Cisg ICAgICAgICAgICBnc3RfcHJlc2V0X2xvYWRfcHJlc2V0KEdTVF9QUkVTRVQoc2VsZi0+cHJpdi0+ ZW5jb2Rlci5nZXQoKSksICJQcm9maWxlIFJlYWx0aW1lIik7CisgICAgICAgIH0sICJ0YXJnZXQt Yml0cmF0ZSIsIHNldEJpdHJhdGVCaXRQZXJTZWMsICJrZXlmcmFtZS1tYXgtZGlzdCIpOworICAg IEVuY29kZXJzOjpyZWdpc3RlckVuY29kZXIoVnA5LCAidnA5ZW5jIiwgbnVsbHB0ciwgInZpZGVv L3gtdnA5IiwgbnVsbHB0ciwKKyAgICAgICAgW10oV2ViS2l0V2VicnRjVmlkZW9FbmNvZGVyKiBz ZWxmKSB7CisgICAgICAgICAgICBnX29iamVjdF9zZXQoc2VsZi0+cHJpdi0+ZW5jb2Rlci5nZXQo KSwgInRocmVhZHMiLCA0LCAiY3B1LXVzZWQiLCA0LCAidGlsZS1yb3dzIiwgMiwgInJvdy1tdCIs IHRydWUsIG51bGxwdHIpOworICAgICAgICB9LCAidGFyZ2V0LWJpdHJhdGUiLCBzZXRCaXRyYXRl Qml0UGVyU2VjLCAia2V5ZnJhbWUtbWF4LWRpc3QiKTsKIH0KIAogI2VuZGlmIC8vIEVOQUJMRShW SURFTykgJiYgRU5BQkxFKE1FRElBX1NUUkVBTSkgJiYgVVNFKEdTVFJFQU1FUikK 450362 2022-01-30 08:30:20 -0800 2022-02-01 09:18:24 -0800 Patch bug-235870-20220130083019.patch text/plain 7200 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4ODAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjcyNDIxMmZjMGFmNmQz NTAyYmU0MzViNDcxOTQzNmI2ODM4ZDZiYS4uYWNjOGFlNmU2MDI2NWVkNTg4MjgwMTRiZjI3NTIz MzhjZjc2NWJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAxLTMwICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTdXBwb3J0IGZvciB2cHggaW4gd2VicnRjIGVuY29kZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTg3MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBlbmNvZGluZyB0byBW UDggYW5kIFZQOS4gVGhlIGVuY29kZXIgaXMgbm93IGF2YWlsYWJsZSBvdXRzaWRlIG9mIHRoZSBX ZWJSVEMKKyAgICAgICAgYmFja2VuZCwgc28gdGhhdCBpdCBjYW4gcG90ZW50aWFsbHkgYmUgYXV0 by1wbHVnZ2VkICh3aGljaCB3aWxsIGJlIHVzZWZ1bCBmb3IgdGhlCisgICAgICAgIE1lZGlhUmVj b3JkZXIgc3VwcG9ydCkuIEluIG9yZGVyIHRvIGFsbG93IHRoaXMgbWV0YWRhdGEgYW5kIHBhZCB0 ZW1wbGF0ZXMgd2VyZSBhbHNvIGFkZGVkIHRvCisgICAgICAgIHRoZSBlbGVtZW50LgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpyZWdpc3RlcldlYktpdEdTdHJlYW1lckVsZW1lbnRzKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVyVmlkZW9FbmNvZGVy LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJydGNfdmlkZW9fZW5jb2Rlcl9jbGFzc19pbml0KToK KwogMjAyMi0wMS0zMCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg KFJFR1JFU1NJT04pW0lGQ11bUlRMXSB3cHQvY3NzL2Nzcy10ZXh0L3doaXRlLXNwYWNlL3RyYWls aW5nLXNwYWNlLWFuZC10ZXh0LWFsaWdubWVudC1ydGwtMDAzLmh0bWwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1l ckNvbW1vbi5jcHAKaW5kZXggZTBhZGQ1OTBmZGU4Y2I3ZDU4OTExN2M5ZGRiYTFiMDIxNjJiOTk0 Ny4uZjY3MmQ1MTE1NTZjNTMwMWM5MTdhM2NkMWU5M2RjMmMzZTA2NjM3NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1v bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dT dHJlYW1lckNvbW1vbi5jcHAKQEAgLTU2LDYgKzU2LDcgQEAKIAogI2lmIEVOQUJMRShNRURJQV9T VFJFQU0pCiAjaW5jbHVkZSAiR1N0cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuaCIKKyNpbmNsdWRl ICJHU3RyZWFtZXJWaWRlb0VuY29kZXIuaCIKICNlbmRpZgogCiAjaWYgRU5BQkxFKEVOQ1JZUFRF RF9NRURJQSkKQEAgLTMxNyw2ICszMTgsNyBAQCB2b2lkIHJlZ2lzdGVyV2ViS2l0R1N0cmVhbWVy RWxlbWVudHMoKQogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKICAgICAgICAgZ3N0X2VsZW1l bnRfcmVnaXN0ZXIobnVsbHB0ciwgIm1lZGlhc3RyZWFtc3JjIiwgR1NUX1JBTktfUFJJTUFSWSwg V0VCS0lUX1RZUEVfTUVESUFfU1RSRUFNX1NSQyk7CisgICAgICAgIGdzdF9lbGVtZW50X3JlZ2lz dGVyKG51bGxwdHIsICJ3ZWJydGN2aWRlb2VuY29kZXIiLCBHU1RfUkFOS19QUklNQVJZICsgMTAw LCBXRUJLSVRfVFlQRV9XRUJSVENfVklERU9fRU5DT0RFUik7CiAjZW5kaWYKIAogI2lmIEVOQUJM RShNRURJQV9TT1VSQ0UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVyVmlkZW9FbmNvZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJWaWRlb0VuY29kZXIu Y3BwCmluZGV4IDNmZmUzZmZjMWNiNGFlYmE0ODllNzgwNjZjOTE0YzBiZGQxZjI2NmUuLmYzN2Fh MDE4YTc3NzQ3YWZkYmVlMzM5YmNkMmNiYTM3MTljNDMzYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJWaWRlb0VuY29k ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1l ci9HU3RyZWFtZXJWaWRlb0VuY29kZXIuY3BwCkBAIC0zNSw3ICszNSw3IEBAIEdTVF9ERUJVR19D QVRFR09SWSh3ZWJydGNfdmVuY19kZWJ1Zyk7CiAjZGVmaW5lIEtCSVRfVE9fQklUIDEwMjQKIAog c3RhdGljIEdzdFN0YXRpY1BhZFRlbXBsYXRlIHNpbmtUZW1wbGF0ZSA9IEdTVF9TVEFUSUNfUEFE X1RFTVBMQVRFKCJzaW5rIiwgR1NUX1BBRF9TSU5LLCBHU1RfUEFEX0FMV0FZUywgR1NUX1NUQVRJ Q19DQVBTKCJ2aWRlby94LXJhdyhBTlkpIikpOwotc3RhdGljIEdzdFN0YXRpY1BhZFRlbXBsYXRl IHNyY1RlbXBsYXRlID0gR1NUX1NUQVRJQ19QQURfVEVNUExBVEUoInNyYyIsIEdTVF9QQURfU1JD LCBHU1RfUEFEX0FMV0FZUywgR1NUX1NUQVRJQ19DQVBTKCJ2aWRlby94LWgyNjQiKSk7CitzdGF0 aWMgR3N0U3RhdGljUGFkVGVtcGxhdGUgc3JjVGVtcGxhdGUgPSBHU1RfU1RBVElDX1BBRF9URU1Q TEFURSgic3JjIiwgR1NUX1BBRF9TUkMsIEdTVF9QQURfQUxXQVlTLCBHU1RfU1RBVElDX0NBUFMo InZpZGVvL3gtaDI2NDt2aWRlby94LXZwODt2aWRlby94LXZwOSIpKTsKIAogdXNpbmcgU2V0Qml0 cmF0ZUZ1bmMgPSBGdW5jdGlvbjx2b2lkKEdPYmplY3QqIGVuY29kZXIsIGNvbnN0IGNoYXIqIHBy b3BlcnR5TmFtZSwgaW50IGJpdHJhdGUpPjsKIHVzaW5nIFNldHVwRnVuYyA9IEZ1bmN0aW9uPHZv aWQoV2ViS2l0V2VicnRjVmlkZW9FbmNvZGVyKik+OwpAQCAtNTEsNyArNTEsMTQgQEAgc3RydWN0 IEVuY29kZXJEZWZpbml0aW9uIHsKICAgICBjb25zdCBjaGFyKiBrZXlmcmFtZUludGVydmFsUHJv cGVydHlOYW1lOwogfTsKIAotZW51bSBFbmNvZGVySWQgeyBOb25lLCBYMjY0LCBPcGVuSDI2NCwg T214SDI2NCB9OworZW51bSBFbmNvZGVySWQgeworICAgIE5vbmUsCisgICAgWDI2NCwKKyAgICBP cGVuSDI2NCwKKyAgICBPbXhIMjY0LAorICAgIFZwOCwKKyAgICBWcDkKK307CiAKIGNsYXNzIEVu Y29kZXJzIHsKIHB1YmxpYzoKQEAgLTk3LDcgKzEwNCw3IEBAIHN0cnVjdCBfV2ViS2l0V2VicnRj VmlkZW9FbmNvZGVyUHJpdmF0ZSB7CiAKICNkZWZpbmUgd2Via2l0X3dlYnJ0Y192aWRlb19lbmNv ZGVyX3BhcmVudF9jbGFzcyBwYXJlbnRfY2xhc3MKIFdFQktJVF9ERUZJTkVfVFlQRV9XSVRIX0NP REUoV2ViS2l0V2VicnRjVmlkZW9FbmNvZGVyLCB3ZWJraXRfd2VicnRjX3ZpZGVvX2VuY29kZXIs IEdTVF9UWVBFX0JJTiwKLSAgICBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJydGNfdmVuY19k ZWJ1ZywgIndlYnJ0Y2VuY29kZXIiLCAwLCAiVmlkZW8gZW5jb2RlciBmb3IgV2ViUlRDIikpCisg ICAgR1NUX0RFQlVHX0NBVEVHT1JZX0lOSVQod2VicnRjX3ZlbmNfZGVidWcsICJ3ZWJraXR3ZWJy dGNlbmNvZGVyIiwgMCwgIlZpZGVvIGVuY29kZXIgZm9yIFdlYlJUQyIpKQogCiBlbnVtIHsKICAg ICBQUk9QX0ZPUk1BVCA9IDEsCkBAIC0yNTgsNiArMjY1LDExIEBAIHN0YXRpYyB2b2lkIHdlYmtp dF93ZWJydGNfdmlkZW9fZW5jb2Rlcl9jbGFzc19pbml0KFdlYktpdFdlYnJ0Y1ZpZGVvRW5jb2Rl ckNsYXNzCiAgICAgb2JqZWN0Q2xhc3MtPmdldF9wcm9wZXJ0eSA9IHdlYnJ0Y1ZpZGVvRW5jb2Rl ckdldFByb3BlcnR5OwogICAgIG9iamVjdENsYXNzLT5zZXRfcHJvcGVydHkgPSB3ZWJydGNWaWRl b0VuY29kZXJTZXRQcm9wZXJ0eTsKIAorICAgIEdzdEVsZW1lbnRDbGFzcyogZWxlbWVudENsYXNz ID0gR1NUX0VMRU1FTlRfQ0xBU1Moa2xhc3MpOworICAgIGdzdF9lbGVtZW50X2NsYXNzX3NldF9z dGF0aWNfbWV0YWRhdGEoZWxlbWVudENsYXNzLCAiV2ViS2l0IFdlYlJUQyB2aWRlbyBlbmNvZGVy IiwgIkNvZGVjL0VuY29kZXIvVmlkZW8iLCAiRW5jb2RlcyB2aWRlbyBmb3Igc3RyZWFtaW5nIiwg IklnYWxpYSIpOworICAgIGdzdF9lbGVtZW50X2NsYXNzX2FkZF9wYWRfdGVtcGxhdGUoZWxlbWVu dENsYXNzLCBnc3Rfc3RhdGljX3BhZF90ZW1wbGF0ZV9nZXQoJnNpbmtUZW1wbGF0ZSkpOworICAg IGdzdF9lbGVtZW50X2NsYXNzX2FkZF9wYWRfdGVtcGxhdGUoZWxlbWVudENsYXNzLCBnc3Rfc3Rh dGljX3BhZF90ZW1wbGF0ZV9nZXQoJnNyY1RlbXBsYXRlKSk7CisKICAgICBnX29iamVjdF9jbGFz c19pbnN0YWxsX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQUk9QX0ZPUk1BVCwgZ19wYXJhbV9zcGVj X2JveGVkKCJmb3JtYXQiLCAiRm9ybWF0IGFzIGNhcHMiLCAiU2V0IHRoZSBjYXBzIG9mIHRoZSBm b3JtYXQgdG8gYmUgdXNlZC4iLCBHU1RfVFlQRV9DQVBTLCBXRUJLSVRfUEFSQU1fUkVBRFdSSVRF KSk7CiAKICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQ Uk9QX0VOQ09ERVIsIGdfcGFyYW1fc3BlY19vYmplY3QoImVuY29kZXIiLCAiVGhlIGFjdHVhbCBl bmNvZGVyIGVsZW1lbnQiLCAiVGhlIGVuY29kZXIgZWxlbWVudCIsIEdTVF9UWVBFX0VMRU1FTlQs IFdFQktJVF9QQVJBTV9SRUFEQUJMRSkpOwpAQCAtMjg1LDYgKzI5NywxNCBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRfd2VicnRjX3ZpZGVvX2VuY29kZXJfY2xhc3NfaW5pdChXZWJLaXRXZWJydGNWaWRl b0VuY29kZXJDbGFzcwogICAgICAgICBbXShXZWJLaXRXZWJydGNWaWRlb0VuY29kZXIqIHNlbGYp IHsKICAgICAgICAgICAgIGdfb2JqZWN0X3NldChzZWxmLT5wcml2LT5wYXJzZXIuZ2V0KCksICJj b25maWctaW50ZXJ2YWwiLCAxLCBudWxscHRyKTsKICAgICAgICAgfSwgImJpdHJhdGUiLCBzZXRC aXRyYXRlQml0UGVyU2VjLCAiZ29wLXNpemUiKTsKKyAgICBFbmNvZGVyczo6cmVnaXN0ZXJFbmNv ZGVyKFZwOCwgInZwOGVuYyIsIG51bGxwdHIsICJ2aWRlby94LXZwOCIsIG51bGxwdHIsCisgICAg ICAgIFtdKFdlYktpdFdlYnJ0Y1ZpZGVvRW5jb2Rlciogc2VsZikgeworICAgICAgICAgICAgZ3N0 X3ByZXNldF9sb2FkX3ByZXNldChHU1RfUFJFU0VUKHNlbGYtPnByaXYtPmVuY29kZXIuZ2V0KCkp LCAiUHJvZmlsZSBSZWFsdGltZSIpOworICAgICAgICB9LCAidGFyZ2V0LWJpdHJhdGUiLCBzZXRC aXRyYXRlQml0UGVyU2VjLCAia2V5ZnJhbWUtbWF4LWRpc3QiKTsKKyAgICBFbmNvZGVyczo6cmVn aXN0ZXJFbmNvZGVyKFZwOSwgInZwOWVuYyIsIG51bGxwdHIsICJ2aWRlby94LXZwOSIsIG51bGxw dHIsCisgICAgICAgIFtdKFdlYktpdFdlYnJ0Y1ZpZGVvRW5jb2Rlciogc2VsZikgeworICAgICAg ICAgICAgZ19vYmplY3Rfc2V0KHNlbGYtPnByaXYtPmVuY29kZXIuZ2V0KCksICJ0aHJlYWRzIiwg NCwgImNwdS11c2VkIiwgNCwgInRpbGUtcm93cyIsIDIsICJyb3ctbXQiLCB0cnVlLCBudWxscHRy KTsKKyAgICAgICAgfSwgInRhcmdldC1iaXRyYXRlIiwgc2V0Qml0cmF0ZUJpdFBlclNlYywgImtl eWZyYW1lLW1heC1kaXN0Iik7CiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoVklERU8pICYmIEVOQUJM RShNRURJQV9TVFJFQU0pICYmIFVTRShHU1RSRUFNRVIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvZ3N0cmVhbWVyL0dTdHJlYW1lclZp ZGVvRW5jb2RlckZhY3RvcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbGlid2VicnRjL2dzdHJlYW1lci9HU3RyZWFtZXJWaWRlb0VuY29kZXJGYWN0b3J5LmNwcApp bmRleCBiYzBkODcxYmYzZTYxMmVkOTRmY2Q4OTIyZjA1OWRmMzgzOTI2Mzk5Li4wNjZlNjNhN2Iy OTcxZTk4ODM2ZDYxM2Q0OGEzYjJlOTI2MWQ2NDFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvZ3N0cmVhbWVyL0dTdHJlYW1lclZpZGVv RW5jb2RlckZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL2xpYndlYnJ0Yy9nc3RyZWFtZXIvR1N0cmVhbWVyVmlkZW9FbmNvZGVyRmFjdG9yeS5jcHAK QEAgLTI0LDcgKzI0LDYgQEAKICNpbmNsdWRlICJHU3RyZWFtZXJWaWRlb0VuY29kZXJGYWN0b3J5 LmgiCiAKICNpbmNsdWRlICJHU3RyZWFtZXJWaWRlb0NvbW1vbi5oIgotI2luY2x1ZGUgIkdTdHJl YW1lclZpZGVvRW5jb2Rlci5oIgogI2luY2x1ZGUgIkdTdHJlYW1lclZpZGVvRnJhbWVMaWJXZWJS VEMuaCIKICNpbmNsdWRlICJMaWJXZWJSVENXZWJLaXRNYWNyb3MuaCIKICNpbmNsdWRlICJ3ZWJy dGMvYXBpL3ZpZGVvX2NvZGVjcy92cDlfcHJvZmlsZS5oIgpAQCAtNDIzLDkgKzQyMiw2IEBAIEdT dHJlYW1lclZpZGVvRW5jb2RlckZhY3Rvcnk6OkdTdHJlYW1lclZpZGVvRW5jb2RlckZhY3Rvcnko Ym9vbCBpc1N1cHBvcnRpbmdWUDlQCiAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIGRlYnVnUmVn aXN0ZXJlZEZsYWc7CiAgICAgc3RkOjpjYWxsX29uY2UoZGVidWdSZWdpc3RlcmVkRmxhZywgW10g ewogICAgICAgICBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJraXRfd2VicnRjZW5jX2RlYnVn LCAid2Via2l0bGlid2VicnRjdmlkZW9lbmNvZGVyIiwgMCwgIldlYktpdCBXZWJSVEMgdmlkZW8g ZW5jb2RlciIpOwotICAgICAgICBhdXRvIGZhY3RvcnkgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRf ZmFjdG9yeV9maW5kKCJ3ZWJydGN2aWRlb2VuY29kZXIiKSk7Ci0gICAgICAgIGlmICghZmFjdG9y eSkKLSAgICAgICAgICAgIGdzdF9lbGVtZW50X3JlZ2lzdGVyKG51bGxwdHIsICJ3ZWJydGN2aWRl b2VuY29kZXIiLCBHU1RfUkFOS19OT05FLCBXRUJLSVRfVFlQRV9XRUJSVENfVklERU9fRU5DT0RF Uik7CiAgICAgfSk7CiB9CiAK