181289 2018-01-04 07:21:58 -0800 [EME][GStreamer] Fix wrong ifdef 2018-01-05 08:52:05 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 175983 1 pnormand pnormand achristensen annulen buildbot calvaris cgarcia commit-queue darin lforschler pnormand webkit-bug-importer zandobersek+ews zan oldest_to_newest 1385799 0 pnormand 2018-01-04 07:21:58 -0800 +++ This bug was initially created as a clone of Bug #175983 +++ [EME][GStreamer] Connect CDM to GStreamer 1385800 1 330467 pnormand 2018-01-04 07:24:19 -0800 Created attachment 330467 Patch 1386118 2 pnormand 2018-01-05 06:01:44 -0800 Committed r226446: <https://trac.webkit.org/changeset/226446> 1386137 3 webkit-bug-importer 2018-01-05 08:50:37 -0800 <rdar://problem/36319472> 330467 2018-01-04 07:24:19 -0800 2018-01-04 09:58:50 -0800 Patch bug-181289-20180104152418.patch text/plain 2682 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWEwYjE1NDg4OGM2ZGE0 YTBmMDM3OTYwN2JmMWExNGE2ZDYwNDBiNi4uNzZmZTA2NjVkYWFjNDRlNzIwNDJlMjUwYzgzYWM1 ODI0ZjM5MDQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE4LTAxLTA0ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbRU1FXVtHU3Ry ZWFtZXJdIEZpeCB3cm9uZyBpZmRlZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgxMjg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6aGFuZGxlTWVzc2FnZSk6IFJlbW92ZSB0aGUKKyAgICAgICAgRU5DUllQVEVE X01FRElBIGlmZGVmIGZyb20gdGhlIFZJREVPX1RSQUNLIGlmZGVmIGJsb2NrLiBCb3RoIGhhdmUK KyAgICAgICAgbm90aGluZyB0byBkbyB0b2dldGhlci4KKwogMjAxOC0wMS0wNCAgUGhpbGlwcGUg Tm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RL IGJ1aWxkIGZpeCBhdHRlbXB0IGFmdGVyIHIyMjYzNTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggODMzYTc1YmE4ZjhhOTk2ZTNlMTNlYzcz MjY3ZjIxNWQxODdhOGVhZC4uYzlhYzE4N2YyY2Y0MzE2ZmNhOWY3ZTdhOTE4YmMxN2RmZTcxYzU2 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK QEAgLTEwMjMsMjAgKzEwMjMsMTcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OmhhbmRsZU1lc3NhZ2UoR3N0TWVzc2FnZSogbWVzc2FnZSkKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogI2lmIEVOQUJMRShWSURFT19UUkFDSykgJiYgVVNFKEdTVFJFQU1FUl9NUEVHVFMpCi0g ICAgICAgIGVsc2UgewotICAgICAgICAgICAgR3N0TXBlZ3RzU2VjdGlvbiogc2VjdGlvbiA9IGdz dF9tZXNzYWdlX3BhcnNlX21wZWd0c19zZWN0aW9uKG1lc3NhZ2UpOwotICAgICAgICAgICAgaWYg KHNlY3Rpb24pIHsKLSAgICAgICAgICAgICAgICBwcm9jZXNzTXBlZ1RzU2VjdGlvbihzZWN0aW9u KTsKLSAgICAgICAgICAgICAgICBnc3RfbXBlZ3RzX3NlY3Rpb25fdW5yZWYoc2VjdGlvbik7Ci0g ICAgICAgICAgICB9Ci0jaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKLSAgICAgICAgICAgIGVs c2UgaWYgKGdzdF9zdHJ1Y3R1cmVfaGFzX25hbWUoc3RydWN0dXJlLCAiZHJtLWtleS1uZWVkZWQi KSkgewotICAgICAgICAgICAgICAgIEdTVF9ERUJVRygiZHJtLWtleS1uZWVkZWQgbWVzc2FnZSBm cm9tICVzIiwgR1NUX01FU1NBR0VfU1JDX05BTUUobWVzc2FnZSkpOwotICAgICAgICAgICAgICAg IEdSZWZQdHI8R3N0RXZlbnQ+IGV2ZW50OwotICAgICAgICAgICAgICAgIGdzdF9zdHJ1Y3R1cmVf Z2V0KHN0cnVjdHVyZSwgImV2ZW50IiwgR1NUX1RZUEVfRVZFTlQsICZldmVudC5vdXRQdHIoKSwg bnVsbHB0cik7Ci0gICAgICAgICAgICAgICAgaGFuZGxlUHJvdGVjdGlvbkV2ZW50KGV2ZW50Lmdl dCgpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgZWxzZSBpZiAoR3N0TXBlZ3RzU2VjdGlvbiog c2VjdGlvbiA9IGdzdF9tZXNzYWdlX3BhcnNlX21wZWd0c19zZWN0aW9uKG1lc3NhZ2UpKSB7Cisg ICAgICAgICAgICBwcm9jZXNzTXBlZ1RzU2VjdGlvbihzZWN0aW9uKTsKKyAgICAgICAgICAgIGdz dF9tcGVndHNfc2VjdGlvbl91bnJlZihzZWN0aW9uKTsKKyAgICAgICAgfQogI2VuZGlmCisjaWYg RU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKKyAgICAgICAgZWxzZSBpZiAoZ3N0X3N0cnVjdHVyZV9o YXNfbmFtZShzdHJ1Y3R1cmUsICJkcm0ta2V5LW5lZWRlZCIpKSB7CisgICAgICAgICAgICBHU1Rf REVCVUcoImRybS1rZXktbmVlZGVkIG1lc3NhZ2UgZnJvbSAlcyIsIEdTVF9NRVNTQUdFX1NSQ19O QU1FKG1lc3NhZ2UpKTsKKyAgICAgICAgICAgIEdSZWZQdHI8R3N0RXZlbnQ+IGV2ZW50OworICAg ICAgICAgICAgZ3N0X3N0cnVjdHVyZV9nZXQoc3RydWN0dXJlLCAiZXZlbnQiLCBHU1RfVFlQRV9F VkVOVCwgJmV2ZW50Lm91dFB0cigpLCBudWxscHRyKTsKKyAgICAgICAgICAgIGhhbmRsZVByb3Rl Y3Rpb25FdmVudChldmVudC5nZXQoKSk7CiAgICAgICAgIH0KICNlbmRpZgogICAgICAgICBicmVh azsK