Title: [178498] branches/safari-600.5-branch/Source/WebCore
- Revision
- 178498
- Author
- [email protected]
- Date
- 2015-01-15 02:27:34 -0800 (Thu, 15 Jan 2015)
Log Message
Merged r175828. rdar://problems/19424171
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178497 => 178498)
--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-15 10:16:45 UTC (rev 178497)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-15 10:27:34 UTC (rev 178498)
@@ -1,3 +1,20 @@
+2015-01-15 Matthew Hanson <[email protected]>
+
+ Merge r175828. rdar://problem/19424171
+
+ 2014-11-10 Jer Noble <[email protected]>
+
+ [EME][Mac] Add a systemCode to distinguish when no expired sessions were found in response to a "keyrelease" message.
+ https://bugs.webkit.org/show_bug.cgi?id=138199
+
+ Reviewed by Eric Carlson.
+
+ Clients may want to be able to distinguish between cases where expired session data is not supported, and when
+ those data are supported, but none are found.
+
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+ (WebCore::CDMSessionMediaSourceAVFObjC::generateKeyReleaseMessage):
+
2015-01-15 Babak Shafiei <[email protected]>
Merge r178378. rdar://problem/19274499
Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (178497 => 178498)
--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-01-15 10:16:45 UTC (rev 178497)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-01-15 10:27:34 UTC (rev 178498)
@@ -324,10 +324,15 @@
NSArray* expiredSessions = [getAVStreamSessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get()];
if (![expiredSessions count]) {
+ LOG(Media, "CDMSessionMediaSourceAVFObjC::generateKeyReleaseMessage(%p) - no expired sessions found", this);
+
errorCode = MediaPlayer::KeySystemNotSupported;
+ systemCode = '!mor';
return nullptr;
}
+ LOG(Media, "CDMSessionMediaSourceAVFObjC::generateKeyReleaseMessage(%p) - found %d expired sessions", this, [expiredSessions count]);
+
errorCode = 0;
systemCode = 0;
m_expiredSession = [expiredSessions firstObject];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
