160502 2016-08-03 05:37:50 -0700 WebRTC: OWR: Add support for the muted state in the mediaplayer 2016-08-04 03:56:31 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alex alex adam.bergkvist bugs-noreply pnormand oldest_to_newest 1216895 0 alex 2016-08-03 05:37:50 -0700 Currently the mediaplayer does not handle correctly the initial muted state of the tracks. 1216897 1 285221 alex 2016-08-03 05:59:44 -0700 Created attachment 285221 Patch 1216923 2 285221 eric.carlson 2016-08-03 08:37:08 -0700 Comment on attachment 285221 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=285221&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:317 > + GST_WARNING("Unmutting a track with None type"); Nit: "Unmutting" isn't always correct. 1217348 3 alex 2016-08-04 02:27:47 -0700 Committed r204118: <http://trac.webkit.org/changeset/204118> 1217360 4 alex 2016-08-04 03:56:31 -0700 (In reply to comment #2) > Comment on attachment 285221 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=285221&action=review > > > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:317 > > + GST_WARNING("Unmutting a track with None type"); > > Nit: "Unmutting" isn't always correct. Right, fixed for the commit, thanks. 285221 2016-08-03 05:59:44 -0700 2016-08-03 07:21:07 -0700 Patch bug-160502-20160803145820.patch text/plain 11242 alex U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0MDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTkxMTFmOGI1MGI2M2M0 NmViNGU0Y2JjYzFjOWMwNzkxZmI0MzczOS4uYmRhYzlhNDZhMWU1MzE2Y2U4ZmZhYmJjMzRjNTA3 NzEzNjg2ZjkxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE2LTA4LTAzICBBbGVq YW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFdlYlJUQzogT1dS OiBBZGQgc3VwcG9ydCBmb3IgdGhlIG11dGVkIHN0YXRlIGluIHRoZSBtZWRpYXBsYXllcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYwNTAyCisKKyAg ICAgICAgTW9kaWZpZWQgdGhlIGxvYWQsIHBsYXkgYW5kIHN0b3AgbWV0aG9kcyB0byBoYW5kbGUg dGhlIG5ldworICAgICAgICBzaXR1YXRpb24gd2hlcmUgdGhlIG1lZGlhU291cmNlIGNvdWxkIGJl IGVtcHR5LCB1bnRpbCB0aGUgcmVtb3RlCisgICAgICAgIHNpZGUgc2VuZHMgdGhlIGluZm9ybWF0 aW9uIHRvIGNyZWF0ZSB0aGUgcmVjZWl2ZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB3ZSBuZWVkIHRvIHVwc3RyZWFtIHRo ZSBvd3IgZW5kcG9pbnQgdG8gY2hlY2sgdGhpcworICAgICAgICBzaXR1YXRpb24uCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyT3dyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ck93cjo6cGxheSk6IENoZWNrIHRoZSBtdXRlZAorICAgICAgICBzdGF0ZSBvZiB0aGUgdHJhY2tz IGlmIHJlcXVpcmVkLCB3ZSBkbyBpdCB1c2luZyB0aGUgbmV3CisgICAgICAgIG1heWJlSGFuZGxl Q2hhbmdlTXV0ZWRTdGF0ZSBmdW5jdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lck93cjo6bG9hZCk6IEFkZCBhbHdheXMgdGhlCisgICAgICAgIG9ic2Vy dmVyIG9mIHRoZSB0cmFjayB0byBjaGVjayB3aGVuIGl0IGlzIHVubXV0ZWQsIGFuZCB3ZSBkZWxh eQorICAgICAgICBlbmFibGluZy9zZXR0aW5nIHRoZSBzb3VyY2UgdW50aWwgdGhlIHBsYXkgb3Ig dGhlIHVubXV0ZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ck93cjo6aW50ZXJuYWxMb2FkKTogUmVtb3ZlZCwKKyAgICAgICAgd2Ugbm93IGRvIGFsbCBpbiB0 aGUgbG9hZCBtZXRob2QuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJPd3I6OnN0b3ApOiBSZW1vdmUgdGhlCisgICAgICAgIG1lZGlhc291cmNlIHdoZW4gZGlz YWJsaW5nLiBSZW1vdmVkIHRoZSBtX3N0b3BwZWQgc3RhdGUsIGl0IHdhcworICAgICAgICB0aGVy ZSBiZWNhdXNlIHRoZSBpbnRlcm5hbExvYWQgd2FzIGNhbGxlZCBtdWx0aXBsZSB0aW1lcy4KKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6dHJhY2tNdXRl ZENoYW5nZWQpOgorICAgICAgICBDaGVjayB0aGUgbXV0ZWQgc3RhdGUgYW5kIGhhbmRsZSBpdCwg d2UgdXNlIHRoZSBuZXcgbWV0aG9kCisgICAgICAgIG1heWJlSGFuZGxlQ2hhbmdlTXV0ZWRTdGF0 ZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6bWF5 YmVIYW5kbGVDaGFuZ2VNdXRlZFN0YXRlKToKKyAgICAgICAgQ2hlY2sgaWYgdGhlIHRyYWNrIGlz IG11dGVkIG9yIG5vdCwgaW4gY2FzZSBpdCBpcyBtdXRlZCBkaXNhYmxlCisgICAgICAgIHRoZSB0 aGUgcmVuZGVyZXIgYW5kIHJlbW92ZSBpdHMgbWVkaWFzb3VyY2UuIElmIGl0IGlzIG5vdCBtdXRl ZAorICAgICAgICBlbmFibGUgdGhlIHJlbmRlcmVyIGFuZCBzZXQgdGhlIG1lZGlhc291cmNlLgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjpjcmVhdGVW aWRlb1NpbmspOiBNb3ZlCisgICAgICAgIHRoZSB3b3JrYXJvdW5kIGZvciB0aGUgcmVuZGVyZXIg dG8gdGhpcyBtZXRob2Qgd2hlbiBpdCBpcyBjcmVhdGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3IuaDoKKyAgICAg ICAgUmVtb3ZlZCBpbnRlcm5hbExvYWQgbWV0aG9kIGFuZCB0aGUgbV9zdG9wcGVkIGF0dHJpYnV0 ZSB1c2VkIHRvCisgICAgICAgIGNhbGwgaW50ZXJuYWxMb2FkIG11bHRpcGxlIHRpbWVzLgorCiAy MDE2LTA4LTAyICBGcmVkZXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KIAogICAgICAgICBN b3ZlIGRldGVybWluYXRpb24gb2Ygb3BlcmF0b3IgZGlyZWN0aW9uIGludG8gRE9NIGNsYXNzIGFu ZCByZWR1Y2UgcmVsYXlvdXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lck93ci5jcHAKaW5kZXggMTU1ZWUzNjMyMDRiNTZjODBlZjM4YTU2NmIwZGNlOGJh MmNjOGMwNC4uOWIzNzgzYzAzNjkwMzU2NzI3MGE5YjA1MDY3ZTIzY2E5NTcwM2M1MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lck93ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93ci5jcHAKQEAg LTcxLDcgKzcxLDE3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjpwbGF5 KCkKICAgICB9CiAKICAgICBtX3BhdXNlZCA9IGZhbHNlOwotICAgIGludGVybmFsTG9hZCgpOwor CisgICAgR1NUX0RFQlVHKCJDb25uZWN0aW5nIHRvIGxpdmUgc3RyZWFtLCBkZXNjcmlwdG9yOiAl cCIsIG1fc3RyZWFtUHJpdmF0ZS5nZXQoKSk7CisKKyAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX3N0 cmVhbVByaXZhdGUtPnRyYWNrcygpKSB7CisgICAgICAgIGlmICghdHJhY2stPmVuYWJsZWQoKSkg eworICAgICAgICAgICAgR1NUX0RFQlVHKCJUcmFjayAlcyBkaXNhYmxlZCIsIHRyYWNrLT5sYWJl bCgpLmFzY2lpKCkuZGF0YSgpKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisK KyAgICAgICAgbWF5YmVIYW5kbGVDaGFuZ2VNdXRlZFN0YXRlKCp0cmFjayk7CisgICAgfQogfQog CiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6cGF1c2UoKQpAQCAtMTMyLDEw ICsxNDIsMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3I6OmxvYWQoTWVk aWFTdHJlYW1Qcml2YXRlJiBzdHJlYW1Qcml2YXRlKQogICAgIGlmICghaW5pdGlhbGl6ZUdTdHJl YW1lcigpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1fdmlkZW9TaW5rKQorICAgIGlm IChzdHJlYW1Qcml2YXRlLmhhc1ZpZGVvKCkgJiYgIW1fdmlkZW9TaW5rKQogICAgICAgICBjcmVh dGVWaWRlb1NpbmsoKTsKIAotICAgIGlmICghbV9hdWRpb1NpbmspCisgICAgaWYgKHN0cmVhbVBy aXZhdGUuaGFzQXVkaW8oKSAmJiAhbV9hdWRpb1NpbmspCiAgICAgICAgIGNyZWF0ZUdTVEF1ZGlv U2lua0JpbigpOwogCiAgICAgR1NUX0RFQlVHKCJMb2FkaW5nIE1lZGlhU3RyZWFtUHJpdmF0ZSAl cCIsICZzdHJlYW1Qcml2YXRlKTsKQEAgLTE1MSw3NSArMTYxLDIwIEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjpsb2FkKE1lZGlhU3RyZWFtUHJpdmF0ZSYgc3RyZWFtUHJp dmF0ZSkKICAgICBtX3BsYXllci0+bmV0d29ya1N0YXRlQ2hhbmdlZCgpOwogICAgIG1fcGxheWVy LT5yZWFkeVN0YXRlQ2hhbmdlZCgpOwogCi0gICAgaWYgKCFpbnRlcm5hbExvYWQoKSkKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgLy8gSWYgdGhlIHN0cmVhbSBjb250YWlucyB2aWRlbywgd2FpdCBm b3IgZmlyc3QgdmlkZW8gZnJhbWUgYmVmb3JlIHNldHRpbmcKLSAgICAvLyBIYXZlRW5vdWdoRGF0 YS4KLSAgICBpZiAoIWhhc1ZpZGVvKCkpCi0gICAgICAgIG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxh eWVyOjpIYXZlRW5vdWdoRGF0YTsKLQotICAgIG1fcGxheWVyLT5yZWFkeVN0YXRlQ2hhbmdlZCgp OwotfQotCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6bG9hZGluZ0ZhaWxl ZChNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIGVycm9yKQotewotICAgIGlmIChtX25ldHdvcmtT dGF0ZSAhPSBlcnJvcikgewotICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IGVycm9yOwotICAgICAg ICBtX3BsYXllci0+bmV0d29ya1N0YXRlQ2hhbmdlZCgpOwotICAgIH0KLSAgICBpZiAobV9yZWFk eVN0YXRlICE9IE1lZGlhUGxheWVyOjpIYXZlTm90aGluZykgewotICAgICAgICBtX3JlYWR5U3Rh dGUgPSBNZWRpYVBsYXllcjo6SGF2ZU5vdGhpbmc7Ci0gICAgICAgIG1fcGxheWVyLT5yZWFkeVN0 YXRlQ2hhbmdlZCgpOwotICAgIH0KLX0KLQotYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJPd3I6OmRpZExvYWRpbmdQcm9ncmVzcygpIGNvbnN0Ci17Ci0gICAgLy8gRklYTUU6IEltcGxl bWVudCBsb2FkaW5nIHByb2dyZXNzIHN1cHBvcnQuCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLWJv b2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjppbnRlcm5hbExvYWQoKQotewotICAg IGlmICghbV9zdG9wcGVkKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBtX3N0b3BwZWQg PSBmYWxzZTsKLSAgICBpZiAoIW1fc3RyZWFtUHJpdmF0ZSB8fCAhbV9zdHJlYW1Qcml2YXRlLT5h Y3RpdmUoKSkgewotICAgICAgICBsb2FkaW5nRmFpbGVkKE1lZGlhUGxheWVyOjpOZXR3b3JrRXJy b3IpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgR1NUX0RFQlVHKCJDb25u ZWN0aW5nIHRvIGxpdmUgc3RyZWFtLCBkZXNjcmlwdG9yOiAlcCIsIG1fc3RyZWFtUHJpdmF0ZS5n ZXQoKSk7Ci0KICAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX3N0cmVhbVByaXZhdGUtPnRyYWNrcygp KSB7CiAgICAgICAgIGlmICghdHJhY2stPmVuYWJsZWQoKSkgewogICAgICAgICAgICAgR1NUX0RF QlVHKCJUcmFjayAlcyBkaXNhYmxlZCIsIHRyYWNrLT5sYWJlbCgpLmFzY2lpKCkuZGF0YSgpKTsK ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgICAgT3dyTWVkaWFTb3Vy Y2UqIG1lZGlhU291cmNlID0gT1dSX01FRElBX1NPVVJDRShyZWludGVycHJldF9jYXN0PFJlYWx0 aW1lTWVkaWFTb3VyY2VPd3IqPigmdHJhY2stPnNvdXJjZSgpKS0+bWVkaWFTb3VyY2UoKSk7Cisg ICAgICAgIHRyYWNrLT5hZGRPYnNlcnZlcigqdGhpcyk7CiAKICAgICAgICAgc3dpdGNoICh0cmFj ay0+dHlwZSgpKSB7CiAgICAgICAgIGNhc2UgUmVhbHRpbWVNZWRpYVNvdXJjZTo6QXVkaW86Ci0g ICAgICAgICAgICBpZiAobV9hdWRpb1RyYWNrICYmIChtX2F1ZGlvVHJhY2suZ2V0KCkgPT0gdHJh Y2spKQotICAgICAgICAgICAgICAgIGdfb2JqZWN0X3NldChtX2F1ZGlvUmVuZGVyZXIuZ2V0KCks ICJkaXNhYmxlZCIsIEZBTFNFLCBudWxscHRyKTsKLQotICAgICAgICAgICAgb3dyX21lZGlhX3Jl bmRlcmVyX3NldF9zb3VyY2UoT1dSX01FRElBX1JFTkRFUkVSKG1fYXVkaW9SZW5kZXJlci5nZXQo KSksIG1lZGlhU291cmNlKTsKICAgICAgICAgICAgIG1fYXVkaW9UcmFjayA9IHRyYWNrOwotICAg ICAgICAgICAgdHJhY2stPmFkZE9ic2VydmVyKCp0aGlzKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlZpZGVvOgotICAgICAgICAgICAgaWYg KG1fdmlkZW9UcmFjayAmJiAobV92aWRlb1RyYWNrLmdldCgpID09IHRyYWNrKSkKLSAgICAgICAg ICAgICAgICBnX29iamVjdF9zZXQobV92aWRlb1JlbmRlcmVyLmdldCgpLCAiZGlzYWJsZWQiLCBG QUxTRSwgbnVsbHB0cik7Ci0KLSAgICAgICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgaGFyZGNvZGVk IHZpZGVvIGRpbWVuc2lvbnMgd2hlbiB0aGUgcmVuZGVyaW5nIHBlcmZvcm1hbmNlOgotICAgICAg ICAgICAgLy8gaHR0cHM6Ly93ZWJraXQub3JnL2IvMTUzODI2LgotICAgICAgICAgICAgZ19vYmpl Y3Rfc2V0KG1fdmlkZW9SZW5kZXJlci5nZXQoKSwgIndpZHRoIiwgNjQwLCAiaGVpZ2h0IiwgNDgw LCBudWxscHRyKTsKLSAgICAgICAgICAgIG93cl9tZWRpYV9yZW5kZXJlcl9zZXRfc291cmNlKE9X Ul9NRURJQV9SRU5ERVJFUihtX3ZpZGVvUmVuZGVyZXIuZ2V0KCkpLCBtZWRpYVNvdXJjZSk7CiAg ICAgICAgICAgICBtX3ZpZGVvVHJhY2sgPSB0cmFjazsKLSAgICAgICAgICAgIHRyYWNrLT5hZGRP YnNlcnZlcigqdGhpcyk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBSZWFsdGlt ZU1lZGlhU291cmNlOjpOb25lOgogICAgICAgICAgICAgR1NUX1dBUk5JTkcoIkxvYWRpbmcgYSB0 cmFjayB3aXRoIE5vbmUgdHlwZSIpOwpAQCAtMjI4LDIyICsxODMsMzcgQEAgYm9vbCBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJPd3I6OmludGVybmFsTG9hZCgpCiAKICAgICBtX3JlYWR5U3Rh dGUgPSBNZWRpYVBsYXllcjo6SGF2ZUVub3VnaERhdGE7CiAgICAgbV9wbGF5ZXItPnJlYWR5U3Rh dGVDaGFuZ2VkKCk7Cit9CisKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjps b2FkaW5nRmFpbGVkKE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgZXJyb3IpCit7CisgICAgaWYg KG1fbmV0d29ya1N0YXRlICE9IGVycm9yKSB7CisgICAgICAgIG1fbmV0d29ya1N0YXRlID0gZXJy b3I7CisgICAgICAgIG1fcGxheWVyLT5uZXR3b3JrU3RhdGVDaGFuZ2VkKCk7CisgICAgfQorICAg IGlmIChtX3JlYWR5U3RhdGUgIT0gTWVkaWFQbGF5ZXI6OkhhdmVOb3RoaW5nKSB7CisgICAgICAg IG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpIYXZlTm90aGluZzsKKyAgICAgICAgbV9wbGF5 ZXItPnJlYWR5U3RhdGVDaGFuZ2VkKCk7CisgICAgfQorfQorCitib29sIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lck93cjo6ZGlkTG9hZGluZ1Byb2dyZXNzKCkgY29uc3QKK3sKKyAgICAvLyBG SVhNRTogSW1wbGVtZW50IGxvYWRpbmcgcHJvZ3Jlc3Mgc3VwcG9ydC4KICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3I6OnN0b3AoKQogewot ICAgIGlmIChtX3N0b3BwZWQpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fc3RvcHBlZCA9IHRy dWU7CiAgICAgaWYgKG1fYXVkaW9UcmFjaykgewogICAgICAgICBHU1RfREVCVUcoIlN0b3A6IGRp c2Nvbm5lY3RpbmcgYXVkaW8iKTsKICAgICAgICAgZ19vYmplY3Rfc2V0KG1fYXVkaW9SZW5kZXJl ci5nZXQoKSwgImRpc2FibGVkIiwgVFJVRSwgbnVsbHB0cik7CisgICAgICAgIG93cl9tZWRpYV9y ZW5kZXJlcl9zZXRfc291cmNlKE9XUl9NRURJQV9SRU5ERVJFUihtX2F1ZGlvUmVuZGVyZXIuZ2V0 KCkpLCBudWxscHRyKTsKICAgICB9CiAgICAgaWYgKG1fdmlkZW9UcmFjaykgewogICAgICAgICBH U1RfREVCVUcoIlN0b3A6IGRpc2Nvbm5lY3RpbmcgdmlkZW8iKTsKICAgICAgICAgZ19vYmplY3Rf c2V0KG1fdmlkZW9SZW5kZXJlci5nZXQoKSwgImRpc2FibGVkIiwgVFJVRSwgbnVsbHB0cik7Cisg ICAgICAgIG93cl9tZWRpYV9yZW5kZXJlcl9zZXRfc291cmNlKE9XUl9NRURJQV9SRU5ERVJFUiht X3ZpZGVvUmVuZGVyZXIuZ2V0KCkpLCBudWxscHRyKTsKICAgICB9CiB9CiAKQEAgLTMxMiw5ICsy ODIsNDAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3I6OnRyYWNrRW5kZWQo TWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmIHRyYWNrKQogICAgICAgICBnX29iamVjdF9zZXQobV92 aWRlb1JlbmRlcmVyLmdldCgpLCAiZGlzYWJsZWQiLCBUUlVFLCBudWxscHRyKTsKIH0KIAotdm9p ZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3I6OnRyYWNrTXV0ZWRDaGFuZ2VkKE1lZGlh U3RyZWFtVHJhY2tQcml2YXRlJikKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dy Ojp0cmFja011dGVkQ2hhbmdlZChNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYgdHJhY2spCiB7CiAg ICAgR1NUX0RFQlVHKCJUcmFjayBtdXRlZCBzdGF0ZSBjaGFuZ2VkIik7CisKKyAgICBtYXliZUhh bmRsZUNoYW5nZU11dGVkU3RhdGUodHJhY2spOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lck93cjo6bWF5YmVIYW5kbGVDaGFuZ2VNdXRlZFN0YXRlKE1lZGlhU3RyZWFtVHJh Y2tQcml2YXRlJiB0cmFjaykKK3sKKyAgICBhdXRvIHJlYWxUaW1lTWVkaWFTb3VyY2UgPSByZWlu dGVycHJldF9jYXN0PFJlYWx0aW1lTWVkaWFTb3VyY2VPd3IqPigmdHJhY2suc291cmNlKCkpOwor ICAgIGF1dG8gbWVkaWFTb3VyY2UgPSBPV1JfTUVESUFfU09VUkNFKHJlYWxUaW1lTWVkaWFTb3Vy Y2UtPm1lZGlhU291cmNlKCkpOworCisgICAgc3dpdGNoICh0cmFjay50eXBlKCkpIHsKKyAgICBj YXNlIFJlYWx0aW1lTWVkaWFTb3VyY2U6OkF1ZGlvOgorICAgICAgICBpZiAoIXJlYWxUaW1lTWVk aWFTb3VyY2UtPm11dGVkKCkpIHsKKyAgICAgICAgICAgIGdfb2JqZWN0X3NldChtX2F1ZGlvUmVu ZGVyZXIuZ2V0KCksICJkaXNhYmxlZCIsIGZhbHNlLCBudWxscHRyKTsKKyAgICAgICAgICAgIG93 cl9tZWRpYV9yZW5kZXJlcl9zZXRfc291cmNlKE9XUl9NRURJQV9SRU5ERVJFUihtX2F1ZGlvUmVu ZGVyZXIuZ2V0KCkpLCBtZWRpYVNvdXJjZSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICBnX29iamVjdF9zZXQobV9hdWRpb1JlbmRlcmVyLmdldCgpLCAiZGlzYWJsZWQiLCB0cnVlLCBu dWxscHRyKTsKKyAgICAgICAgICAgIG93cl9tZWRpYV9yZW5kZXJlcl9zZXRfc291cmNlKE9XUl9N RURJQV9SRU5ERVJFUihtX2F1ZGlvUmVuZGVyZXIuZ2V0KCkpLCBudWxscHRyKTsKKyAgICAgICAg fQorICAgICAgICBicmVhazsKKyAgICBjYXNlIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlZpZGVvOgor ICAgICAgICBpZiAoIXJlYWxUaW1lTWVkaWFTb3VyY2UtPm11dGVkKCkpIHsKKyAgICAgICAgICAg IGdfb2JqZWN0X3NldChtX3ZpZGVvUmVuZGVyZXIuZ2V0KCksICJkaXNhYmxlZCIsIGZhbHNlLCBu dWxscHRyKTsKKyAgICAgICAgICAgIG93cl9tZWRpYV9yZW5kZXJlcl9zZXRfc291cmNlKE9XUl9N RURJQV9SRU5ERVJFUihtX3ZpZGVvUmVuZGVyZXIuZ2V0KCkpLCBtZWRpYVNvdXJjZSk7CisgICAg ICAgIH0gZWxzZSB7CisgICAgICAgICAgICBnX29iamVjdF9zZXQobV92aWRlb1JlbmRlcmVyLmdl dCgpLCAiZGlzYWJsZWQiLCB0cnVlLCBudWxscHRyKTsKKyAgICAgICAgICAgIG93cl9tZWRpYV9y ZW5kZXJlcl9zZXRfc291cmNlKE9XUl9NRURJQV9SRU5ERVJFUihtX3ZpZGVvUmVuZGVyZXIuZ2V0 KCkpLCBudWxscHRyKTsKKyAgICAgICAgfQorICAgICAgICBicmVhazsKKyAgICBjYXNlIFJlYWx0 aW1lTWVkaWFTb3VyY2U6Ok5vbmU6CisgICAgICAgIEdTVF9XQVJOSU5HKCJVbm11dHRpbmcgYSB0 cmFjayB3aXRoIE5vbmUgdHlwZSIpOworICAgIH0KIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXJPd3I6OnRyYWNrU2V0dGluZ3NDaGFuZ2VkKE1lZGlhU3RyZWFtVHJhY2tQcml2 YXRlJikKQEAgLTMzMSw2ICszMzIsMTEgQEAgR3N0RWxlbWVudCogTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyT3dyOjpjcmVhdGVWaWRlb1NpbmsoKQogewogICAgIEdzdEVsZW1lbnQqIHNpbmsg PSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpjcmVhdGVWaWRlb1NpbmsoKTsKICAg ICBtX3ZpZGVvUmVuZGVyZXIgPSBhZG9wdEdSZWYob3dyX2dzdF92aWRlb19yZW5kZXJlcl9uZXco c2luaykpOworCisgICAgLy8gRklYTUU6IFJlbW92ZSBoYXJkY29kZWQgdmlkZW8gZGltZW5zaW9u cyB3aGVuIHRoZSByZW5kZXJpbmcgcGVyZm9ybWFuY2U6CisgICAgLy8gaHR0cHM6Ly93ZWJraXQu b3JnL2IvMTUzODI2LgorICAgIGdfb2JqZWN0X3NldChtX3ZpZGVvUmVuZGVyZXIuZ2V0KCksICJ3 aWR0aCIsIDY0MCwgImhlaWdodCIsIDQ4MCwgbnVsbHB0cik7CisKICAgICByZXR1cm4gc2luazsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93ci5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93ci5o CmluZGV4IDUwMGQ0ZTYzMmU5ODIzNTEwZjJjZGNhNzJlZmRlNzFmMjUyZDYyNjAuLmZkZjU0ZDFk NDQ1MDJmYzllZDAwNTdiNDRlMmJkMGJlNjE4MmIyM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJPd3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyLmgKQEAgLTk0LDExICs5NCwxMCBAQCBwcml2 YXRlOgogICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVHU3RyZWFtZXJBbmRHU3RyZWFtZXJEZWJ1 Z2dpbmcoKTsKICAgICB2b2lkIGNyZWF0ZUdTVEF1ZGlvU2lua0JpbigpOwogICAgIHZvaWQgbG9h ZGluZ0ZhaWxlZChNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIGVycm9yKTsKLSAgICBib29sIGlu dGVybmFsTG9hZCgpOwogICAgIHZvaWQgc3RvcCgpOworICAgIHZvaWQgbWF5YmVIYW5kbGVDaGFu Z2VNdXRlZFN0YXRlKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJik7CiAKICAgICBib29sIG1fcGF1 c2VkIHsgdHJ1ZSB9OwotICAgIGJvb2wgbV9zdG9wcGVkIHsgdHJ1ZSB9OwogICAgIFJlZlB0cjxN ZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZT4gbV92aWRlb1RyYWNrOwogICAgIFJlZlB0cjxNZWRpYVN0 cmVhbVRyYWNrUHJpdmF0ZT4gbV9hdWRpb1RyYWNrOwogICAgIEdSZWZQdHI8R3N0RWxlbWVudD4g bV9hdWRpb1Npbms7Cg==