Title: [195721] branches/safari-601-branch/Source/WebCore
- Revision
- 195721
- Author
- [email protected]
- Date
- 2016-01-27 17:34:33 -0800 (Wed, 27 Jan 2016)
Log Message
Merge r195609. rdar://problem/24337868
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195720 => 195721)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-28 01:34:31 UTC (rev 195720)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-28 01:34:33 UTC (rev 195721)
@@ -1,5 +1,23 @@
2016-01-27 Matthew Hanson <[email protected]>
+ Merge r195609. rdar://problem/24337868
+
+ 2016-01-26 Jeremy Noble <[email protected]>
+
+ [EME][Mac] Crash in [AVStreamSession addStreamDataParser:]; uncaught exception
+ https://bugs.webkit.org/show_bug.cgi?id=153495
+
+ Reviewed by Eric Carlson.
+
+ When AVContentKeySession is not available, fall back to pre-AVContentKeySession behavior;
+ namely, immediately create an AVStreamSession object in
+ willProvideContentKeyRequestInitializationData, rather than waiting for didProvide.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::SourceBufferPrivateAVFObjC::willProvideContentKeyRequestInitializationDataForTrackID):
+
+2016-01-27 Matthew Hanson <[email protected]>
+
Merge r195606. rdar://problem/24242476
2016-01-25 Dave Hyatt <[email protected]>
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (195720 => 195721)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2016-01-28 01:34:31 UTC (rev 195720)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2016-01-28 01:34:33 UTC (rev 195721)
@@ -29,6 +29,7 @@
#if ENABLE(MEDIA_SOURCE) && USE(AVFOUNDATION)
#import "BlockExceptions.h"
+#import "CDMSessionAVContentKeySession.h"
#import "CDMSessionMediaSourceAVFObjC.h"
#import "ExceptionCodePlaceholder.h"
#import "Logging.h"
@@ -697,6 +698,11 @@
if (CDMSessionMediaSourceAVFObjC* session = m_mediaSource->player()->cdmSession())
session->addParser(m_parser.get());
+ else if (!CDMSessionAVContentKeySession::isAvailable()) {
+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
+ [m_mediaSource->player()->streamSession() addStreamDataParser:m_parser.get()];
+ END_BLOCK_OBJC_EXCEPTIONS;
+ }
#else
UNUSED_PARAM(trackID);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
