Changeset 181036 in webkit
- Timestamp:
- Mar 4, 2015 2:41:24 PM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r181024 r181036 1 2015-03-04 David Kilzer <ddkilzer@apple.com> 2 3 Switch remaining CoreMedia soft-linking in WebCore over to CoreMediaSoftLink.{cpp,h} 4 <http://webkit.org/b/141870> 5 6 Reviewed by Alex Christensen. 7 8 * Configurations/WebCore.unexp: 9 - Remove all weak symbols for CoreMedia.framework as they should 10 no longer appear. 11 12 * Modules/plugins/QuickTimePluginReplacement.mm: 13 * platform/graphics/avfoundation/MediaTimeAVFoundation.cpp: 14 * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: 15 * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: 16 - Clean up headers. 17 18 * platform/cf/CoreMediaSoftLink.cpp: 19 * platform/cf/CoreMediaSoftLink.h: 20 - Add soft-link functions and constants from remaining source 21 files. 22 23 * platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm: 24 * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: 25 * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm: 26 (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isAvailable): 27 * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: 28 * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: 29 * platform/mac/PlatformClockCM.mm: 30 * platform/mediastream/mac/AVMediaCaptureSource.mm: 31 * platform/mediastream/mac/AVVideoCaptureSource.mm: 32 - Switch to using CoreMediaSoftLink.h. 33 34 * platform/mac/SoftLinking.h: 35 * platform/win/SoftLinking.h: 36 - Remove 'const' from SOFT_LINK_CONSTANT_{HEADER,SOURCE}() 37 macros since it won't work with const structs. 38 39 * platform/spi/cf/CoreMediaSPI.h: 40 - Add SPI declarations for Windows originally from 41 InbandTextTrackPrivateAVF.cpp. 42 1 43 2015-03-04 Commit Queue <commit-queue@webkit.org> 2 44 -
trunk/Source/WebCore/Configurations/WebCore.unexp
r180366 r181036 32 32 _MTAudioProcessingTapGetStorage 33 33 34 # Source/WebCore/platform/mac/PlatformClockCM.mm35 _CMAudioDeviceClockCreate36 _CMTimebaseCreateWithMasterClock37 _CMTimebaseSetRate38 _CMTimebaseSetTime39 40 # Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp41 _CMBlockBufferCopyDataBytes42 _CMBlockBufferGetDataLength43 _CMFormatDescriptionGetExtensions44 _CMSampleBufferGetDataBuffer45 _CMSampleBufferGetFormatDescription46 _CMSampleBufferGetSampleTimingInfo47 48 34 # Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 49 35 _MACaptionAppearanceAddSelectedLanguage … … 75 61 _VTPixelTransferSessionTransferImage 76 62 77 # Function marked ALWAYS_INLINE in header, but may not be inlined in a78 # Debug build.79 80 # Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm81 _CMFormatDescriptionGetMediaSubType82 _CMFormatDescriptionGetMediaType83 _CMSampleBufferCreateCopy84 _CMSampleBufferCreateCopyWithNewTiming85 _CMSampleBufferGetDecodeTimeStamp86 _CMSampleBufferGetDuration87 _CMSampleBufferGetPresentationTimeStamp88 _CMSampleBufferGetSampleAttachmentsArray89 _CMSampleBufferGetSampleTimingInfoArray90 _CMSampleBufferGetTotalSampleSize91 _CMVideoFormatDescriptionGetPresentationDimensions92 93 63 # Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp 94 64 _DDDFAScannerCreateFromCache -
trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm
r180366 r181036 30 30 #import "QuickTimePluginReplacement.h" 31 31 32 #import "CoreMediaSoftLink.h"33 32 #import "Event.h" 34 33 #import "HTMLPlugInElement.h" … … 44 43 #import "ScriptController.h" 45 44 #import "ScriptSourceCode.h" 46 #import "SoftLinking.h"47 45 #import "UserAgentScripts.h" 48 46 #import <objc/runtime.h> … … 52 50 #import <JavaScriptCore/APICast.h> 53 51 #import <wtf/text/Base64.h> 52 53 #import "CoreMediaSoftLink.h" 54 54 55 55 typedef AVMetadataItem AVMetadataItemType; -
trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp
r180481 r181036 34 34 SOFT_LINK_FRAMEWORK_SOURCE(WebCore, CoreMedia) 35 35 36 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination)) 37 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMBlockBufferGetDataLength, size_t, (CMBlockBufferRef theBuffer), (theBuffer)) 38 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMFormatDescriptionGetExtensions, CFDictionaryRef, (CMFormatDescriptionRef desc), (desc)) 39 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetDataBuffer, CMBlockBufferRef, (CMSampleBufferRef sbuf), (sbuf)) 40 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf)) 41 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetSampleTimingInfo, OSStatus, (CMSampleBufferRef sbuf, CMItemIndex sampleIndex, CMSampleTimingInfo* timingInfoOut), (sbuf, sampleIndex, timingInfoOut)) 36 42 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2)) 37 43 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time)) … … 40 46 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range)) 41 47 42 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTimeZero, CMTime); 48 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, CFStringRef) 49 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAlignmentType_End, CFStringRef) 50 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAlignmentType_Middle, CFStringRef) 51 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAlignmentType_Start, CFStringRef) 52 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_Alignment, CFStringRef) 53 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_BackgroundColorARGB, CFStringRef) 54 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight, CFStringRef) 55 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_BoldStyle, CFStringRef) 56 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_CharacterBackgroundColorARGB, CFStringRef) 57 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_FontFamilyName, CFStringRef) 58 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_ForegroundColorARGB, CFStringRef) 59 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_ItalicStyle, CFStringRef) 60 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection, CFStringRef) 61 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_RelativeFontSize, CFStringRef) 62 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_TextPositionPercentageRelativeToWritingDirection, CFStringRef) 63 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_UnderlineStyle, CFStringRef) 64 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_VerticalLayout, CFStringRef) 65 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextMarkupAttribute_WritingDirectionSizePercentage, CFStringRef) 66 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextVerticalLayout_LeftToRight, CFStringRef) 67 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTextVerticalLayout_RightToLeft, CFStringRef) 68 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTimeInvalid, CMTime) 69 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTimeZero, CMTime) 43 70 44 71 #if PLATFORM(COCOA) 45 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ()); 72 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMFormatDescriptionGetMediaSubType, FourCharCode, (CMFormatDescriptionRef desc), (desc)) 73 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMFormatDescriptionGetMediaType, CMMediaType, (CMFormatDescriptionRef desc), (desc)) 74 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ()) 46 75 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags)) 47 76 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object)) 77 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (*callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon)) 78 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferCreate, OSStatus, (CFAllocatorRef allocator, CMBlockBufferRef dataBuffer, Boolean dataReady, CMSampleBufferMakeDataReadyCallback makeDataReadyCallback, void *makeDataReadyRefcon, CMFormatDescriptionRef formatDescription, CMItemCount numSamples, CMItemCount numSampleTimingEntries, const CMSampleTimingInfo *sampleTimingArray, CMItemCount numSampleSizeEntries, const size_t *sampleSizeArray, CMSampleBufferRef *sBufOut), (allocator, dataBuffer, dataReady, makeDataReadyCallback, makeDataReadyRefcon, formatDescription, numSamples, numSampleTimingEntries, sampleTimingArray, numSampleSizeEntries, sampleSizeArray, sBufOut)) 79 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferCreateCopy, OSStatus, (CFAllocatorRef allocator, CMSampleBufferRef sbuf, CMSampleBufferRef *sbufCopyOut), (allocator, sbuf, sbufCopyOut)) 80 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferCreateCopyWithNewTiming, OSStatus, (CFAllocatorRef allocator, CMSampleBufferRef originalSBuf, CMItemCount numSampleTimingEntries, const CMSampleTimingInfo *sampleTimingArray, CMSampleBufferRef *sBufCopyOut), (allocator, originalSBuf, numSampleTimingEntries, sampleTimingArray, sBufCopyOut)) 81 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetDecodeTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf)) 82 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetDuration, CMTime, (CMSampleBufferRef sbuf), (sbuf)) 83 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetPresentationTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf)) 84 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetSampleAttachmentsArray, CFArrayRef, (CMSampleBufferRef sbuf, Boolean createIfNecessary), (sbuf, createIfNecessary)) 85 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetSampleTimingInfoArray, OSStatus, (CMSampleBufferRef sbuf, CMItemCount timingArrayEntries, CMSampleTimingInfo *timingArrayOut, CMItemCount *timingArrayEntriesNeededOut), (sbuf, timingArrayEntries, timingArrayOut, timingArrayEntriesNeededOut)) 86 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSampleBufferGetTotalSampleSize, size_t, (CMSampleBufferRef sbuf), (sbuf)) 87 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMSetAttachment, void, (CMAttachmentBearerRef target, CFStringRef key, CFTypeRef value, CMAttachmentMode attachmentMode), (target, key, value, attachmentMode)) 88 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimebaseCreateWithMasterClock, OSStatus, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut)) 48 89 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase)) 90 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimebaseSetRate, OSStatus, (CMTimebaseRef timebase, Float64 rate), (timebase, rate)) 91 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimebaseSetTime, OSStatus, (CMTimebaseRef timebase, CMTime time), (timebase, time)) 49 92 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator)) 93 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMVideoFormatDescriptionGetDimensions, CMVideoDimensions, (CMVideoFormatDescriptionRef videoDesc), (videoDesc)) 94 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMVideoFormatDescriptionGetPresentationDimensions, CGSize, (CMVideoFormatDescriptionRef videoDesc, Boolean usePixelAspectRatio, Boolean useCleanAperture), (videoDesc, usePixelAspectRatio, useCleanAperture)) 95 96 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMSampleAttachmentKey_DoNotDisplay, CFStringRef) 97 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMSampleAttachmentKey_NotSync, CFStringRef) 98 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately, CFStringRef) 99 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_DrainAfterDecoding, CFStringRef) 100 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_EmptyMedia, CFStringRef) 101 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_ResetDecoderBeforeDecoding, CFStringRef) 102 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTimebaseNotification_EffectiveRateChanged, CFStringRef) 103 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTimebaseNotification_TimeJumped, CFStringRef) 50 104 #endif // PLATFORM(COCOA) 105 106 #if PLATFORM(IOS) 107 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMAudioClockCreate, OSStatus, (CFAllocatorRef allocator, CMClockRef *clockOut), (allocator, clockOut)) 108 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeMaximum, CMTime, (CMTime time1, CMTime time2), (time1, time2)) 109 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeMinimum, CMTime, (CMTime time1, CMTime time2), (time1, time2)) 110 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeRangeContainsTime, Boolean, (CMTimeRange range, CMTime time), (range, time)) 111 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeRangeMake, CMTimeRange, (CMTime start, CMTime duration), (start, duration)) 112 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMTimeSubtract, CMTime, (CMTime minuend, CMTime subtrahend), (minuend, subtrahend)) 113 114 SOFT_LINK_CONSTANT_SOURCE(WebCore, CoreMedia, kCMTimeIndefinite, CMTime) 115 #endif // PLATFORM(IOS) 116 117 #if PLATFORM(MAC) 118 SOFT_LINK_FUNCTION_SOURCE(WebCore, CoreMedia, CMAudioDeviceClockCreate, OSStatus, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut)) 119 #endif // PLATFORM(MAC) 51 120 52 121 #if PLATFORM(WIN) -
trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h
r180481 r181036 35 35 SOFT_LINK_FRAMEWORK_HEADER(WebCore, CoreMedia) 36 36 37 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination)) 38 #define CMBlockBufferCopyDataBytes softLink_CoreMedia_CMBlockBufferCopyDataBytes 39 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMBlockBufferGetDataLength, size_t, (CMBlockBufferRef theBuffer), (theBuffer)) 40 #define CMBlockBufferGetDataLength softLink_CoreMedia_CMBlockBufferGetDataLength 41 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMFormatDescriptionGetExtensions, CFDictionaryRef, (CMFormatDescriptionRef desc), (desc)) 42 #define CMFormatDescriptionGetExtensions softLink_CoreMedia_CMFormatDescriptionGetExtensions 43 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetDataBuffer, CMBlockBufferRef, (CMSampleBufferRef sbuf), (sbuf)) 44 #define CMSampleBufferGetDataBuffer softLink_CoreMedia_CMSampleBufferGetDataBuffer 45 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf)) 46 #define CMSampleBufferGetFormatDescription softLink_CoreMedia_CMSampleBufferGetFormatDescription 47 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetSampleTimingInfo, OSStatus, (CMSampleBufferRef sbuf, CMItemIndex sampleIndex, CMSampleTimingInfo* timingInfoOut), (sbuf, sampleIndex, timingInfoOut)) 48 #define CMSampleBufferGetSampleTimingInfo softLink_CoreMedia_CMSampleBufferGetSampleTimingInfo 37 49 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2)) 38 50 #define CMTimeCompare softLink_CoreMedia_CMTimeCompare … … 46 58 #define CMTimeRangeGetEnd softLink_CoreMedia_CMTimeRangeGetEnd 47 59 48 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTimeZero, CMTime); 60 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, CFStringRef) 61 #define kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms get_CoreMedia_kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms() 62 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAlignmentType_End, CFStringRef) 63 #define kCMTextMarkupAlignmentType_End get_CoreMedia_kCMTextMarkupAlignmentType_End() 64 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAlignmentType_Middle, CFStringRef) 65 #define kCMTextMarkupAlignmentType_Middle get_CoreMedia_kCMTextMarkupAlignmentType_Middle() 66 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAlignmentType_Start, CFStringRef) 67 #define kCMTextMarkupAlignmentType_Start get_CoreMedia_kCMTextMarkupAlignmentType_Start() 68 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_Alignment, CFStringRef) 69 #define kCMTextMarkupAttribute_Alignment get_CoreMedia_kCMTextMarkupAttribute_Alignment() 70 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_BackgroundColorARGB, CFStringRef) 71 #define kCMTextMarkupAttribute_BackgroundColorARGB get_CoreMedia_kCMTextMarkupAttribute_BackgroundColorARGB() 72 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight, CFStringRef) 73 #define kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight get_CoreMedia_kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight() 74 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_BoldStyle, CFStringRef) 75 #define kCMTextMarkupAttribute_BoldStyle get_CoreMedia_kCMTextMarkupAttribute_BoldStyle() 76 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_CharacterBackgroundColorARGB, CFStringRef) 77 #define kCMTextMarkupAttribute_CharacterBackgroundColorARGB get_CoreMedia_kCMTextMarkupAttribute_CharacterBackgroundColorARGB() 78 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_FontFamilyName, CFStringRef) 79 #define kCMTextMarkupAttribute_FontFamilyName get_CoreMedia_kCMTextMarkupAttribute_FontFamilyName() 80 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_ForegroundColorARGB, CFStringRef) 81 #define kCMTextMarkupAttribute_ForegroundColorARGB get_CoreMedia_kCMTextMarkupAttribute_ForegroundColorARGB() 82 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_ItalicStyle, CFStringRef) 83 #define kCMTextMarkupAttribute_ItalicStyle get_CoreMedia_kCMTextMarkupAttribute_ItalicStyle() 84 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection, CFStringRef) 85 #define kCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection get_CoreMedia_kCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection() 86 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_RelativeFontSize, CFStringRef) 87 #define kCMTextMarkupAttribute_RelativeFontSize get_CoreMedia_kCMTextMarkupAttribute_RelativeFontSize() 88 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_TextPositionPercentageRelativeToWritingDirection, CFStringRef) 89 #define kCMTextMarkupAttribute_TextPositionPercentageRelativeToWritingDirection get_CoreMedia_kCMTextMarkupAttribute_TextPositionPercentageRelativeToWritingDirection() 90 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_UnderlineStyle, CFStringRef) 91 #define kCMTextMarkupAttribute_UnderlineStyle get_CoreMedia_kCMTextMarkupAttribute_UnderlineStyle() 92 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_VerticalLayout, CFStringRef) 93 #define kCMTextMarkupAttribute_VerticalLayout get_CoreMedia_kCMTextMarkupAttribute_VerticalLayout() 94 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextMarkupAttribute_WritingDirectionSizePercentage, CFStringRef) 95 #define kCMTextMarkupAttribute_WritingDirectionSizePercentage get_CoreMedia_kCMTextMarkupAttribute_WritingDirectionSizePercentage() 96 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextVerticalLayout_LeftToRight, CFStringRef) 97 #define kCMTextVerticalLayout_LeftToRight get_CoreMedia_kCMTextVerticalLayout_LeftToRight() 98 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTextVerticalLayout_RightToLeft, CFStringRef) 99 #define kCMTextVerticalLayout_RightToLeft get_CoreMedia_kCMTextVerticalLayout_RightToLeft() 100 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTimeInvalid, CMTime) 101 #define kCMTimeInvalid get_CoreMedia_kCMTimeInvalid() 102 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTimeZero, CMTime) 49 103 #define kCMTimeZero get_CoreMedia_kCMTimeZero() 50 104 51 105 #if PLATFORM(COCOA) 52 106 53 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ()); 107 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMFormatDescriptionGetMediaSubType, FourCharCode, (CMFormatDescriptionRef desc), (desc)) 108 #define CMFormatDescriptionGetMediaSubType softLink_CoreMedia_CMFormatDescriptionGetMediaSubType 109 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMFormatDescriptionGetMediaType, CMMediaType, (CMFormatDescriptionRef desc), (desc)) 110 #define CMFormatDescriptionGetMediaType softLink_CoreMedia_CMFormatDescriptionGetMediaType 111 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMNotificationCenterGetDefaultLocalCenter, CMNotificationCenterRef, (void), ()) 54 112 #define CMNotificationCenterGetDefaultLocalCenter softLink_CoreMedia_CMNotificationCenterGetDefaultLocalCenter 55 113 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMNotificationCenterAddListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object, UInt32 flags), (center, listener, callback, notification, object, flags)) … … 57 115 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMNotificationCenterRemoveListener, OSStatus, (CMNotificationCenterRef center, const void* listener, CMNotificationCallback callback, CFStringRef notification, const void* object), (center, listener, callback, notification, object)) 58 116 #define CMNotificationCenterRemoveListener softLink_CoreMedia_CMNotificationCenterRemoveListener 117 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (*callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon)) 118 #define CMSampleBufferCallForEachSample softLink_CoreMedia_CMSampleBufferCallForEachSample 119 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferCreate, OSStatus, (CFAllocatorRef allocator, CMBlockBufferRef dataBuffer, Boolean dataReady, CMSampleBufferMakeDataReadyCallback makeDataReadyCallback, void *makeDataReadyRefcon, CMFormatDescriptionRef formatDescription, CMItemCount numSamples, CMItemCount numSampleTimingEntries, const CMSampleTimingInfo *sampleTimingArray, CMItemCount numSampleSizeEntries, const size_t *sampleSizeArray, CMSampleBufferRef *sBufOut), (allocator, dataBuffer, dataReady, makeDataReadyCallback, makeDataReadyRefcon, formatDescription, numSamples, numSampleTimingEntries, sampleTimingArray, numSampleSizeEntries, sampleSizeArray, sBufOut)) 120 #define CMSampleBufferCreate softLink_CoreMedia_CMSampleBufferCreate 121 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferCreateCopy, OSStatus, (CFAllocatorRef allocator, CMSampleBufferRef sbuf, CMSampleBufferRef *sbufCopyOut), (allocator, sbuf, sbufCopyOut)) 122 #define CMSampleBufferCreateCopy softLink_CoreMedia_CMSampleBufferCreateCopy 123 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferCreateCopyWithNewTiming, OSStatus, (CFAllocatorRef allocator, CMSampleBufferRef originalSBuf, CMItemCount numSampleTimingEntries, const CMSampleTimingInfo *sampleTimingArray, CMSampleBufferRef *sBufCopyOut), (allocator, originalSBuf, numSampleTimingEntries, sampleTimingArray, sBufCopyOut)) 124 #define CMSampleBufferCreateCopyWithNewTiming softLink_CoreMedia_CMSampleBufferCreateCopyWithNewTiming 125 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetDecodeTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf)) 126 #define CMSampleBufferGetDecodeTimeStamp softLink_CoreMedia_CMSampleBufferGetDecodeTimeStamp 127 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetDuration, CMTime, (CMSampleBufferRef sbuf), (sbuf)) 128 #define CMSampleBufferGetDuration softLink_CoreMedia_CMSampleBufferGetDuration 129 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetPresentationTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf)) 130 #define CMSampleBufferGetPresentationTimeStamp softLink_CoreMedia_CMSampleBufferGetPresentationTimeStamp 131 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetSampleAttachmentsArray, CFArrayRef, (CMSampleBufferRef sbuf, Boolean createIfNecessary), (sbuf, createIfNecessary)) 132 #define CMSampleBufferGetSampleAttachmentsArray softLink_CoreMedia_CMSampleBufferGetSampleAttachmentsArray 133 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetSampleTimingInfoArray, OSStatus, (CMSampleBufferRef sbuf, CMItemCount timingArrayEntries, CMSampleTimingInfo *timingArrayOut, CMItemCount *timingArrayEntriesNeededOut), (sbuf, timingArrayEntries, timingArrayOut, timingArrayEntriesNeededOut)) 134 #define CMSampleBufferGetSampleTimingInfoArray softLink_CoreMedia_CMSampleBufferGetSampleTimingInfoArray 135 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSampleBufferGetTotalSampleSize, size_t, (CMSampleBufferRef sbuf), (sbuf)) 136 #define CMSampleBufferGetTotalSampleSize softLink_CoreMedia_CMSampleBufferGetTotalSampleSize 137 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMSetAttachment, void, (CMAttachmentBearerRef target, CFStringRef key, CFTypeRef value, CMAttachmentMode attachmentMode), (target, key, value, attachmentMode)) 138 #define CMSampleBufferGetTotalSampleSize softLink_CoreMedia_CMSampleBufferGetTotalSampleSize 139 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimebaseCreateWithMasterClock, OSStatus, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut)) 140 #define CMTimebaseCreateWithMasterClock softLink_CoreMedia_CMTimebaseCreateWithMasterClock 59 141 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase)) 60 142 #define CMTimebaseGetTime softLink_CoreMedia_CMTimebaseGetTime 143 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimebaseSetRate, OSStatus, (CMTimebaseRef timebase, Float64 rate), (timebase, rate)) 144 #define CMTimebaseSetRate softLink_CoreMedia_CMTimebaseSetRate 145 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimebaseSetTime, OSStatus, (CMTimebaseRef timebase, CMTime time), (timebase, time)) 146 #define CMTimebaseSetTime softLink_CoreMedia_CMTimebaseSetTime 61 147 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimeCopyAsDictionary, CFDictionaryRef, (CMTime time, CFAllocatorRef allocator), (time, allocator)) 62 148 #define CMTimeCopyAsDictionary softLink_CoreMedia_CMTimeCopyAsDictionary 149 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMVideoFormatDescriptionGetDimensions, CMVideoDimensions, (CMVideoFormatDescriptionRef videoDesc), (videoDesc)) 150 #define CMVideoFormatDescriptionGetDimensions softLink_CoreMedia_CMVideoFormatDescriptionGetDimensions 151 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMVideoFormatDescriptionGetPresentationDimensions, CGSize, (CMVideoFormatDescriptionRef videoDesc, Boolean usePixelAspectRatio, Boolean useCleanAperture), (videoDesc, usePixelAspectRatio, useCleanAperture)) 152 #define CMVideoFormatDescriptionGetPresentationDimensions softLink_CoreMedia_CMVideoFormatDescriptionGetPresentationDimensions 153 154 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMSampleAttachmentKey_DoNotDisplay, CFStringRef) 155 #define kCMSampleAttachmentKey_DoNotDisplay get_CoreMedia_kCMSampleAttachmentKey_DoNotDisplay() 156 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMSampleAttachmentKey_NotSync, CFStringRef) 157 #define kCMSampleAttachmentKey_NotSync get_CoreMedia_kCMSampleAttachmentKey_NotSync() 158 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately, CFStringRef) 159 #define kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately get_CoreMedia_kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately() 160 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_DrainAfterDecoding, CFStringRef) 161 #define kCMSampleBufferAttachmentKey_DrainAfterDecoding get_CoreMedia_kCMSampleBufferAttachmentKey_DrainAfterDecoding() 162 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_EmptyMedia, CFStringRef) 163 #define kCMSampleBufferAttachmentKey_EmptyMedia get_CoreMedia_kCMSampleBufferAttachmentKey_EmptyMedia() 164 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMSampleBufferAttachmentKey_ResetDecoderBeforeDecoding, CFStringRef) 165 #define kCMSampleBufferAttachmentKey_ResetDecoderBeforeDecoding get_CoreMedia_kCMSampleBufferAttachmentKey_ResetDecoderBeforeDecoding() 166 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTimebaseNotification_EffectiveRateChanged, CFStringRef) 167 #define kCMTimebaseNotification_EffectiveRateChanged get_CoreMedia_kCMTimebaseNotification_EffectiveRateChanged() 168 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTimebaseNotification_TimeJumped, CFStringRef) 169 #define kCMTimebaseNotification_TimeJumped get_CoreMedia_kCMTimebaseNotification_TimeJumped() 63 170 64 171 #endif // PLATFORM(COCOA) 172 173 #if PLATFORM(IOS) 174 175 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMAudioClockCreate, OSStatus, (CFAllocatorRef allocator, CMClockRef *clockOut), (allocator, clockOut)) 176 #define CMAudioClockCreate softLink_CoreMedia_CMAudioClockCreate 177 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimeMaximum, CMTime, (CMTime time1, CMTime time2), (time1, time2)) 178 #define CMTimeMaximum softLink_CoreMedia_CMTimeMaximum 179 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimeMinimum, CMTime, (CMTime time1, CMTime time2), (time1, time2)) 180 #define CMTimeMinimum softLink_CoreMedia_CMTimeMinimum 181 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimeRangeContainsTime, Boolean, (CMTimeRange range, CMTime time), (range, time)) 182 #define CMTimeRangeContainsTime softLink_CoreMedia_CMTimeRangeContainsTime 183 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimeRangeMake, CMTimeRange, (CMTime start, CMTime duration), (start, duration)) 184 #define CMTimeRangeMake softLink_CoreMedia_CMTimeRangeMake 185 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMTimeSubtract, CMTime, (CMTime minuend, CMTime subtrahend), (minuend, subtrahend)) 186 #define CMTimeSubtract softLink_CoreMedia_CMTimeSubtract 187 188 SOFT_LINK_CONSTANT_HEADER(WebCore, CoreMedia, kCMTimeIndefinite, CMTime) 189 #define kCMTimeIndefinite get_CoreMedia_kCMTimeIndefinite() 190 191 #endif // PLATFORM(IOS) 192 193 #if PLATFORM(MAC) 194 195 SOFT_LINK_FUNCTION_HEADER(WebCore, CoreMedia, CMAudioDeviceClockCreate, OSStatus, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut)) 196 #define CMAudioDeviceClockCreate softLink_CoreMedia_CMAudioDeviceClockCreate 197 198 #endif // PLATFORM(MAC) 65 199 66 200 #if PLATFORM(WIN) -
trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
r180366 r181036 33 33 #import "AudioSourceProviderClient.h" 34 34 #import "CARingBuffer.h" 35 #import "CoreMediaSoftLink.h"36 35 #import "Logging.h" 37 36 #import "MediaTimeAVFoundation.h" 38 #import "SoftLinking.h"39 37 #import <AVFoundation/AVAssetTrack.h> 40 38 #import <AVFoundation/AVAudioMix.h> … … 46 44 47 45 #if !LOG_DISABLED 48 #i nclude<wtf/StringPrintStream.h>46 #import <wtf/StringPrintStream.h> 49 47 #endif 48 49 #import "CoreMediaSoftLink.h" 50 50 51 51 SOFT_LINK_FRAMEWORK(AVFoundation) 52 52 SOFT_LINK_FRAMEWORK(MediaToolbox) 53 53 SOFT_LINK_FRAMEWORK(AudioToolbox) 54 SOFT_LINK_FRAMEWORK(CoreMedia)55 54 56 55 SOFT_LINK_CLASS(AVFoundation, AVPlayerItem) 57 56 SOFT_LINK_CLASS(AVFoundation, AVMutableAudioMix) 58 57 SOFT_LINK_CLASS(AVFoundation, AVMutableAudioMixInputParameters) 59 60 SOFT_LINK_CONSTANT(CoreMedia, kCMTimebaseNotification_EffectiveRateChanged, CFStringRef)61 SOFT_LINK_CONSTANT(CoreMedia, kCMTimebaseNotification_TimeJumped, CFStringRef)62 #define kCMTimebaseNotification_EffectiveRateChanged getkCMTimebaseNotification_EffectiveRateChanged()63 #define kCMTimebaseNotification_TimeJumped getkCMTimebaseNotification_TimeJumped()64 58 65 59 SOFT_LINK(AudioToolbox, AudioConverterConvertComplexBuffer, OSStatus, (AudioConverterRef inAudioConverter, UInt32 inNumberPCMFrames, const AudioBufferList* inInputData, AudioBufferList* outOutputData), (inAudioConverter, inNumberPCMFrames, inInputData, outOutputData)) -
trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
r180366 r181036 34 34 #include "Logging.h" 35 35 #include "MediaTimeAVFoundation.h" 36 #include "SoftLinking.h"37 #include <CoreMedia/CoreMedia.h>38 36 #include <runtime/ArrayBuffer.h> 39 37 #include <runtime/DataView.h> … … 48 46 #include <wtf/StringPrintStream.h> 49 47 50 #if !PLATFORM(WIN) 51 #define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_FRAMEWORK_OPTIONAL(Lib) 52 #define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_POINTER_OPTIONAL(Lib, Name, Type) 53 #else 54 #ifdef DEBUG_ALL 55 #define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_DEBUG_LIBRARY(Lib) 56 #else 57 #define SOFT_LINK_AVF_FRAMEWORK(Lib) SOFT_LINK_LIBRARY(Lib) 58 #endif 59 60 #define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_VARIABLE_DLL_IMPORT_OPTIONAL(Lib, Name, Type) 61 #endif 62 63 SOFT_LINK_AVF_FRAMEWORK(CoreMedia) 64 65 #if !PLATFORM(WIN) 66 SOFT_LINK(CoreMedia, CMSampleBufferGetDataBuffer, CMBlockBufferRef, (CMSampleBufferRef sbuf), (sbuf)) 67 SOFT_LINK(CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination)) 68 SOFT_LINK(CoreMedia, CMBlockBufferGetDataLength, size_t, (CMBlockBufferRef theBuffer), (theBuffer)) 69 SOFT_LINK(CoreMedia, CMSampleBufferGetSampleTimingInfo, OSStatus, (CMSampleBufferRef sbuf, CMItemIndex sampleIndex, CMSampleTimingInfo* timingInfoOut), (sbuf, sampleIndex, timingInfoOut)) 70 SOFT_LINK(CoreMedia, CMFormatDescriptionGetExtensions, CFDictionaryRef, (CMFormatDescriptionRef desc), (desc)) 71 SOFT_LINK(CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf)) 72 #else 73 typedef struct OpaqueCMBlockBuffer* CMBlockBufferRef; 74 typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef; 75 typedef struct opaqueCMSampleBuffer* CMSampleBufferRef; 76 77 #ifndef CMSAMPLEBUFFER_H 78 extern "C" { 79 #pragma pack(push, 4) 80 #ifndef CMTIME_H 81 typedef struct { 82 int64_t value; 83 int32_t timescale; 84 uint32_t flags; 85 int64_t epoch; 86 } CMTime; 87 #endif 88 89 typedef struct { 90 CMTime duration; 91 CMTime presentationTimeStamp; 92 CMTime decodeTimeStamp; 93 } CMSampleTimingInfo; 94 #pragma pack(pop) 95 } 96 #endif 97 98 SOFT_LINK_DLL_IMPORT(CoreMedia, CMSampleBufferGetDataBuffer, CMBlockBufferRef, __cdecl, (CMSampleBufferRef sbuf), (sbuf)) 99 #define CMSampleBufferGetDataBuffer softLink_CMSampleBufferGetDataBuffer 100 SOFT_LINK_DLL_IMPORT(CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, __cdecl, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination)) 101 #define CMBlockBufferCopyDataBytes softLink_CMBlockBufferCopyDataBytes 102 SOFT_LINK_DLL_IMPORT(CoreMedia, CMBlockBufferGetDataLength, size_t, __cdecl, (CMBlockBufferRef theBuffer), (theBuffer)) 103 #define CMBlockBufferGetDataLength softLink_CMBlockBufferGetDataLength 104 SOFT_LINK_DLL_IMPORT(CoreMedia, CMSampleBufferGetSampleTimingInfo, OSStatus, __cdecl, (CMSampleBufferRef sbuf, CMItemIndex sampleIndex, CMSampleTimingInfo* timingInfoOut), (sbuf, sampleIndex, timingInfoOut)) 105 #define CMSampleBufferGetSampleTimingInfo softLink_CMSampleBufferGetSampleTimingInfo 106 SOFT_LINK_DLL_IMPORT(CoreMedia, CMFormatDescriptionGetExtensions, CFDictionaryRef, __cdecl, (CMFormatDescriptionRef desc), (desc)) 107 #define CMFormatDescriptionGetExtensions softLink_CMFormatDescriptionGetExtensions 108 SOFT_LINK_DLL_IMPORT(CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, __cdecl, (CMSampleBufferRef sbuf), (sbuf)) 109 #define CMSampleBufferGetFormatDescription softLink_CMSampleBufferGetFormatDescription 110 #endif 111 112 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_Alignment, CFStringRef) 113 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAlignmentType_Start, CFStringRef) 114 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAlignmentType_Middle, CFStringRef) 115 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAlignmentType_End, CFStringRef) 116 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_BoldStyle, CFStringRef) 117 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_ItalicStyle, CFStringRef) 118 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_UnderlineStyle, CFStringRef) 119 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_TextPositionPercentageRelativeToWritingDirection, CFStringRef) 120 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_WritingDirectionSizePercentage, CFStringRef) 121 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection, CFStringRef) 122 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_VerticalLayout, CFStringRef) 123 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextVerticalLayout_LeftToRight, CFStringRef) 124 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextVerticalLayout_RightToLeft, CFStringRef) 125 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight, CFStringRef) 126 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_RelativeFontSize, CFStringRef) 127 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_FontFamilyName, CFStringRef) 128 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_ForegroundColorARGB, CFStringRef) 129 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_BackgroundColorARGB, CFStringRef) 130 SOFT_LINK_AVF_POINTER(CoreMedia, kCMTextMarkupAttribute_CharacterBackgroundColorARGB, CFStringRef) 131 SOFT_LINK_AVF_POINTER(CoreMedia, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, CFStringRef) 132 133 #define kCMTextMarkupAttribute_Alignment getkCMTextMarkupAttribute_Alignment() 134 #define kCMTextMarkupAlignmentType_Start getkCMTextMarkupAlignmentType_Start() 135 #define kCMTextMarkupAlignmentType_Middle getkCMTextMarkupAlignmentType_Middle() 136 #define kCMTextMarkupAlignmentType_End getkCMTextMarkupAlignmentType_End() 137 #define kCMTextMarkupAttribute_BoldStyle getkCMTextMarkupAttribute_BoldStyle() 138 #define kCMTextMarkupAttribute_ItalicStyle getkCMTextMarkupAttribute_ItalicStyle() 139 #define kCMTextMarkupAttribute_UnderlineStyle getkCMTextMarkupAttribute_UnderlineStyle() 140 #define kCMTextMarkupAttribute_TextPositionPercentageRelativeToWritingDirection getkCMTextMarkupAttribute_TextPositionPercentageRelativeToWritingDirection() 141 #define kCMTextMarkupAttribute_WritingDirectionSizePercentage getkCMTextMarkupAttribute_WritingDirectionSizePercentage() 142 #define kCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection getkCMTextMarkupAttribute_OrthogonalLinePositionPercentageRelativeToWritingDirection() 143 #define kCMTextMarkupAttribute_VerticalLayout getkCMTextMarkupAttribute_VerticalLayout() 144 #define kCMTextVerticalLayout_LeftToRight getkCMTextVerticalLayout_LeftToRight() 145 #define kCMTextVerticalLayout_RightToLeft getkCMTextVerticalLayout_RightToLeft() 146 #define kCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight getkCMTextMarkupAttribute_BaseFontSizePercentageRelativeToVideoHeight() 147 #define kCMTextMarkupAttribute_RelativeFontSize getkCMTextMarkupAttribute_RelativeFontSize() 148 #define kCMTextMarkupAttribute_FontFamilyName getkCMTextMarkupAttribute_FontFamilyName() 149 #define kCMTextMarkupAttribute_ForegroundColorARGB getkCMTextMarkupAttribute_ForegroundColorARGB() 150 #define kCMTextMarkupAttribute_BackgroundColorARGB getkCMTextMarkupAttribute_BackgroundColorARGB() 151 #define kCMTextMarkupAttribute_CharacterBackgroundColorARGB getkCMTextMarkupAttribute_CharacterBackgroundColorARGB() 152 #define kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms getkCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms() 48 #include "CoreMediaSoftLink.h" 153 49 154 50 namespace JSC { -
trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp
r180839 r181036 46 46 #include "Logging.h" 47 47 #include "PlatformCALayerWin.h" 48 #include "SoftLinking.h"49 48 #include "TimeRanges.h" 50 49 #include "WebCoreAVCFResourceLoader.h" -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
r181006 r181036 53 53 #import "SecurityOrigin.h" 54 54 #import "SerializedPlatformRepresentationMac.h" 55 #import "SoftLinking.h"56 55 #import "TextEncoding.h" 57 56 #import "TextTrackRepresentation.h" -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
r181006 r181036 30 30 31 31 #import "CDMSessionMediaSourceAVFObjC.h" 32 #import "CoreMediaSoftLink.h"33 32 #import "FileSystem.h" 34 33 #import "Logging.h" … … 37 36 #import "MediaTimeAVFoundation.h" 38 37 #import "PlatformClockCM.h" 39 #import "SoftLinking.h"40 38 #import "WebCoreSystemInterface.h" 41 39 #import <AVFoundation/AVAsset.h> 42 40 #import <AVFoundation/AVTime.h> 43 #import <CoreMedia/CMSync.h>44 41 #import <QuartzCore/CALayer.h> 45 42 #import <objc_runtime.h> … … 48 45 #import <wtf/NeverDestroyed.h> 49 46 50 #pragma mark - 51 #pragma mark Soft Linking 47 #pragma mark - Soft Linking 48 49 #import "CoreMediaSoftLink.h" 52 50 53 51 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation) 54 SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)55 52 56 53 SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVAsset) … … 65 62 SOFT_LINK_CONSTANT(AVFoundation, AVAudioTimePitchAlgorithmSpectral, NSString*) 66 63 SOFT_LINK_CONSTANT(AVFoundation, AVAudioTimePitchAlgorithmVarispeed, NSString*) 67 SOFT_LINK_CONSTANT(CoreMedia, kCMTimebaseNotification_EffectiveRateChanged, CFStringRef)68 64 69 65 #define AVAudioTimePitchAlgorithmSpectral getAVAudioTimePitchAlgorithmSpectral() 70 66 #define AVAudioTimePitchAlgorithmVarispeed getAVAudioTimePitchAlgorithmVarispeed() 71 #define kCMTimebaseNotification_EffectiveRateChanged getkCMTimebaseNotification_EffectiveRateChanged()72 67 73 68 #pragma mark - … … 210 205 { 211 206 return AVFoundationLibrary() 212 && CoreMediaLibrary()207 && isCoreMediaFrameworkAvailable() 213 208 && getAVStreamDataParserClass() 214 209 && getAVSampleBufferAudioRendererClass() -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
r181005 r181036 46 46 #import "InbandTextTrackPrivateAVFObjC.h" 47 47 #import <AVFoundation/AVAssetTrack.h> 48 #import <CoreMedia/CMSampleBuffer.h>49 48 #import <QuartzCore/CALayer.h> 50 49 #import <objc/runtime.h> … … 55 54 #import <map> 56 55 57 #pragma mark - 58 #pragma mark Soft Linking 56 #pragma mark - Soft Linking 57 58 #import "CoreMediaSoftLink.h" 59 59 60 60 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation) 61 SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)62 61 63 62 SOFT_LINK_CLASS(AVFoundation, AVAssetTrack) … … 71 70 SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVMediaTypeText, NSString *) 72 71 73 SOFT_LINK_CONSTANT(CoreMedia, kCMTimeZero, CMTime);74 SOFT_LINK_CONSTANT(CoreMedia, kCMTimeInvalid, CMTime);75 SOFT_LINK_CONSTANT(CoreMedia, kCMSampleAttachmentKey_DoNotDisplay, CFStringRef)76 SOFT_LINK_CONSTANT(CoreMedia, kCMSampleAttachmentKey_NotSync, CFStringRef)77 SOFT_LINK_CONSTANT(CoreMedia, kCMSampleBufferAttachmentKey_DrainAfterDecoding, CFStringRef)78 SOFT_LINK_CONSTANT(CoreMedia, kCMSampleBufferAttachmentKey_ResetDecoderBeforeDecoding, CFStringRef)79 SOFT_LINK_CONSTANT(CoreMedia, kCMSampleBufferAttachmentKey_EmptyMedia, CFStringRef)80 SOFT_LINK_CONSTANT(CoreMedia, kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately, CFStringRef)81 82 72 SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicVisual, NSString*) 83 73 SOFT_LINK_CONSTANT(AVFoundation, AVMediaCharacteristicAudible, NSString*) … … 86 76 SOFT_LINK_CONSTANT(AVFoundation, AVSampleBufferDisplayLayerFailedToDecodeNotificationErrorKey, NSString*) 87 77 88 SOFT_LINK(CoreMedia, CMFormatDescriptionGetMediaType, CMMediaType, (CMFormatDescriptionRef desc), (desc))89 SOFT_LINK(CoreMedia, CMSampleBufferCreate, OSStatus, (CFAllocatorRef allocator, CMBlockBufferRef dataBuffer, Boolean dataReady, CMSampleBufferMakeDataReadyCallback makeDataReadyCallback, void *makeDataReadyRefcon, CMFormatDescriptionRef formatDescription, CMItemCount numSamples, CMItemCount numSampleTimingEntries, const CMSampleTimingInfo *sampleTimingArray, CMItemCount numSampleSizeEntries, const size_t *sampleSizeArray, CMSampleBufferRef *sBufOut), (allocator, dataBuffer, dataReady, makeDataReadyCallback, makeDataReadyRefcon, formatDescription, numSamples, numSampleTimingEntries, sampleTimingArray, numSampleSizeEntries, sampleSizeArray, sBufOut))90 SOFT_LINK(CoreMedia, CMSampleBufferCreateCopy, OSStatus, (CFAllocatorRef allocator, CMSampleBufferRef sbuf, CMSampleBufferRef *sbufCopyOut), (allocator, sbuf, sbufCopyOut))91 SOFT_LINK(CoreMedia, CMSampleBufferCreateCopyWithNewTiming, OSStatus, (CFAllocatorRef allocator, CMSampleBufferRef originalSBuf, CMItemCount numSampleTimingEntries, const CMSampleTimingInfo *sampleTimingArray, CMSampleBufferRef *sBufCopyOut), (allocator, originalSBuf, numSampleTimingEntries, sampleTimingArray, sBufCopyOut))92 SOFT_LINK(CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (*callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon))93 SOFT_LINK(CoreMedia, CMSampleBufferGetDecodeTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf))94 SOFT_LINK(CoreMedia, CMSampleBufferGetDuration, CMTime, (CMSampleBufferRef sbuf), (sbuf))95 SOFT_LINK(CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf))96 SOFT_LINK(CoreMedia, CMSampleBufferGetPresentationTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf))97 SOFT_LINK(CoreMedia, CMSampleBufferGetSampleAttachmentsArray, CFArrayRef, (CMSampleBufferRef sbuf, Boolean createIfNecessary), (sbuf, createIfNecessary))98 SOFT_LINK(CoreMedia, CMSampleBufferGetSampleTimingInfoArray, OSStatus, (CMSampleBufferRef sbuf, CMItemCount timingArrayEntries, CMSampleTimingInfo *timingArrayOut, CMItemCount *timingArrayEntriesNeededOut), (sbuf, timingArrayEntries, timingArrayOut, timingArrayEntriesNeededOut))99 SOFT_LINK(CoreMedia, CMSampleBufferGetTotalSampleSize, size_t, (CMSampleBufferRef sbuf), (sbuf))100 SOFT_LINK(CoreMedia, CMFormatDescriptionGetMediaSubType, FourCharCode, (CMFormatDescriptionRef desc), (desc))101 SOFT_LINK(CoreMedia, CMSetAttachment, void, (CMAttachmentBearerRef target, CFStringRef key, CFTypeRef value, CMAttachmentMode attachmentMode), (target, key, value, attachmentMode))102 SOFT_LINK(CoreMedia, CMVideoFormatDescriptionGetPresentationDimensions, CGSize, (CMVideoFormatDescriptionRef videoDesc, Boolean usePixelAspectRatio, Boolean useCleanAperture), (videoDesc, usePixelAspectRatio, useCleanAperture))103 104 78 #define AVMediaTypeVideo getAVMediaTypeVideo() 105 79 #define AVMediaTypeAudio getAVMediaTypeAudio() … … 107 81 #define AVSampleBufferDisplayLayerFailedToDecodeNotification getAVSampleBufferDisplayLayerFailedToDecodeNotification() 108 82 #define AVSampleBufferDisplayLayerFailedToDecodeNotificationErrorKey getAVSampleBufferDisplayLayerFailedToDecodeNotificationErrorKey() 109 #define kCMTimeZero getkCMTimeZero()110 #define kCMTimeInvalid getkCMTimeInvalid()111 #define kCMSampleAttachmentKey_NotSync getkCMSampleAttachmentKey_NotSync()112 #define kCMSampleAttachmentKey_DoNotDisplay getkCMSampleAttachmentKey_DoNotDisplay()113 #define kCMSampleBufferAttachmentKey_ResetDecoderBeforeDecoding getkCMSampleBufferAttachmentKey_ResetDecoderBeforeDecoding()114 #define kCMSampleBufferAttachmentKey_DrainAfterDecoding getkCMSampleBufferAttachmentKey_DrainAfterDecoding()115 #define kCMSampleBufferAttachmentKey_EmptyMedia getkCMSampleBufferAttachmentKey_EmptyMedia()116 #define kCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately getkCMSampleBufferAttachmentKey_DisplayEmptyMediaImmediately()117 83 118 84 #define AVMediaCharacteristicVisual getAVMediaCharacteristicVisual() -
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
r180923 r181036 39 39 #import <UIKit/UIKit.h> 40 40 #import <WebCore/RuntimeApplicationChecksIOS.h> 41 #import <WebCore/SoftLinking.h>42 41 #import <WebCore/TimeRanges.h> 43 42 #import <WebCore/WebCoreThreadRun.h> … … 66 65 SOFT_LINK_CLASS(UIKit, UIViewController) 67 66 SOFT_LINK_CLASS(UIKit, UIColor) 68 69 SOFT_LINK(CoreMedia, CMTimeRangeContainsTime, Boolean, (CMTimeRange range, CMTime time), (range, time))70 SOFT_LINK(CoreMedia, CMTimeRangeMake, CMTimeRange, (CMTime start, CMTime duration), (start, duration))71 SOFT_LINK(CoreMedia, CMTimeSubtract, CMTime, (CMTime minuend, CMTime subtrahend), (minuend, subtrahend))72 SOFT_LINK(CoreMedia, CMTimeMaximum, CMTime, (CMTime time1, CMTime time2), (time1, time2))73 SOFT_LINK(CoreMedia, CMTimeMinimum, CMTime, (CMTime time1, CMTime time2), (time1, time2))74 SOFT_LINK_CONSTANT(CoreMedia, kCMTimeIndefinite, CMTime)75 67 76 68 #define kCMTimeIndefinite getkCMTimeIndefinite() -
trunk/Source/WebCore/platform/mac/PlatformClockCM.mm
r180366 r181036 30 30 #import "PlatformClockCM.h" 31 31 32 #import "MediaTimeAVFoundation.h" 33 32 34 #import "CoreMediaSoftLink.h" 33 #import "MediaTimeAVFoundation.h"34 #import "SoftLinking.h"35 #if PLATFORM(IOS)36 #import <CoreMedia/CMAudioClock.h>37 #else38 #import <CoreMedia/CMAudioDeviceClock.h>39 #endif40 41 SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)42 43 #if PLATFORM(IOS)44 SOFT_LINK(CoreMedia, CMAudioClockCreate, OSStatus, (CFAllocatorRef allocator, CMClockRef *clockOut), (allocator, clockOut))45 #else46 SOFT_LINK(CoreMedia, CMAudioDeviceClockCreate, OSStatus, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut))47 #endif48 SOFT_LINK(CoreMedia, CMTimebaseCreateWithMasterClock, OSStatus, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut))49 SOFT_LINK(CoreMedia, CMTimebaseSetTime, OSStatus, (CMTimebaseRef timebase, CMTime time), (timebase, time))50 SOFT_LINK(CoreMedia, CMTimebaseSetRate, OSStatus, (CMTimebaseRef timebase, Float64 rate), (timebase, rate))51 35 52 36 using namespace WebCore; -
trunk/Source/WebCore/platform/mac/SoftLinking.h
r180481 r181036 323 323 WTF_EXTERN_C_END \ 324 324 namespace functionNamespace { \ 325 constvariableType get_##framework##_##variableName(); \325 variableType get_##framework##_##variableName(); \ 326 326 } 327 327 … … 331 331 WTF_EXTERN_C_END \ 332 332 namespace functionNamespace { \ 333 constvariableType get_##framework##_##variableName(); \334 constvariableType get_##framework##_##variableName() \333 variableType get_##framework##_##variableName(); \ 334 variableType get_##framework##_##variableName() \ 335 335 { \ 336 336 static variableType constant##framework##variableName; \ -
trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm
r176924 r181036 40 40 #import <wtf/NeverDestroyed.h> 41 41 42 #import "CoreMediaSoftLink.h" 43 42 44 typedef AVCaptureConnection AVCaptureConnectionType; 43 45 typedef AVCaptureDevice AVCaptureDeviceType; … … 49 51 50 52 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation) 51 SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)52 53 53 54 SOFT_LINK_CLASS(AVFoundation, AVCaptureAudioDataOutput) … … 85 86 #define AVCaptureSessionDidStopRunningNotification getAVCaptureSessionDidStopRunningNotification() 86 87 87 SOFT_LINK(CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf));88 SOFT_LINK(CoreMedia, CMSampleBufferGetPresentationTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf));89 90 88 using namespace WebCore; 91 89 -
trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
r180366 r181036 32 32 #import "AVCaptureDeviceManager.h" 33 33 #import "BlockExceptions.h" 34 #import "CoreMediaSoftLink.h"35 34 #import "Logging.h" 36 35 #import "MediaConstraints.h" 37 36 #import "MediaStreamSourceStates.h" 38 37 #import "NotImplemented.h" 39 #import "SoftLinking.h"40 38 #import <AVFoundation/AVFoundation.h> 41 39 #import <objc/runtime.h> 40 41 #import "CoreMediaSoftLink.h" 42 42 43 43 typedef AVCaptureConnection AVCaptureConnectionType; … … 48 48 49 49 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation) 50 SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia)51 50 52 51 SOFT_LINK_CLASS(AVFoundation, AVCaptureConnection) … … 74 73 #define AVCaptureSessionPreset352x288 getAVCaptureSessionPreset352x288() 75 74 #define AVCaptureSessionPresetLow getAVCaptureSessionPresetLow() 76 77 SOFT_LINK(CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf));78 SOFT_LINK(CoreMedia, CMSampleBufferGetPresentationTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf));79 SOFT_LINK(CoreMedia, CMVideoFormatDescriptionGetDimensions, CMVideoDimensions, (CMVideoFormatDescriptionRef videoDesc), (videoDesc));80 75 81 76 namespace WebCore { -
trunk/Source/WebCore/platform/spi/cf/CoreMediaSPI.h
r180366 r181036 30 30 31 31 #if USE(APPLE_INTERNAL_SDK) 32 #i mport<CoreMedia/CMNotificationCenter.h>32 #include <CoreMedia/CMNotificationCenter.h> 33 33 #else 34 34 typedef struct opaqueCMNotificationCenter *CMNotificationCenterRef; … … 44 44 #endif // PLATFORM(COCOA) 45 45 46 #if PLATFORM(WIN) 47 #include <CoreMedia/CMTime.h> 48 49 typedef struct OpaqueCMBlockBuffer* CMBlockBufferRef; 50 typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef; 51 typedef struct opaqueCMSampleBuffer* CMSampleBufferRef; 52 53 #ifndef CMSAMPLEBUFFER_H 54 WTF_EXTERN_C_BEGIN 55 #pragma pack(push, 4) 56 typedef struct { 57 CMTime duration; 58 CMTime presentationTimeStamp; 59 CMTime decodeTimeStamp; 60 } CMSampleTimingInfo; 61 #pragma pack(pop) 62 WTF_EXTERN_C_END 63 #endif 64 #endif // PLATFORM(WIN) 65 46 66 #endif // CoreMediaSPI_h -
trunk/Source/WebCore/platform/win/SoftLinking.h
r180481 r181036 207 207 #define SOFT_LINK_CONSTANT_HEADER(functionNamespace, framework, variableName, variableType) \ 208 208 namespace functionNamespace { \ 209 constvariableType get_##framework##_##variableName(); \209 variableType get_##framework##_##variableName(); \ 210 210 } 211 211 … … 217 217 *static_cast<variableType*>(context) = *ptr; \ 218 218 } \ 219 constvariableType get_##framework##_##variableName(); \220 constvariableType get_##framework##_##variableName() \219 variableType get_##framework##_##variableName(); \ 220 variableType get_##framework##_##variableName() \ 221 221 { \ 222 222 static variableType constant##framework##variableName; \
Note: See TracChangeset
for help on using the changeset viewer.