159812 2016-07-15 06:47:09 -0700 [MSE][Mac] Pass AVSampleBufferDisplayLayer HDCP status to a newly created key session 2016-07-18 12:19:21 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue dino jer.noble webkit-bug-importer oldest_to_newest 1211403 0 eric.carlson 2016-07-15 06:47:09 -0700 [MSE][Mac] Pass AVSampleBufferDisplayLayer HDCP status to a newly created key session 1211404 1 webkit-bug-importer 2016-07-15 06:50:43 -0700 <rdar://problem/27371624> 1211405 2 283759 eric.carlson 2016-07-15 06:59:57 -0700 Created attachment 283759 Proposed patch. 1211443 3 283759 jonlee 2016-07-15 09:47:39 -0700 Comment on attachment 283759 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=283759&action=review > Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:956 > + weakThis->m_session->layerDidReceiveError(nullptr, weakThis->m_hdcpError.get(), ignored); Should the error be cleared at this point? > Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:1008 > + m_hdcpError = error; Should this be cleared if the code is not 'HDCP'? Are there other places where the error should be cleared? 1211458 4 283759 eric.carlson 2016-07-15 10:07:18 -0700 Comment on attachment 283759 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=283759&action=review >> Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:956 >> + weakThis->m_session->layerDidReceiveError(nullptr, weakThis->m_hdcpError.get(), ignored); > > Should the error be cleared at this point? I don't think it should, this method may be called again. >> Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:1008 >> + m_hdcpError = error; > > Should this be cleared if the code is not 'HDCP'? Are there other places where the error should be cleared? It isn't currently possible to recover from an 'HDCP' error, so I don't think it should ever be cleared. 1212052 5 283759 commit-queue 2016-07-18 12:19:18 -0700 Comment on attachment 283759 Proposed patch. Clearing flags on attachment: 283759 Committed r203362: <http://trac.webkit.org/changeset/203362> 1212053 6 commit-queue 2016-07-18 12:19:21 -0700 All reviewed patches have been landed. Closing bug. 283759 2016-07-15 06:59:57 -0700 2016-07-18 12:19:18 -0700 Proposed patch. key_session_error_patch.txt text/plain 3299 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzIyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA3LTE1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdW01hY10gUGFz cyBBVlNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciBIRENQIHN0YXR1cyB0byBhIG5ld2x5IGNyZWF0 ZWQga2V5IHNlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1OTgxMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjczNzE2MjQ+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBp dCBpc24ndCBwb3NzaWJsZSB0byB0ZXN0IHRoaXMgd2l0aCBvdXIgY3VycmVudCB0ZXN0aW5nIGlu ZnJhc3RydWN0dXJlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDOjpzZXRDRE1TZXNz aW9uKTogQ2FsbCBsYXllckRpZFJlY2VpdmVFcnJvciBpZiB0aGVyZSBoYXMKKyAgICAgICAgYmVl biBhbiBIRENQIGVycm9yLgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZUFW Rk9iakM6OnJlbmRlcmVyRGlkUmVjZWl2ZUVycm9yKTogUmVtZW1iZXIgYW4gSERDUCBlcnJvci4K KwogMjAxNi0wNy0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dMaWJdIFVzZSBhIEdTb3VyY2UgaW5zdGVhZCBvZiBhIHRocmVhZCB0byBw b2xsIG1lbW9yeSBwcmVzc3VyZSBldmVudEZEIGluIGxpbnV4IGltcGxlbWVudGF0aW9uCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3Vy Y2VCdWZmZXJQcml2YXRlQVZGT2JqQy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZP YmpDLmgJKHJldmlzaW9uIDIwMzIyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLmgJKHdvcmtp bmcgY29weSkKQEAgLTE0Niw2ICsxNDYsNyBAQCBwcml2YXRlOgogICAgIEhhc2hNYXA8aW50LCBS ZXRhaW5QdHI8QVZTYW1wbGVCdWZmZXJBdWRpb1JlbmRlcmVyPj4gbV9hdWRpb1JlbmRlcmVyczsK ICAgICBSZXRhaW5QdHI8V2ViQVZTdHJlYW1EYXRhUGFyc2VyTGlzdGVuZXI+IG1fZGVsZWdhdGU7 CiAgICAgUmV0YWluUHRyPFdlYkFWU2FtcGxlQnVmZmVyRXJyb3JMaXN0ZW5lcj4gbV9lcnJvckxp c3RlbmVyOworICAgIFJldGFpblB0cjxOU0Vycm9yPiBtX2hkY3BFcnJvcjsKICAgICBPU09iamVj dFB0cjxkaXNwYXRjaF9zZW1hcGhvcmVfdD4gbV9oYXNTZXNzaW9uU2VtYXBob3JlOwogCiAgICAg TWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQyogbV9tZWRpYVNvdXJjZTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclBy aXZhdGVBVkZPYmpDLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1tCShy ZXZpc2lvbiAyMDMyMjQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbQkod29ya2luZyBjb3B5 KQpAQCAtOTQ1LDYgKzk0NSwxNyBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDOjpz ZXRDRE1TCiAgICAgICAgICAgICBkaXNwYXRjaF9zZW1hcGhvcmVfc2lnbmFsKG1faGFzU2Vzc2lv blNlbWFwaG9yZS5nZXQoKSk7CiAgICAgICAgICAgICBtX2hhc1Nlc3Npb25TZW1hcGhvcmUgPSBu dWxscHRyOwogICAgICAgICB9CisKKyAgICAgICAgaWYgKG1faGRjcEVycm9yKSB7CisgICAgICAg ICAgICBXZWFrUHRyPFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDPiB3ZWFrVGhpcyA9IGNyZWF0 ZVdlYWtQdHIoKTsKKyAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3dlYWtUaGlzXSB7Cisg ICAgICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcyB8fCAhd2Vha1RoaXMtPm1fc2Vzc2lvbiB8fCAh d2Vha1RoaXMtPm1faGRjcEVycm9yKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgICAgICAgICBib29sIGlnbm9yZWQgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICB3ZWFr VGhpcy0+bV9zZXNzaW9uLT5sYXllckRpZFJlY2VpdmVFcnJvcihudWxscHRyLCB3ZWFrVGhpcy0+ bV9oZGNwRXJyb3IuZ2V0KCksIGlnbm9yZWQpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0K ICAgICB9CiB9CiAKQEAgLTk5Myw2ICsxMDA0LDkgQEAgdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRl QVZGT2JqQzo6cmVuZGVyZQogewogICAgIExPRyhNZWRpYVNvdXJjZSwgIlNvdXJjZUJ1ZmZlclBy aXZhdGVBVkZPYmpDOjpyZW5kZXJlckRpZFJlY2VpdmVFcnJvciglcCk6IHJlbmRlcmVyKCVwKSwg ZXJyb3IoJUApIiwgdGhpcywgcmVuZGVyZXIsIFtlcnJvciBkZXNjcmlwdGlvbl0pOwogCisgICAg aWYgKFtlcnJvciBjb2RlXSA9PSAnSERDUCcpCisgICAgICAgIG1faGRjcEVycm9yID0gZXJyb3I7 CisKICAgICAvLyBGSVhNRSgxNDIyNDYpOiBSZW1vdmUgdGhlIGZvbGxvd2luZyBvbmNlIDxyZGFy Oi8vcHJvYmxlbS8yMDAyNzQzND4gaXMgcmVzb2x2ZWQuCiAgICAgYm9vbCBhbnlJZ25vcmVkID0g ZmFsc2U7CiAgICAgZm9yIChhdXRvJiBjbGllbnQgOiBtX2Vycm9yQ2xpZW50cykgewo=