From ca74251ecfe5d730a6cbc5998c0ac8d43e33d2bb Mon Sep 17 00:00:00 2001 From: "jer.noble@apple.com" Date: Thu, 23 Jan 2014 19:42:17 +0000 Subject: [PATCH] [MSE][Mac] Adopt new AVStreamDataParser delegate API https://bugs.webkit.org/show_bug.cgi?id=127498 Reviewed by Eric Carlson. Adopt a new delegate API which passes in whether or not the new AVAsset is discontinuous, implying the AVAsset is entirely new rather than just updated with new information. * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: (-[WebAVStreamDataParserListener streamDataParser:didParseStreamDataAsAsset:withDiscontinuity:]): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162630 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 14 ++++++++++++++ .../avfoundation/objc/SourceBufferPrivateAVFObjC.mm | 10 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 1c38aa5..d82cb0a 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2014-01-23 Jer Noble + + [MSE][Mac] Adopt new AVStreamDataParser delegate API + https://bugs.webkit.org/show_bug.cgi?id=127498 + + Reviewed by Eric Carlson. + + Adopt a new delegate API which passes in whether or not the new AVAsset + is discontinuous, implying the AVAsset is entirely new rather than + just updated with new information. + + * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: + (-[WebAVStreamDataParserListener streamDataParser:didParseStreamDataAsAsset:withDiscontinuity:]): + 2014-01-23 Tim Horton PDFPlugin: Use PDFPlugin even if there's an external plugin installed, if it's blocked diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm index 426e9fc..62f2092 100644 --- a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm +++ b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm @@ -169,6 +169,16 @@ SOFT_LINK(CoreMedia, CMSetAttachment, void, (CMAttachmentBearerRef target, CFStr _parent->didParseStreamDataAsAsset(asset); } +- (void)streamDataParser:(AVStreamDataParser *)streamDataParser didParseStreamDataAsAsset:(AVAsset *)asset withDiscontinuity:(BOOL)discontinuity +{ + UNUSED_PARAM(discontinuity); +#if ASSERT_DISABLED + UNUSED_PARAM(streamDataParser); +#endif + ASSERT(streamDataParser == _parser); + _parent->didParseStreamDataAsAsset(asset); +} + - (void)streamDataParser:(AVStreamDataParser *)streamDataParser didFailToParseStreamDataWithError:(NSError *)error { #if ASSERT_DISABLED -- 1.8.3.1