224976 2021-04-23 07:47:11 -0700 [GStreamer][EME] cbcs fixes 2021-04-24 15:02:59 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 calvaris calvaris cgarcia ews-watchlist gustavo menard pnormand vjaquez webkit-bug-importer oldest_to_newest 1753579 0 calvaris 2021-04-23 07:47:11 -0700 [GStreamer][EME] cbcs fixes 1753581 1 426907 calvaris 2021-04-23 07:50:20 -0700 Created attachment 426907 Patch 1753583 2 426907 pnormand 2021-04-23 07:58:22 -0700 Comment on attachment 426907 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426907&action=review > Source/WebCore/ChangeLog:14 > + cbcs buffers could not include the subsample_count, we conside 0 consider > Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:247 > + unsigned subSampleCount = 0; > + gst_structure_get_uint(protectionMeta->info, "subsample_count", &subSampleCount); Shouldn't this be conditioned on the caps? subsample_count is irrelevant for CBCS but is relevant for the other system. 1753596 3 426912 calvaris 2021-04-23 08:57:03 -0700 Created attachment 426912 Patch 1753610 4 ews-feeder 2021-04-23 09:31:40 -0700 Committed r276500 (236959@main): <https://commits.webkit.org/236959@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426912. 1753901 5 webkit-bug-importer 2021-04-24 15:02:59 -0700 <rdar://problem/77110028> 426907 2021-04-23 07:50:20 -0700 2021-04-23 08:56:58 -0700 Patch bug-224976-20210423165018.patch text/plain 2994 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjRhOTAzYWZjNDk4YmY5 YmI2NWY5NmFhNjI5NThhNTVjYzkzNWUzOS4uODYyNWQzZjkwNGU2NGZiZjI5NmVlMDExNWRhMDNh NDI3MzU3OTI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA0LTIzICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl1bRU1FXSBjYmNzIGZpeGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjQ5NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJbiBjYmNzIHlvdSBjYW4gZ2V0IGZyb20gcXRkZW11eCBidWZmZXJz IHdpdGhvdXQgYW4gaXZfc2l6ZQorICAgICAgICBiZWNhdXNlIGl0IGhhZCBjb25zdGFudF9pdl9z aXplLiBXZSBuZWVkIHRvIGNoZWNrIHRoYXQuCisKKyAgICAgICAgV2hlbiBkZWNyeXB0aW9uIGJh aWxzIG91dCBiZWNhdXNlIG9mIHRoZSBidWZmZXIgYmVpbmcgdW5lbmNyeXB0ZWQsCisgICAgICAg IHdlIHNob3VsZCBUUkFDRSBzby4KKworICAgICAgICBjYmNzIGJ1ZmZlcnMgY291bGQgbm90IGlu Y2x1ZGUgdGhlIHN1YnNhbXBsZV9jb3VudCwgd2UgY29uc2lkZSAwCisgICAgICAgIGFzIGRlZmF1 bHQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL1dlYktpdENv bW1vbkVuY3J5cHRpb25EZWNyeXB0b3JHU3RyZWFtZXIuY3BwOgorICAgICAgICAodHJhbnNmb3Jt SW5QbGFjZSk6CisKIDIwMjEtMDQtMjMgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtNZWRpYV0gQWxsb3cgYWNjZXNzIHRvIE1lZGlhRWxlbWVudCBp ZCBmcm9tIE1lZGlhUGxheWVyUHJpdmF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25FbmNyeXB0aW9uRGVjcnlw dG9yR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAKaW5k ZXggNWNjNjdmOTg1MjhlMzNiZjAxNzVjNGFiZmQ2MjkzOGY0OWFkM2JmNy4uOGI0Y2Y4NjE4YTM3 MmExYWFmMTgyYjNlMmZhNzU1MmJkZDIzNmI5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25FbmNyeXB0aW9uRGVj cnlwdG9yR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvZW1lL1dlYktpdENvbW1vbkVuY3J5cHRpb25EZWNyeXB0b3JHU3RyZWFtZXIu Y3BwCkBAIC0yMjUsNiArMjI1LDEwIEBAIHN0YXRpYyBHc3RGbG93UmV0dXJuIHRyYW5zZm9ybUlu UGxhY2UoR3N0QmFzZVRyYW5zZm9ybSogYmFzZSwgR3N0QnVmZmVyKiBidWZmZXIpCiAgICAgICAg IEdTVF9FUlJPUl9PQkpFQ1Qoc2VsZiwgIkZhaWxlZCB0byBnZXQgaXZfc2l6ZSIpOwogICAgICAg ICByZXR1cm4gR1NUX0ZMT1dfTk9UX1NVUFBPUlRFRDsKICAgICB9CisgICAgaWYgKCFpdlNpemUg JiYgIWdzdF9zdHJ1Y3R1cmVfZ2V0X3VpbnQocHJvdGVjdGlvbk1ldGEtPmluZm8sICJjb25zdGFu dF9pdl9zaXplIiwgJml2U2l6ZSkpIHsKKyAgICAgICAgR1NUX0VSUk9SX09CSkVDVChzZWxmLCAi Tm8gaXZfc2l6ZSBhbmQgZmFpbGVkIHRvIGdldCBjb25zdGFudF9pdl9zaXplIik7CisgICAgICAg IHJldHVybiBHU1RfRkxPV19OT1RfU1VQUE9SVEVEOworICAgIH0KIAogICAgIGdib29sZWFuIGVu Y3J5cHRlZDsKICAgICBpZiAoIWdzdF9zdHJ1Y3R1cmVfZ2V0X2Jvb2xlYW4ocHJvdGVjdGlvbk1l dGEtPmluZm8sICJlbmNyeXB0ZWQiLCAmZW5jcnlwdGVkKSkgewpAQCAtMjMyLDE2ICsyMzYsMTUg QEAgc3RhdGljIEdzdEZsb3dSZXR1cm4gdHJhbnNmb3JtSW5QbGFjZShHc3RCYXNlVHJhbnNmb3Jt KiBiYXNlLCBHc3RCdWZmZXIqIGJ1ZmZlcikKICAgICAgICAgcmV0dXJuIEdTVF9GTE9XX05PVF9T VVBQT1JURUQ7CiAgICAgfQogCi0gICAgaWYgKCFpdlNpemUgfHwgIWVuY3J5cHRlZCkKKyAgICBp ZiAoIWl2U2l6ZSB8fCAhZW5jcnlwdGVkKSB7CisgICAgICAgIEdTVF9UUkFDRV9PQkpFQ1Qoc2Vs ZiwgIml2IHNpemUgJXUsIGVuY3J5cHRlZCAlcywgYmFpbGluZyBvdXQgT0sgYXMgdW5lbmNyeXB0 ZWQiLCBpdlNpemUsIGJvb2xGb3JQcmludGluZyhlbmNyeXB0ZWQpKTsKICAgICAgICAgcmV0dXJu IEdTVF9GTE9XX09LOworICAgIH0KIAogICAgIEdTVF9ERUJVR19PQkpFQ1QoYmFzZSwgInByb3Rl Y3Rpb24gbWV0YTogJSIgR1NUX1BUUl9GT1JNQVQsIHByb3RlY3Rpb25NZXRhLT5pbmZvKTsKIAot ICAgIHVuc2lnbmVkIHN1YlNhbXBsZUNvdW50OwotICAgIGlmICghZ3N0X3N0cnVjdHVyZV9nZXRf dWludChwcm90ZWN0aW9uTWV0YS0+aW5mbywgInN1YnNhbXBsZV9jb3VudCIsICZzdWJTYW1wbGVD b3VudCkpIHsKLSAgICAgICAgR1NUX0VSUk9SX09CSkVDVChzZWxmLCAiRmFpbGVkIHRvIGdldCBz dWJzYW1wbGVfY291bnQiKTsKLSAgICAgICAgcmV0dXJuIEdTVF9GTE9XX05PVF9TVVBQT1JURUQ7 Ci0gICAgfQorICAgIHVuc2lnbmVkIHN1YlNhbXBsZUNvdW50ID0gMDsKKyAgICBnc3Rfc3RydWN0 dXJlX2dldF91aW50KHByb3RlY3Rpb25NZXRhLT5pbmZvLCAic3Vic2FtcGxlX2NvdW50IiwgJnN1 YlNhbXBsZUNvdW50KTsKIAogICAgIGNvbnN0IEdWYWx1ZSogdmFsdWU7CiAgICAgR3N0QnVmZmVy KiBzdWJTYW1wbGVzQnVmZmVyID0gbnVsbHB0cjsK 426912 2021-04-23 08:57:03 -0700 2021-04-23 09:31:41 -0700 Patch bug-224976-20210423175701.patch text/plain 3062 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjRhOTAzYWZjNDk4YmY5 YmI2NWY5NmFhNjI5NThhNTVjYzkzNWUzOS4uZTFmNzY3ZmEzZGQ4YTdiZWYyYjhkNDE5N2YwYWNl NzA1ZGJkZDVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA0LTIzICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl1bRU1FXSBjYmNzIGZpeGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjQ5NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJbiBjYmNzIHlvdSBjYW4gZ2V0IGZyb20gcXRkZW11eCBidWZmZXJz IHdpdGhvdXQgYW4gaXZfc2l6ZQorICAgICAgICBiZWNhdXNlIGl0IGhhZCBjb25zdGFudF9pdl9z aXplLiBXZSBuZWVkIHRvIGNoZWNrIHRoYXQuCisKKyAgICAgICAgV2hlbiBkZWNyeXB0aW9uIGJh aWxzIG91dCBiZWNhdXNlIG9mIHRoZSBidWZmZXIgYmVpbmcgdW5lbmNyeXB0ZWQsCisgICAgICAg IHdlIHNob3VsZCBUUkFDRSBzby4KKworICAgICAgICBjYmNzIGJ1ZmZlcnMgY291bGQgbm90IGlu Y2x1ZGUgdGhlIHN1YnNhbXBsZV9jb3VudCwgd2UgY29uc2lkZXIgMAorICAgICAgICBhcyBkZWZh dWx0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRD b21tb25FbmNyeXB0aW9uRGVjcnlwdG9yR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHRyYW5zZm9y bUluUGxhY2UpOgorCiAyMDIxLTA0LTIzICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdh bGlhLmNvbT4KIAogICAgICAgICBbTWVkaWFdIEFsbG93IGFjY2VzcyB0byBNZWRpYUVsZW1lbnQg aWQgZnJvbSBNZWRpYVBsYXllclByaXZhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5 cHRvckdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvZW1lL1dlYktpdENvbW1vbkVuY3J5cHRpb25EZWNyeXB0b3JHU3RyZWFtZXIuY3BwCmlu ZGV4IDVjYzY3Zjk4NTI4ZTMzYmYwMTc1YzRhYmZkNjI5MzhmNDlhZDNiZjcuLjY5ZTI3ZjQ4NWE4 NWFkZmQ0ZWUxZTI4MTMyYzE4MzcwZDdhMzMxZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRl Y3J5cHRvckdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25FbmNyeXB0aW9uRGVjcnlwdG9yR1N0cmVhbWVy LmNwcApAQCAtMjI1LDYgKzIyNSwxMCBAQCBzdGF0aWMgR3N0Rmxvd1JldHVybiB0cmFuc2Zvcm1J blBsYWNlKEdzdEJhc2VUcmFuc2Zvcm0qIGJhc2UsIEdzdEJ1ZmZlciogYnVmZmVyKQogICAgICAg ICBHU1RfRVJST1JfT0JKRUNUKHNlbGYsICJGYWlsZWQgdG8gZ2V0IGl2X3NpemUiKTsKICAgICAg ICAgcmV0dXJuIEdTVF9GTE9XX05PVF9TVVBQT1JURUQ7CiAgICAgfQorICAgIGlmICghaXZTaXpl ICYmICFnc3Rfc3RydWN0dXJlX2dldF91aW50KHByb3RlY3Rpb25NZXRhLT5pbmZvLCAiY29uc3Rh bnRfaXZfc2l6ZSIsICZpdlNpemUpKSB7CisgICAgICAgIEdTVF9FUlJPUl9PQkpFQ1Qoc2VsZiwg Ik5vIGl2X3NpemUgYW5kIGZhaWxlZCB0byBnZXQgY29uc3RhbnRfaXZfc2l6ZSIpOworICAgICAg ICByZXR1cm4gR1NUX0ZMT1dfTk9UX1NVUFBPUlRFRDsKKyAgICB9CiAKICAgICBnYm9vbGVhbiBl bmNyeXB0ZWQ7CiAgICAgaWYgKCFnc3Rfc3RydWN0dXJlX2dldF9ib29sZWFuKHByb3RlY3Rpb25N ZXRhLT5pbmZvLCAiZW5jcnlwdGVkIiwgJmVuY3J5cHRlZCkpIHsKQEAgLTIzMiwxMyArMjM2LDE3 IEBAIHN0YXRpYyBHc3RGbG93UmV0dXJuIHRyYW5zZm9ybUluUGxhY2UoR3N0QmFzZVRyYW5zZm9y bSogYmFzZSwgR3N0QnVmZmVyKiBidWZmZXIpCiAgICAgICAgIHJldHVybiBHU1RfRkxPV19OT1Rf U1VQUE9SVEVEOwogICAgIH0KIAotICAgIGlmICghaXZTaXplIHx8ICFlbmNyeXB0ZWQpCisgICAg aWYgKCFpdlNpemUgfHwgIWVuY3J5cHRlZCkgeworICAgICAgICBHU1RfVFJBQ0VfT0JKRUNUKHNl bGYsICJpdiBzaXplICV1LCBlbmNyeXB0ZWQgJXMsIGJhaWxpbmcgb3V0IE9LIGFzIHVuZW5jcnlw dGVkIiwgaXZTaXplLCBib29sRm9yUHJpbnRpbmcoZW5jcnlwdGVkKSk7CiAgICAgICAgIHJldHVy biBHU1RfRkxPV19PSzsKKyAgICB9CiAKICAgICBHU1RfREVCVUdfT0JKRUNUKGJhc2UsICJwcm90 ZWN0aW9uIG1ldGE6ICUiIEdTVF9QVFJfRk9STUFULCBwcm90ZWN0aW9uTWV0YS0+aW5mbyk7CiAK LSAgICB1bnNpZ25lZCBzdWJTYW1wbGVDb3VudDsKLSAgICBpZiAoIWdzdF9zdHJ1Y3R1cmVfZ2V0 X3VpbnQocHJvdGVjdGlvbk1ldGEtPmluZm8sICJzdWJzYW1wbGVfY291bnQiLCAmc3ViU2FtcGxl Q291bnQpKSB7CisgICAgdW5zaWduZWQgc3ViU2FtcGxlQ291bnQgPSAwOworICAgIC8vIGNiY3Mg Y291bGQgbm90IGluY2x1ZGUgdGhlIHN1YnNhbXBsZV9jb3VudC4KKyAgICBpZiAoIWdzdF9zdHJ1 Y3R1cmVfZ2V0X3VpbnQocHJvdGVjdGlvbk1ldGEtPmluZm8sICJzdWJzYW1wbGVfY291bnQiLCAm c3ViU2FtcGxlQ291bnQpCisgICAgICAgICYmICFnc3Rfc3RydWN0dXJlX2hhc19uYW1lKHByb3Rl Y3Rpb25NZXRhLT5pbmZvLCAiYXBwbGljYXRpb24veC1jYmNzIikpIHsKICAgICAgICAgR1NUX0VS Uk9SX09CSkVDVChzZWxmLCAiRmFpbGVkIHRvIGdldCBzdWJzYW1wbGVfY291bnQiKTsKICAgICAg ICAgcmV0dXJuIEdTVF9GTE9XX05PVF9TVVBQT1JURUQ7CiAgICAgfQo=