Diff
Modified: trunk/Source/WebCore/ChangeLog (197374 => 197375)
--- trunk/Source/WebCore/ChangeLog 2016-03-01 00:39:20 UTC (rev 197374)
+++ trunk/Source/WebCore/ChangeLog 2016-03-01 00:44:53 UTC (rev 197375)
@@ -1,3 +1,50 @@
+2016-02-29 Jer Noble <[email protected]>
+
+ Refactor CoreVideo API access into their own classes so code can be re-used.
+ https://bugs.webkit.org/show_bug.cgi?id=154544
+
+ Reviewed by Eric Carlson.
+
+ In order for common CoreVideo code paths to be re-used in other classes, pull those paths
+ out of MediaPlayerPrivateAVFoundationObjC and into re-usable clasess.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/cf/CoreMediaSoftLink.cpp:
+ * platform/cf/CoreMediaSoftLink.h:
+ * platform/cocoa/CoreVideoSoftLink.cpp: Added.
+ * platform/cocoa/CoreVideoSoftLink.h: Added.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createPixelBuffer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastImage):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::copyVideoTextureToPlatformTexture):
+ (WebCore::CVPixelBufferGetBytePointerCallback): Deleted.
+ (WebCore::CVPixelBufferReleaseBytePointerCallback): Deleted.
+ (WebCore::CVPixelBufferReleaseInfoCallback): Deleted.
+ (WebCore::createImageFromPixelBuffer): Deleted.
+ (WebCore::enumToStringMap): Deleted.
+ * platform/graphics/cv/PixelBufferConformerCV.cpp: Added.
+ (WebCore::PixelBufferConformerCV::PixelBufferConformerCV):
+ (WebCore::CVPixelBufferGetBytePointerCallback):
+ (WebCore::CVPixelBufferReleaseBytePointerCallback):
+ (WebCore::CVPixelBufferReleaseInfoCallback):
+ (WebCore::PixelBufferConformerCV::createImageFromPixelBuffer):
+ * platform/graphics/cv/PixelBufferConformerCV.h: Added.
+ * platform/graphics/cv/TextureCacheCV.h: Added.
+ (WebCore::TextureCacheCV::context):
+ * platform/graphics/cv/TextureCacheCV.mm: Added.
+ (WebCore::TextureCacheCV::create):
+ (WebCore::TextureCacheCV::TextureCacheCV):
+ (WebCore::TextureCacheCV::textureFromImage):
+ * platform/graphics/cv/VideoTextureCopierCV.cpp: Added.
+ (WebCore::VideoTextureCopierCV::VideoTextureCopierCV):
+ (WebCore::VideoTextureCopierCV::~VideoTextureCopierCV):
+ (WebCore::enumToStringMap):
+ (WebCore::VideoTextureCopierCV::copyVideoTextureToPlatformTexture):
+ * platform/graphics/cv/VideoTextureCopierCV.h: Added.
+ (WebCore::VideoTextureCopierCV::context):
+ * platform/mediastream/mac/AVVideoCaptureSource.mm: Move SOFT_LINK declarations into CoreVideoSoftLink.h/cpp.
+
2016-02-29 Chris Dumez <[email protected]>
Use WTF::Optional for HTMLOListElement::m_start
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (197374 => 197375)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-03-01 00:39:20 UTC (rev 197374)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-03-01 00:44:53 UTC (rev 197375)
@@ -6033,6 +6033,10 @@
CD641EB41818F5ED00EE4C41 /* SourceBufferPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EB21818F5ED00EE4C41 /* SourceBufferPrivate.h */; };
CD641EBF1819B36000EE4C41 /* MediaTimeAVFoundation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD641EBD1819B35900EE4C41 /* MediaTimeAVFoundation.cpp */; };
CD641EC01819B36000EE4C41 /* MediaTimeAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EBE1819B35900EE4C41 /* MediaTimeAVFoundation.h */; };
+ CD7D33431C7A123F00041293 /* PixelBufferConformerCV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD7D33411C7A123F00041293 /* PixelBufferConformerCV.cpp */; };
+ CD7D33441C7A123F00041293 /* PixelBufferConformerCV.h in Headers */ = {isa = PBXBuildFile; fileRef = CD7D33421C7A123F00041293 /* PixelBufferConformerCV.h */; };
+ CD7D33471C7A16BF00041293 /* CoreVideoSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD7D33451C7A16BF00041293 /* CoreVideoSoftLink.cpp */; };
+ CD7D33481C7A16BF00041293 /* CoreVideoSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = CD7D33461C7A16BF00041293 /* CoreVideoSoftLink.h */; };
CD7DBB2818CA19A400C11066 /* CSSGridLineNamesValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD7DBB2618CA11FF00C11066 /* CSSGridLineNamesValue.cpp */; };
CD7DBB2918CA19C600C11066 /* CSSGridLineNamesValue.h in Headers */ = {isa = PBXBuildFile; fileRef = CD7DBB2718CA11FF00C11066 /* CSSGridLineNamesValue.h */; };
CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD7E05211651A84100C1201F /* WebCoreAVFResourceLoader.mm */; };
@@ -6049,6 +6053,10 @@
CD8B5A46180DFF4E008B8E65 /* VideoTrackMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8B5A45180DFF4E008B8E65 /* VideoTrackMediaSource.h */; };
CD8B5A49180E138B008B8E65 /* TextTrackMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8B5A48180E138B008B8E65 /* TextTrackMediaSource.h */; };
CD8B5A4C180E17C0008B8E65 /* AudioTrackMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8B5A4B180E17C0008B8E65 /* AudioTrackMediaSource.h */; };
+ CD9D82751C7AE535006FF066 /* TextureCacheCV.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD9D82731C7AE535006FF066 /* TextureCacheCV.mm */; };
+ CD9D82761C7AE535006FF066 /* TextureCacheCV.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9D82741C7AE535006FF066 /* TextureCacheCV.h */; };
+ CD9D82791C7B8EE1006FF066 /* VideoTextureCopierCV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9D82771C7B8EE1006FF066 /* VideoTextureCopierCV.cpp */; };
+ CD9D827A1C7B8EE1006FF066 /* VideoTextureCopierCV.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9D82781C7B8EE1006FF066 /* VideoTextureCopierCV.h */; };
CD9DE17417AAC74C00EA386D /* JSMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE17217AAC74C00EA386D /* JSMediaSource.cpp */; };
CD9DE17517AAC74C00EA386D /* JSMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17317AAC74C00EA386D /* JSMediaSource.h */; };
CD9DE17A17AAC75B00EA386D /* JSSourceBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE17617AAC75B00EA386D /* JSSourceBuffer.cpp */; };
@@ -13958,6 +13966,10 @@
CD641EBD1819B35900EE4C41 /* MediaTimeAVFoundation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTimeAVFoundation.cpp; sourceTree = "<group>"; };
CD641EBE1819B35900EE4C41 /* MediaTimeAVFoundation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaTimeAVFoundation.h; sourceTree = "<group>"; };
CD641EC7181ED60100EE4C41 /* MediaSample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSample.h; sourceTree = "<group>"; };
+ CD7D33411C7A123F00041293 /* PixelBufferConformerCV.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PixelBufferConformerCV.cpp; path = ../cv/PixelBufferConformerCV.cpp; sourceTree = "<group>"; };
+ CD7D33421C7A123F00041293 /* PixelBufferConformerCV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PixelBufferConformerCV.h; path = ../cv/PixelBufferConformerCV.h; sourceTree = "<group>"; };
+ CD7D33451C7A16BF00041293 /* CoreVideoSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CoreVideoSoftLink.cpp; sourceTree = "<group>"; };
+ CD7D33461C7A16BF00041293 /* CoreVideoSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreVideoSoftLink.h; sourceTree = "<group>"; };
CD7DBB2618CA11FF00C11066 /* CSSGridLineNamesValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGridLineNamesValue.cpp; sourceTree = "<group>"; };
CD7DBB2718CA11FF00C11066 /* CSSGridLineNamesValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSGridLineNamesValue.h; sourceTree = "<group>"; };
CD7E05201651A84100C1201F /* WebCoreAVFResourceLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebCoreAVFResourceLoader.h; sourceTree = "<group>"; };
@@ -13978,6 +13990,10 @@
CD8B5A48180E138B008B8E65 /* TextTrackMediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackMediaSource.h; sourceTree = "<group>"; };
CD8B5A4A180E17A3008B8E65 /* AudioTrackMediaSource.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = AudioTrackMediaSource.idl; sourceTree = "<group>"; };
CD8B5A4B180E17C0008B8E65 /* AudioTrackMediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioTrackMediaSource.h; sourceTree = "<group>"; };
+ CD9D82731C7AE535006FF066 /* TextureCacheCV.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TextureCacheCV.mm; path = ../cv/TextureCacheCV.mm; sourceTree = "<group>"; };
+ CD9D82741C7AE535006FF066 /* TextureCacheCV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextureCacheCV.h; path = ../cv/TextureCacheCV.h; sourceTree = "<group>"; };
+ CD9D82771C7B8EE1006FF066 /* VideoTextureCopierCV.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VideoTextureCopierCV.cpp; path = ../cv/VideoTextureCopierCV.cpp; sourceTree = "<group>"; };
+ CD9D82781C7B8EE1006FF066 /* VideoTextureCopierCV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoTextureCopierCV.h; path = ../cv/VideoTextureCopierCV.h; sourceTree = "<group>"; };
CD9DE17217AAC74C00EA386D /* JSMediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaSource.cpp; sourceTree = "<group>"; };
CD9DE17317AAC74C00EA386D /* JSMediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaSource.h; sourceTree = "<group>"; };
CD9DE17617AAC75B00EA386D /* JSSourceBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSourceBuffer.cpp; sourceTree = "<group>"; };
@@ -19900,6 +19916,8 @@
isa = PBXGroup;
children = (
A14090FA1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm */,
+ CD7D33451C7A16BF00041293 /* CoreVideoSoftLink.cpp */,
+ CD7D33461C7A16BF00041293 /* CoreVideoSoftLink.h */,
7C7941E21C56C29300A4C58E /* DataDetectorsCoreSoftLink.mm */,
7C7941E31C56C29300A4C58E /* DataDetectorsCoreSoftLink.h */,
5D8C4DBD1428222C0026CE72 /* DisplaySleepDisablerCocoa.cpp */,
@@ -21769,6 +21787,7 @@
076F0D0812B8192700C26AA4 /* avfoundation */,
499B3EC0128CCC1800E726C2 /* ca */,
B27535290B053814002CE64F /* cg */,
+ CD9D827C1C7BB2ED006FF066 /* cv */,
B5320D68122A24E9002D1440 /* cocoa */,
9332AB3B16515D7700D827EC /* cpu */,
0FE5FBC91C3DD5060007A2CA /* displaylists */,
@@ -22978,6 +22997,20 @@
path = mediacontrols;
sourceTree = "<group>";
};
+ CD9D827C1C7BB2ED006FF066 /* cv */ = {
+ isa = PBXGroup;
+ children = (
+ CD7D33411C7A123F00041293 /* PixelBufferConformerCV.cpp */,
+ CD7D33421C7A123F00041293 /* PixelBufferConformerCV.h */,
+ CD9D82741C7AE535006FF066 /* TextureCacheCV.h */,
+ CD9D82731C7AE535006FF066 /* TextureCacheCV.mm */,
+ CD9D82771C7B8EE1006FF066 /* VideoTextureCopierCV.cpp */,
+ CD9D82781C7B8EE1006FF066 /* VideoTextureCopierCV.h */,
+ );
+ name = cv;
+ path = cg;
+ sourceTree = "<group>";
+ };
CDA98DBD16014E0800FEA3B1 /* encryptedmedia */ = {
isa = PBXGroup;
children = (
@@ -25114,6 +25147,7 @@
6550B6A2099DF0270090D781 /* Comment.h in Headers */,
E1FE137518402A6700892F13 /* CommonCryptoUtilities.h in Headers */,
7C93F34A1AA6BA5E00A98BAB /* CompiledContentExtension.h in Headers */,
+ CD9D827A1C7B8EE1006FF066 /* VideoTextureCopierCV.h in Headers */,
37C236111097EE7700EF9F72 /* ComplexTextController.h in Headers */,
E4BA50901BCFBD9500E34EF7 /* ComposedTreeAncestorIterator.h in Headers */,
E44FA1851BCA6B5A0091B6EF /* ComposedTreeIterator.h in Headers */,
@@ -26881,6 +26915,7 @@
1ACE53F70A8D19470022947D /* JSXMLSerializer.h in Headers */,
1A762C740A074F2600989F5B /* JSXPathEvaluator.h in Headers */,
BC60DB4A0D2A3D1E00B9918F /* JSXPathException.h in Headers */,
+ CD7D33441C7A123F00041293 /* PixelBufferConformerCV.h in Headers */,
1A762C760A074F2600989F5B /* JSXPathExpression.h in Headers */,
1A762C780A074F2600989F5B /* JSXPathNSResolver.h in Headers */,
1A762C7A0A074F2600989F5B /* JSXPathResult.h in Headers */,
@@ -27587,6 +27622,7 @@
078E092A17D14D1C00420AA1 /* RTCStatsReport.h in Headers */,
511EC1281C50AACA0032F983 /* IDBSerialization.h in Headers */,
078E094517D16E1C00420AA1 /* RTCStatsRequest.h in Headers */,
+ CD9D82761C7AE535006FF066 /* TextureCacheCV.h in Headers */,
078E092C17D14D1C00420AA1 /* RTCStatsResponse.h in Headers */,
078E094617D16E1C00420AA1 /* RTCStatsResponseBase.h in Headers */,
5E2C43681BCEE3770001E2BC /* RTCTrackEvent.h in Headers */,
@@ -28115,6 +28151,7 @@
7CC564B818BABEA6001B9652 /* TelephoneNumberDetector.h in Headers */,
C65046A9167BFB5500CC2A4D /* TemplateContentDocumentFragment.h in Headers */,
26E944DD1AC4B4EA007B85B5 /* Term.h in Headers */,
+ CD7D33481C7A16BF00041293 /* CoreVideoSoftLink.h in Headers */,
6550B6A6099DF0270090D781 /* Text.h in Headers */,
93309E17099E64920056E581 /* TextAffinity.h in Headers */,
CE7B2DB51586ABAD0098B3FA /* TextAlternativeWithRange.h in Headers */,
@@ -29279,6 +29316,7 @@
973889A0116EA9DC00ADF313 /* DocumentWriter.cpp in Sources */,
BC1A37AE097C715F0019F3D8 /* DOM.mm in Sources */,
BCD0FBD00DBD625E00B2F630 /* DOMAbstractView.mm in Sources */,
+ CD7D33431C7A123F00041293 /* PixelBufferConformerCV.cpp in Sources */,
319848091A1E6CBF00A13318 /* DOMAnimationEvent.mm in Sources */,
1A8F6BC20DB55CDC001DB794 /* DOMApplicationCache.cpp in Sources */,
85D389B30A991A7F00282145 /* DOMAttr.mm in Sources */,
@@ -29450,6 +29488,7 @@
3F2B33EC165AF15600E3987C /* DOMWebKitCSSViewportRule.mm in Sources */,
8A195933147EA16E00D1EA61 /* DOMWebKitNamedFlow.mm in Sources */,
31C0FF4D0E4CEFDD007D6FE5 /* DOMWebKitTransitionEvent.mm in Sources */,
+ CD7D33471C7A16BF00041293 /* CoreVideoSoftLink.cpp in Sources */,
5141299B1C6C16740059E714 /* JSIDBIndexCustom.cpp in Sources */,
85C7F5E80AAFBAFB004014DD /* DOMWheelEvent.mm in Sources */,
1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */,
@@ -29729,6 +29768,7 @@
A8EA79F80A1916DF00A8EF5F /* HTMLMenuElement.cpp in Sources */,
2BE8E2C912A58A0100FAD550 /* HTMLMetaCharsetParser.cpp in Sources */,
A871DC270A15205700B12A68 /* HTMLMetaElement.cpp in Sources */,
+ CD9D82751C7AE535006FF066 /* TextureCacheCV.mm in Sources */,
A454424A119B3661009BE912 /* HTMLMeterElement.cpp in Sources */,
A8CFF7A90A156978000A4234 /* HTMLModElement.cpp in Sources */,
A8DF3FD5097FA0FC0052981B /* HTMLNameCollection.cpp in Sources */,
@@ -31130,6 +31170,7 @@
A871DFE50A15376B00B12A68 /* RenderWidget.cpp in Sources */,
F5528DA61AC1033E000EF7AD /* ReplaceDeleteFromTextNodeCommand.cpp in Sources */,
F5528DA91AC109DF000EF7AD /* ReplaceInsertIntoTextNodeCommand.cpp in Sources */,
+ CD9D82791C7B8EE1006FF066 /* VideoTextureCopierCV.cpp in Sources */,
A89CCC520F44E98100B5DA10 /* ReplaceNodeWithSpanCommand.cpp in Sources */,
93309E09099E64920056E581 /* ReplaceSelectionCommand.cpp in Sources */,
99CC0B5318BE9849006CEBCC /* ReplayController.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp (197374 => 197375)
--- trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2016-03-01 00:39:20 UTC (rev 197374)
+++ trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.cpp 2016-03-01 00:44:53 UTC (rev 197375)
@@ -35,10 +35,12 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMBlockBufferGetDataLength, size_t, (CMBlockBufferRef theBuffer), (theBuffer))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMFormatDescriptionGetExtensions, CFDictionaryRef, (CMFormatDescriptionRef desc), (desc))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMSampleBufferGetTypeID, CFTypeID, (void), ())
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMSampleBufferGetDataBuffer, CMBlockBufferRef, (CMSampleBufferRef sbuf), (sbuf))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMSampleBufferGetSampleTimingInfo, OSStatus, (CMSampleBufferRef sbuf, CMItemIndex sampleIndex, CMSampleTimingInfo* timingInfoOut), (sbuf, sampleIndex, timingInfoOut))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimeAdd, CMTime, (CMTime time1, CMTime time2), (time1, time2))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale))
@@ -122,7 +124,6 @@
#endif // PLATFORM(MAC)
#if PLATFORM(WIN)
-SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimeAdd, CMTime, (CMTime addend1, CMTime addend2), (addend1, addend2))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreMedia, CMTimeMakeFromDictionary, CMTime, (CFDictionaryRef dict), (dict))
#endif // PLATFORM(WIN)
Modified: trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h (197374 => 197375)
--- trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2016-03-01 00:39:20 UTC (rev 197374)
+++ trunk/Source/WebCore/platform/cf/CoreMediaSoftLink.h 2016-03-01 00:44:53 UTC (rev 197375)
@@ -39,12 +39,16 @@
#define CMBlockBufferGetDataLength softLink_CoreMedia_CMBlockBufferGetDataLength
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMFormatDescriptionGetExtensions, CFDictionaryRef, (CMFormatDescriptionRef desc), (desc))
#define CMFormatDescriptionGetExtensions softLink_CoreMedia_CMFormatDescriptionGetExtensions
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMSampleBufferGetTypeID, CFTypeID, (void), ())
+#define CMSampleBufferGetTypeID softLink_CoreMedia_CMSampleBufferGetTypeID
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMSampleBufferGetDataBuffer, CMBlockBufferRef, (CMSampleBufferRef sbuf), (sbuf))
#define CMSampleBufferGetDataBuffer softLink_CoreMedia_CMSampleBufferGetDataBuffer
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf))
#define CMSampleBufferGetFormatDescription softLink_CoreMedia_CMSampleBufferGetFormatDescription
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMSampleBufferGetSampleTimingInfo, OSStatus, (CMSampleBufferRef sbuf, CMItemIndex sampleIndex, CMSampleTimingInfo* timingInfoOut), (sbuf, sampleIndex, timingInfoOut))
#define CMSampleBufferGetSampleTimingInfo softLink_CoreMedia_CMSampleBufferGetSampleTimingInfo
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMTimeAdd, CMTime, (CMTime time1, CMTime time2), (time1, time2))
+#define CMTimeAdd softLink_CoreMedia_CMTimeAdd
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMTimeCompare, int32_t, (CMTime time1, CMTime time2), (time1, time2))
#define CMTimeCompare softLink_CoreMedia_CMTimeCompare
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time))
@@ -206,8 +210,6 @@
#if PLATFORM(WIN)
-SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMTimeAdd, CMTime, (CMTime addend1, CMTime addend2), (addend1, addend2))
-#define CMTimeAdd softLink_CoreMedia_CMTimeAdd
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreMedia, CMTimeMakeFromDictionary, CMTime, (CFDictionaryRef dict), (dict))
#define CMTimeMakeFromDictionary softLink_CoreMedia_CMTimeMakeFromDictionary
Added: trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp (0 => 197375)
--- trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp (rev 0)
+++ trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.cpp 2016-03-01 00:44:53 UTC (rev 197375)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "SoftLinking.h"
+#include <CoreVideo/CoreVideo.h>
+
+SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, CoreVideo)
+
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetWidth, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetHeight, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetBaseAddress, void*, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetBytesPerRow, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetDataSize, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferGetPixelFormatType, OSType, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferLockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVPixelBufferUnlockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
+SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreVideo, kCVPixelBufferPixelFormatTypeKey, CFStringRef)
+
+#if PLATFORM(IOS)
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLESTextureCacheCreate, CVReturn, (CFAllocatorRef allocator, CFDictionaryRef cacheAttributes, CVEAGLContext eaglContext, CFDictionaryRef textureAttributes, CVOpenGLESTextureCacheRef* cacheOut), (allocator, cacheAttributes, eaglContext, textureAttributes, cacheOut))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLESTextureCacheCreateTextureFromImage, CVReturn, (CFAllocatorRef allocator, CVOpenGLESTextureCacheRef textureCache, CVImageBufferRef sourceImage, CFDictionaryRef textureAttributes, GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, size_t planeIndex, CVOpenGLESTextureRef* textureOut), (allocator, textureCache, sourceImage, textureAttributes, target, internalFormat, width, height, format, type, planeIndex, textureOut))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLESTextureCacheFlush, void, (CVOpenGLESTextureCacheRef textureCache, CVOptionFlags options), (textureCache, options))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLESTextureGetTarget, GLenum, (CVOpenGLESTextureRef image), (image))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLESTextureGetName, GLuint, (CVOpenGLESTextureRef image), (image))
+SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreVideo, kCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey, CFStringRef)
+#else
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLTextureCacheCreate, CVReturn, (CFAllocatorRef allocator, CFDictionaryRef cacheAttributes, CGLContextObj cglContext, CGLPixelFormatObj cglPixelFormat, CFDictionaryRef textureAttributes, CVOpenGLTextureCacheRef* cacheOut), (allocator, cacheAttributes, cglContext, cglPixelFormat, textureAttributes, cacheOut))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLTextureCacheCreateTextureFromImage, CVReturn, (CFAllocatorRef allocator, CVOpenGLTextureCacheRef textureCache, CVImageBufferRef sourceImage, CFDictionaryRef attributes, CVOpenGLTextureRef* textureOut), (allocator, textureCache, sourceImage, attributes, textureOut))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLTextureCacheFlush, void, (CVOpenGLTextureCacheRef textureCache, CVOptionFlags options), (textureCache, options))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLTextureGetTarget, GLenum, (CVOpenGLTextureRef image), (image))
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, CoreVideo, CVOpenGLTextureGetName, GLuint, (CVOpenGLTextureRef image), (image))
+SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, CoreVideo, kCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey, CFStringRef)
+#endif
Added: trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h (0 => 197375)
--- trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h (rev 0)
+++ trunk/Source/WebCore/platform/cocoa/CoreVideoSoftLink.h 2016-03-01 00:44:53 UTC (rev 197375)
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CoreVideoSoftLink_h
+#define CoreVideoSoftLink_h
+
+#include "SoftLinking.h"
+#include <CoreVideo/CoreVideo.h>
+
+SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, CoreVideo)
+
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetWidth, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+#define CVPixelBufferGetWidth softLink_CoreVideo_CVPixelBufferGetWidth
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetHeight, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+#define CVPixelBufferGetHeight softLink_CoreVideo_CVPixelBufferGetHeight
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetBaseAddress, void*, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+#define CVPixelBufferGetBaseAddress softLink_CoreVideo_CVPixelBufferGetBaseAddress
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetBytesPerRow, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+#define CVPixelBufferGetBytesPerRow softLink_CoreVideo_CVPixelBufferGetBytesPerRow
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetDataSize, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+#define CVPixelBufferGetDataSize softLink_CoreVideo_CVPixelBufferGetDataSize
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferGetPixelFormatType, OSType, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
+#define CVPixelBufferGetPixelFormatType softLink_CoreVideo_CVPixelBufferGetPixelFormatType
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferLockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
+#define CVPixelBufferLockBaseAddress softLink_CoreVideo_CVPixelBufferLockBaseAddress
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVPixelBufferUnlockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
+#define CVPixelBufferUnlockBaseAddress softLink_CoreVideo_CVPixelBufferUnlockBaseAddress
+
+SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreVideo, kCVPixelBufferPixelFormatTypeKey, CFStringRef)
+#define kCVPixelBufferPixelFormatTypeKey get_CoreVideo_kCVPixelBufferPixelFormatTypeKey()
+
+#if PLATFORM(IOS)
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLESTextureCacheCreate, CVReturn, (CFAllocatorRef allocator, CFDictionaryRef cacheAttributes, CVEAGLContext eaglContext, CFDictionaryRef textureAttributes, CVOpenGLESTextureCacheRef* cacheOut), (allocator, cacheAttributes, eaglContext, textureAttributes, cacheOut))
+#define CVOpenGLESTextureCacheCreate softLink_CoreVideo_CVOpenGLESTextureCacheCreate
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLESTextureCacheCreateTextureFromImage, CVReturn, (CFAllocatorRef allocator, CVOpenGLESTextureCacheRef textureCache, CVImageBufferRef sourceImage, CFDictionaryRef textureAttributes, GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, size_t planeIndex, CVOpenGLESTextureRef* textureOut), (allocator, textureCache, sourceImage, textureAttributes, target, internalFormat, width, height, format, type, planeIndex, textureOut))
+#define CVOpenGLESTextureCacheCreateTextureFromImage softLink_CoreVideo_CVOpenGLESTextureCacheCreateTextureFromImage
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLESTextureCacheFlush, void, (CVOpenGLESTextureCacheRef textureCache, CVOptionFlags options), (textureCache, options))
+#define CVOpenGLESTextureCacheFlush softLink_CoreVideo_CVOpenGLESTextureCacheFlush
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLESTextureGetTarget, GLenum, (CVOpenGLESTextureRef image), (image))
+#define CVOpenGLESTextureGetTarget softLink_CoreVideo_CVOpenGLESTextureGetTarget
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLESTextureGetName, GLuint, (CVOpenGLESTextureRef image), (image))
+#define CVOpenGLESTextureGetName softLink_CoreVideo_CVOpenGLESTextureGetName
+
+SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreVideo, kCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey, CFStringRef)
+#define kCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey get_CoreVideo_kCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey()
+#else
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLTextureCacheCreate, CVReturn, (CFAllocatorRef allocator, CFDictionaryRef cacheAttributes, CGLContextObj cglContext, CGLPixelFormatObj cglPixelFormat, CFDictionaryRef textureAttributes, CVOpenGLTextureCacheRef* cacheOut), (allocator, cacheAttributes, cglContext, cglPixelFormat, textureAttributes, cacheOut))
+#define CVOpenGLTextureCacheCreate softLink_CoreVideo_CVOpenGLTextureCacheCreate
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLTextureCacheCreateTextureFromImage, CVReturn, (CFAllocatorRef allocator, CVOpenGLTextureCacheRef textureCache, CVImageBufferRef sourceImage, CFDictionaryRef attributes, CVOpenGLTextureRef* textureOut), (allocator, textureCache, sourceImage, attributes, textureOut))
+#define CVOpenGLTextureCacheCreateTextureFromImage softLink_CoreVideo_CVOpenGLTextureCacheCreateTextureFromImage
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLTextureCacheFlush, void, (CVOpenGLTextureCacheRef textureCache, CVOptionFlags options), (textureCache, options))
+#define CVOpenGLTextureCacheFlush softLink_CoreVideo_CVOpenGLTextureCacheFlush
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLTextureGetTarget, GLenum, (CVOpenGLTextureRef image), (image))
+#define CVOpenGLTextureGetTarget softLink_CoreVideo_CVOpenGLTextureGetTarget
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, CoreVideo, CVOpenGLTextureGetName, GLuint, (CVOpenGLTextureRef image), (image))
+#define CVOpenGLTextureGetName softLink_CoreVideo_CVOpenGLTextureGetName
+
+SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, CoreVideo, kCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey, CFStringRef)
+#define kCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey get_CoreVideo_kCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey()
+#endif
+
+#endif // CoreVideoSoftLink_h
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (197374 => 197375)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-03-01 00:39:20 UTC (rev 197374)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-03-01 00:44:53 UTC (rev 197375)
@@ -57,7 +57,6 @@
typedef struct CGImage *CGImageRef;
typedef struct __CVBuffer *CVPixelBufferRef;
-typedef struct OpaqueVTPixelTransferSession* VTPixelTransferSessionRef;
#if PLATFORM(IOS)
typedef struct __CVOpenGLESTextureCache *CVOpenGLESTextureCacheRef;
#else
@@ -71,8 +70,11 @@
class InbandMetadataTextTrackPrivateAVF;
class InbandTextTrackPrivateAVFObjC;
class MediaSelectionGroupAVFObjC;
+class PixelBufferConformerCV;
class VideoTrackPrivateAVFObjC;
class WebCoreAVFResourceLoader;
+class TextureCacheCV;
+class VideoTextureCopierCV;
#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
class VideoFullscreenLayerManager;
@@ -345,17 +347,12 @@
dispatch_semaphore_t m_videoOutputSemaphore;
RetainPtr<AVPlayerItemVideoOutput> m_openGLVideoOutput;
-#if PLATFORM(IOS)
- RetainPtr<CVOpenGLESTextureCacheRef> m_openGLTextureCache;
-#else
- RetainPtr<CVOpenGLTextureCacheRef> m_openGLTextureCache;
-#endif
+ std::unique_ptr<TextureCacheCV> m_textureCache;
+ std::unique_ptr<VideoTextureCopierCV> m_videoTextureCopier;
RetainPtr<CVPixelBufferRef> m_lastOpenGLImage;
#endif
-#if USE(VIDEOTOOLBOX)
- RetainPtr<VTPixelTransferSessionRef> m_pixelTransferSession;
-#endif
+ std::unique_ptr<PixelBufferConformerCV> m_pixelBufferConformer;
#if HAVE(AVFOUNDATION_LOADER_DELEGATE)
friend class WebCoreAVFResourceLoader;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (197374 => 197375)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-03-01 00:39:20 UTC (rev 197374)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-03-01 00:44:53 UTC (rev 197375)
@@ -53,6 +53,7 @@
#import "MediaPlaybackTargetMock.h"
#import "MediaSelectionGroupAVFObjC.h"
#import "MediaTimeAVFoundation.h"
+#import "PixelBufferConformerCV.h"
#import "PlatformTimeRanges.h"
#import "QuartzCoreSPI.h"
#import "SecurityOrigin.h"
@@ -60,7 +61,9 @@
#import "Settings.h"
#import "TextEncoding.h"
#import "TextTrackRepresentation.h"
+#import "TextureCacheCV.h"
#import "UUID.h"
+#import "VideoTextureCopierCV.h"
#import "VideoTrackPrivateAVFObjC.h"
#import "WebCoreAVFResourceLoader.h"
#import "WebCoreCALayerExtras.h"
@@ -110,9 +113,7 @@
#include "CFNSURLConnectionSPI.h"
#endif
-#if PLATFORM(IOS)
-#include <OpenGLES/ES3/glext.h>
-#endif
+#import "CoreVideoSoftLink.h"
namespace std {
template <> struct iterator_traits<HashSet<RefPtr<WebCore::MediaSelectionOptionAVFObjC>>::iterator> {
@@ -149,26 +150,7 @@
SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
SOFT_LINK_FRAMEWORK_OPTIONAL(CoreImage)
-SOFT_LINK_FRAMEWORK_OPTIONAL(CoreVideo)
-#if USE(VIDEOTOOLBOX)
-SOFT_LINK_FRAMEWORK_OPTIONAL(VideoToolbox)
-#endif
-
-SOFT_LINK(CoreVideo, CVPixelBufferGetWidth, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetHeight, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetBaseAddress, void*, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetBytesPerRow, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetDataSize, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetPixelFormatType, OSType, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferLockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
-SOFT_LINK(CoreVideo, CVPixelBufferUnlockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
-
-#if USE(VIDEOTOOLBOX)
-SOFT_LINK(VideoToolbox, VTPixelTransferSessionCreate, OSStatus, (CFAllocatorRef allocator, VTPixelTransferSessionRef *pixelTransferSessionOut), (allocator, pixelTransferSessionOut))
-SOFT_LINK(VideoToolbox, VTPixelTransferSessionTransferImage, OSStatus, (VTPixelTransferSessionRef session, CVPixelBufferRef sourceBuffer, CVPixelBufferRef destinationBuffer), (session, sourceBuffer, destinationBuffer))
-#endif
-
SOFT_LINK_CLASS(AVFoundation, AVPlayer)
SOFT_LINK_CLASS(AVFoundation, AVPlayerItem)
SOFT_LINK_CLASS(AVFoundation, AVPlayerItemVideoOutput)
@@ -195,7 +177,6 @@
SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVLayerVideoGravityResize, NSString *)
-SOFT_LINK_POINTER(CoreVideo, kCVPixelBufferPixelFormatTypeKey, NSString *)
SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *)
@@ -222,7 +203,6 @@
#define AVLayerVideoGravityResizeAspect getAVLayerVideoGravityResizeAspect()
#define AVLayerVideoGravityResizeAspectFill getAVLayerVideoGravityResizeAspectFill()
#define AVLayerVideoGravityResize getAVLayerVideoGravityResize()
-#define kCVPixelBufferPixelFormatTypeKey getkCVPixelBufferPixelFormatTypeKey()
#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
typedef AVMediaSelectionGroup AVMediaSelectionGroupType;
@@ -291,24 +271,6 @@
#define AVURLAssetBoundNetworkInterfaceName getAVURLAssetBoundNetworkInterfaceName()
#endif
-#if PLATFORM(IOS)
-SOFT_LINK(CoreVideo, CVOpenGLESTextureCacheCreate, CVReturn, (CFAllocatorRef allocator, CFDictionaryRef cacheAttributes, CVEAGLContext eaglContext, CFDictionaryRef textureAttributes, CVOpenGLESTextureCacheRef* cacheOut), (allocator, cacheAttributes, eaglContext, textureAttributes, cacheOut))
-SOFT_LINK(CoreVideo, CVOpenGLESTextureCacheCreateTextureFromImage, CVReturn, (CFAllocatorRef allocator, CVOpenGLESTextureCacheRef textureCache, CVImageBufferRef sourceImage, CFDictionaryRef textureAttributes, GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, size_t planeIndex, CVOpenGLESTextureRef* textureOut), (allocator, textureCache, sourceImage, textureAttributes, target, internalFormat, width, height, format, type, planeIndex, textureOut))
-SOFT_LINK(CoreVideo, CVOpenGLESTextureCacheFlush, void, (CVOpenGLESTextureCacheRef textureCache, CVOptionFlags options), (textureCache, options))
-SOFT_LINK(CoreVideo, CVOpenGLESTextureGetTarget, GLenum, (CVOpenGLESTextureRef image), (image))
-SOFT_LINK(CoreVideo, CVOpenGLESTextureGetName, GLuint, (CVOpenGLESTextureRef image), (image))
-SOFT_LINK_POINTER(CoreVideo, kCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey, NSString *)
-#define kCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey getkCVPixelBufferIOSurfaceOpenGLESFBOCompatibilityKey()
-#else
-SOFT_LINK(CoreVideo, CVOpenGLTextureCacheCreate, CVReturn, (CFAllocatorRef allocator, CFDictionaryRef cacheAttributes, CGLContextObj cglContext, CGLPixelFormatObj cglPixelFormat, CFDictionaryRef textureAttributes, CVOpenGLTextureCacheRef* cacheOut), (allocator, cacheAttributes, cglContext, cglPixelFormat, textureAttributes, cacheOut))
-SOFT_LINK(CoreVideo, CVOpenGLTextureCacheCreateTextureFromImage, CVReturn, (CFAllocatorRef allocator, CVOpenGLTextureCacheRef textureCache, CVImageBufferRef sourceImage, CFDictionaryRef attributes, CVOpenGLTextureRef* textureOut), (allocator, textureCache, sourceImage, attributes, textureOut))
-SOFT_LINK(CoreVideo, CVOpenGLTextureCacheFlush, void, (CVOpenGLTextureCacheRef textureCache, CVOptionFlags options), (textureCache, options))
-SOFT_LINK(CoreVideo, CVOpenGLTextureGetTarget, GLenum, (CVOpenGLTextureRef image), (image))
-SOFT_LINK(CoreVideo, CVOpenGLTextureGetName, GLuint, (CVOpenGLTextureRef image), (image))
-SOFT_LINK_POINTER(CoreVideo, kCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey, NSString *)
-#define kCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey getkCVPixelBufferIOSurfaceOpenGLFBOCompatibilityKey()
-#endif
-
SOFT_LINK_FRAMEWORK(MediaToolbox)
SOFT_LINK_OPTIONAL(MediaToolbox, MTEnableCaption2015Behavior, Boolean, (), ())
@@ -2220,39 +2182,12 @@
createVideoOutput();
ASSERT(m_videoOutput);
-#if !LOG_DISABLED
- double start = monotonicallyIncreasingTime();
-#endif
-
CMTime currentTime = [m_avPlayerItem.get() currentTime];
if (![m_videoOutput.get() hasNewPixelBufferForItemTime:currentTime])
return 0;
- RetainPtr<CVPixelBufferRef> buffer = adoptCF([m_videoOutput.get() copyPixelBufferForItemTime:currentTime itemTimeForDisplay:nil]);
- if (!buffer)
- return 0;
-
-#if USE(VIDEOTOOLBOX)
- // Create a VTPixelTransferSession, if necessary, as we cannot guarantee timely delivery of ARGB pixels.
- if (!m_pixelTransferSession) {
- VTPixelTransferSessionRef session = 0;
- VTPixelTransferSessionCreate(kCFAllocatorDefault, &session);
- m_pixelTransferSession = adoptCF(session);
- }
-
- CVPixelBufferRef outputBuffer;
- CVPixelBufferCreate(kCFAllocatorDefault, CVPixelBufferGetWidth(buffer.get()), CVPixelBufferGetHeight(buffer.get()), kCVPixelFormatType_32BGRA, 0, &outputBuffer);
- VTPixelTransferSessionTransferImage(m_pixelTransferSession.get(), buffer.get(), outputBuffer);
- buffer = adoptCF(outputBuffer);
-#endif
-
-#if !LOG_DISABLED
- double duration = monotonicallyIncreasingTime() - start;
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createPixelBuffer(%p) - creating buffer took %.4f", this, narrowPrecisionToFloat(duration));
-#endif
-
- return buffer;
+ return adoptCF([m_videoOutput.get() copyPixelBufferForItemTime:currentTime itemTimeForDisplay:nil]);
}
bool MediaPlayerPrivateAVFoundationObjC::videoOutputHasAvailableFrame()
@@ -2269,43 +2204,6 @@
return [m_videoOutput hasNewPixelBufferForItemTime:[m_avPlayerItem currentTime]];
}
-static const void* CVPixelBufferGetBytePointerCallback(void* info)
-{
- CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
- CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
- return CVPixelBufferGetBaseAddress(pixelBuffer);
-}
-
-static void CVPixelBufferReleaseBytePointerCallback(void* info, const void*)
-{
- CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
- CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
-}
-
-static void CVPixelBufferReleaseInfoCallback(void* info)
-{
- CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
- CFRelease(pixelBuffer);
-}
-
-static RetainPtr<CGImageRef> createImageFromPixelBuffer(CVPixelBufferRef pixelBuffer)
-{
- // pixelBuffer will be of type kCVPixelFormatType_32BGRA.
- ASSERT(CVPixelBufferGetPixelFormatType(pixelBuffer) == kCVPixelFormatType_32BGRA);
-
- size_t width = CVPixelBufferGetWidth(pixelBuffer);
- size_t height = CVPixelBufferGetHeight(pixelBuffer);
- size_t bytesPerRow = CVPixelBufferGetBytesPerRow(pixelBuffer);
- size_t byteLength = CVPixelBufferGetDataSize(pixelBuffer);
- CGBitmapInfo bitmapInfo = kCGBitmapByteOrder32Little | kCGImageAlphaFirst;
-
- CFRetain(pixelBuffer); // Balanced by CVPixelBufferReleaseInfoCallback in providerCallbacks.
- CGDataProviderDirectCallbacks providerCallbacks = { 0, CVPixelBufferGetBytePointerCallback, CVPixelBufferReleaseBytePointerCallback, 0, CVPixelBufferReleaseInfoCallback };
- RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateDirect(pixelBuffer, byteLength, &providerCallbacks));
-
- return adoptCF(CGImageCreate(width, height, 8, 32, bytesPerRow, sRGBColorSpaceRef(), bitmapInfo, provider.get(), NULL, false, kCGRenderingIntentDefault));
-}
-
void MediaPlayerPrivateAVFoundationObjC::updateLastImage()
{
RetainPtr<CVPixelBufferRef> pixelBuffer = createPixelBuffer();
@@ -2313,8 +2211,28 @@
// Calls to copyPixelBufferForItemTime:itemTimeForDisplay: may return nil if the pixel buffer
// for the requested time has already been retrieved. In this case, the last valid image (if any)
// should be displayed.
- if (pixelBuffer)
- m_lastImage = createImageFromPixelBuffer(pixelBuffer.get());
+ if (!pixelBuffer)
+ return;
+
+ if (!m_pixelBufferConformer) {
+#if USE(VIDEOTOOLBOX)
+ NSDictionary *attributes = @{ (NSString *)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA) };
+#else
+ NSDictionary *attributes = nil;
+#endif
+ m_pixelBufferConformer = std::make_unique<PixelBufferConformerCV>((CFDictionaryRef)attributes);
+ }
+
+#if !LOG_DISABLED
+ double start = monotonicallyIncreasingTime();
+#endif
+
+ m_lastImage = m_pixelBufferConformer->createImageFromPixelBuffer(pixelBuffer.get());
+
+#if !LOG_DISABLED
+ double duration = monotonicallyIncreasingTime() - start;
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::updateLastImage(%p) - creating buffer took %.4f", this, narrowPrecisionToFloat(duration));
+#endif
}
void MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput(GraphicsContext& context, const FloatRect& outputRect)
@@ -2392,110 +2310,6 @@
m_lastOpenGLImage = adoptCF([m_openGLVideoOutput copyPixelBufferForItemTime:currentTime itemTimeForDisplay:nil]);
}
-#if !LOG_DISABLED
-
-#define STRINGIFY_PAIR(e) e, #e
-static std::map<uint32_t, const char*>& enumToStringMap()
-{
- static NeverDestroyed<std::map<uint32_t, const char*>> map;
- if (map.get().empty()) {
- std::map<uint32_t, const char*> stringMap;
- map.get().emplace(STRINGIFY_PAIR(GL_RGB));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA));
- map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE_ALPHA));
- map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE));
- map.get().emplace(STRINGIFY_PAIR(GL_ALPHA));
- map.get().emplace(STRINGIFY_PAIR(GL_R8));
- map.get().emplace(STRINGIFY_PAIR(GL_R16F));
- map.get().emplace(STRINGIFY_PAIR(GL_R32F));
- map.get().emplace(STRINGIFY_PAIR(GL_R8UI));
- map.get().emplace(STRINGIFY_PAIR(GL_R8I));
- map.get().emplace(STRINGIFY_PAIR(GL_R16UI));
- map.get().emplace(STRINGIFY_PAIR(GL_R16I));
- map.get().emplace(STRINGIFY_PAIR(GL_R32UI));
- map.get().emplace(STRINGIFY_PAIR(GL_R32I));
- map.get().emplace(STRINGIFY_PAIR(GL_RG8));
- map.get().emplace(STRINGIFY_PAIR(GL_RG16F));
- map.get().emplace(STRINGIFY_PAIR(GL_RG32F));
- map.get().emplace(STRINGIFY_PAIR(GL_RG8UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RG8I));
- map.get().emplace(STRINGIFY_PAIR(GL_RG16UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RG16I));
- map.get().emplace(STRINGIFY_PAIR(GL_RG32UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RG32I));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB8));
- map.get().emplace(STRINGIFY_PAIR(GL_SRGB8));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA8));
- map.get().emplace(STRINGIFY_PAIR(GL_SRGB8_ALPHA8));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA4));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB10_A2));
- map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT16));
- map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT24));
- map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT32F));
- map.get().emplace(STRINGIFY_PAIR(GL_DEPTH24_STENCIL8));
- map.get().emplace(STRINGIFY_PAIR(GL_DEPTH32F_STENCIL8));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA));
- map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE_ALPHA));
- map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE));
- map.get().emplace(STRINGIFY_PAIR(GL_ALPHA));
- map.get().emplace(STRINGIFY_PAIR(GL_RED));
- map.get().emplace(STRINGIFY_PAIR(GL_RG_INTEGER));
- map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_STENCIL));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_BYTE));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_5_6_5));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_4_4_4_4));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_5_5_5_1));
- map.get().emplace(STRINGIFY_PAIR(GL_BYTE));
- map.get().emplace(STRINGIFY_PAIR(GL_HALF_FLOAT));
- map.get().emplace(STRINGIFY_PAIR(GL_FLOAT));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT));
- map.get().emplace(STRINGIFY_PAIR(GL_SHORT));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT));
- map.get().emplace(STRINGIFY_PAIR(GL_INT));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_2_10_10_10_REV));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_24_8));
- map.get().emplace(STRINGIFY_PAIR(GL_FLOAT_32_UNSIGNED_INT_24_8_REV));
-
-#if PLATFORM(IOS)
- map.get().emplace(STRINGIFY_PAIR(GL_RED_INTEGER));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB_INTEGER));
- map.get().emplace(STRINGIFY_PAIR(GL_RG8_SNORM));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB565));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB8_SNORM));
- map.get().emplace(STRINGIFY_PAIR(GL_R11F_G11F_B10F));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB9_E5));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB16F));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB32F));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB8UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB8I));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB16UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB16I));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB32UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB32I));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA8_SNORM));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA16F));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA32F));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA8UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA8I));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB10_A2UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA16UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA16I));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA32I));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA32UI));
- map.get().emplace(STRINGIFY_PAIR(GL_RGB5_A1));
- map.get().emplace(STRINGIFY_PAIR(GL_RG));
- map.get().emplace(STRINGIFY_PAIR(GL_RGBA_INTEGER));
- map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_10F_11F_11F_REV));
- map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_5_9_9_9_REV));
-#endif
- }
- return map.get();
-}
-
-#endif // !LOG_DISABLED
-
bool MediaPlayerPrivateAVFoundationObjC::copyVideoTextureToPlatformTexture(GraphicsContext3D* context, Platform3DObject outputTexture, GC3Denum outputTarget, GC3Dint level, GC3Denum internalFormat, GC3Denum format, GC3Denum type, bool premultiplyAlpha, bool flipY)
{
if (flipY || premultiplyAlpha)
@@ -2511,95 +2325,21 @@
if (!m_lastOpenGLImage)
return false;
- if (!m_openGLTextureCache) {
-#if PLATFORM(IOS)
- CVOpenGLESTextureCacheRef cache = nullptr;
- CVReturn error = CVOpenGLESTextureCacheCreate(kCFAllocatorDefault, nullptr, context->platformGraphicsContext3D(), nullptr, &cache);
-#else
- CVOpenGLTextureCacheRef cache = nullptr;
- CVReturn error = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, nullptr, context->platformGraphicsContext3D(), CGLGetPixelFormat(context->platformGraphicsContext3D()), nullptr, &cache);
-#endif
- if (error != kCVReturnSuccess)
- return false;
- m_openGLTextureCache = adoptCF(cache);
- }
-
size_t width = CVPixelBufferGetWidth(m_lastOpenGLImage.get());
size_t height = CVPixelBufferGetHeight(m_lastOpenGLImage.get());
-#if PLATFORM(IOS)
- CVOpenGLESTextureRef bareVideoTexture = nullptr;
- if (kCVReturnSuccess != CVOpenGLESTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_openGLTextureCache.get(), m_lastOpenGLImage.get(), nullptr, outputTarget, internalFormat, width, height, format, type, level, &bareVideoTexture))
- return false;
- RetainPtr<CVOpenGLESTextureRef> videoTexture = adoptCF(bareVideoTexture);
- Platform3DObject videoTextureName = CVOpenGLESTextureGetName(videoTexture.get());
- GC3Denum videoTextureTarget = CVOpenGLESTextureGetTarget(videoTexture.get());
-#else
- CVOpenGLTextureRef bareVideoTexture = nullptr;
- if (kCVReturnSuccess != CVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_openGLTextureCache.get(), m_lastOpenGLImage.get(), nullptr, &bareVideoTexture))
- return false;
- RetainPtr<CVOpenGLTextureRef> videoTexture = adoptCF(bareVideoTexture);
- Platform3DObject videoTextureName = CVOpenGLTextureGetName(videoTexture.get());
- GC3Denum videoTextureTarget = CVOpenGLTextureGetTarget(videoTexture.get());
-#endif
+ if (!m_textureCache) {
+ m_textureCache = TextureCacheCV::create(*context);
+ if (!m_textureCache)
+ return false;
+ }
- auto weakThis = createWeakPtr();
- dispatch_async(dispatch_get_main_queue(), [weakThis] {
- if (!weakThis)
- return;
+ RetainPtr<CVOpenGLTextureRef> videoTexture = m_textureCache->textureFromImage(m_lastOpenGLImage.get(), outputTarget, level, internalFormat, format, type);
- if (auto cache = weakThis->m_openGLTextureCache.get())
-#if PLATFORM(IOS)
- CVOpenGLESTextureCacheFlush(cache, 0);
-#else
- CVOpenGLTextureCacheFlush(cache, 0);
-#endif
- });
+ if (!m_videoTextureCopier)
+ m_videoTextureCopier = std::make_unique<VideoTextureCopierCV>(*context);
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::copyVideoTextureToPlatformTexture(%p) - internalFormat: %s, format: %s, type: %s", this, enumToStringMap()[internalFormat], enumToStringMap()[format], enumToStringMap()[type]);
-
- // Save the origial bound texture & framebuffer names so we can re-bind them after copying the video texture.
- GC3Dint boundTexture = 0;
- GC3Dint boundReadFramebuffer = 0;
- context->getIntegerv(GraphicsContext3D::TEXTURE_BINDING_2D, &boundTexture);
- context->getIntegerv(GraphicsContext3D::READ_FRAMEBUFFER_BINDING, &boundReadFramebuffer);
-
- context->bindTexture(videoTextureTarget, videoTextureName);
- context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
- context->texParameterf(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
- context->texParameterf(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
-
- // Create a framebuffer object to represent the video texture's memory.
- Platform3DObject readFramebuffer = context->createFramebuffer();
-
- // Make that framebuffer the read source from which drawing commands will read voxels.
- context->bindFramebuffer(GraphicsContext3D::READ_FRAMEBUFFER, readFramebuffer);
-
- // Allocate uninitialized memory for the output texture.
- context->bindTexture(outputTarget, outputTexture);
- context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
- context->texParameterf(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
- context->texParameterf(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
- context->texImage2DDirect(outputTarget, level, internalFormat, width, height, 0, format, type, nullptr);
-
- // Attach the video texture to the framebuffer.
- context->framebufferTexture2D(GraphicsContext3D::READ_FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, videoTextureTarget, videoTextureName, level);
-
- GC3Denum status = context->checkFramebufferStatus(GraphicsContext3D::READ_FRAMEBUFFER);
- if (status != GraphicsContext3D::FRAMEBUFFER_COMPLETE)
- return false;
-
- // Copy texture from the read framebuffer (and thus the video texture) to the output texture.
- context->copyTexImage2D(outputTarget, level, internalFormat, 0, 0, width, height, 0);
-
- // Restore the previous texture and framebuffer bindings.
- context->bindTexture(outputTarget, boundTexture);
- context->bindFramebuffer(GraphicsContext3D::READ_FRAMEBUFFER, boundReadFramebuffer);
-
- // Clean up after ourselves.
- context->deleteFramebuffer(readFramebuffer);
-
- return !context->getError();
+ return m_videoTextureCopier->copyVideoTextureToPlatformTexture(videoTexture.get(), width, height, outputTexture, outputTarget, level, internalFormat, format, type, premultiplyAlpha, flipY);
}
PassNativeImagePtr MediaPlayerPrivateAVFoundationObjC::nativeImageForCurrentTime()
Added: trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp (0 => 197375)
--- trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp 2016-03-01 00:44:53 UTC (rev 197375)
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "PixelBufferConformerCV.h"
+
+#include "GraphicsContextCG.h"
+#include "SoftLinking.h"
+
+#include "CoreVideoSoftLink.h"
+
+#if USE(VIDEOTOOLBOX)
+SOFT_LINK_FRAMEWORK_OPTIONAL(VideoToolbox)
+SOFT_LINK(VideoToolbox, VTPixelBufferConformerCreateWithAttributes, OSStatus, (CFAllocatorRef allocator, CFDictionaryRef attributes, VTPixelBufferConformerRef* conformerOut), (allocator, attributes, conformerOut));
+SOFT_LINK(VideoToolbox, VTPixelBufferConformerIsConformantPixelBuffer, Boolean, (VTPixelBufferConformerRef conformer, CVPixelBufferRef pixBuf), (conformer, pixBuf))
+SOFT_LINK(VideoToolbox, VTPixelBufferConformerCopyConformedPixelBuffer, OSStatus, (VTPixelBufferConformerRef conformer, CVPixelBufferRef sourceBuffer, Boolean ensureModifiable, CVPixelBufferRef* conformedBufferOut), (conformer, sourceBuffer, ensureModifiable, conformedBufferOut))
+#endif
+
+namespace WebCore {
+
+PixelBufferConformerCV::PixelBufferConformerCV(CFDictionaryRef attributes)
+{
+#if USE(VIDEOTOOLBOX)
+ VTPixelBufferConformerRef conformer = nullptr;
+ VTPixelBufferConformerCreateWithAttributes(kCFAllocatorDefault, attributes, &conformer);
+ ASSERT(conformer);
+ m_pixelConformer = adoptCF(conformer);
+#else
+ UNUSED_PARAM(attributes);
+ ASSERT(!attributes);
+#endif
+}
+
+static const void* CVPixelBufferGetBytePointerCallback(void* info)
+{
+ CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
+ CVPixelBufferLockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
+ return CVPixelBufferGetBaseAddress(pixelBuffer);
+}
+
+static void CVPixelBufferReleaseBytePointerCallback(void* info, const void*)
+{
+ CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
+ CVPixelBufferUnlockBaseAddress(pixelBuffer, kCVPixelBufferLock_ReadOnly);
+}
+
+static void CVPixelBufferReleaseInfoCallback(void* info)
+{
+ CVPixelBufferRef pixelBuffer = static_cast<CVPixelBufferRef>(info);
+ CFRelease(pixelBuffer);
+}
+
+RetainPtr<CGImageRef> PixelBufferConformerCV::createImageFromPixelBuffer(CVPixelBufferRef rawBuffer)
+{
+ RetainPtr<CVPixelBufferRef> buffer { rawBuffer };
+ size_t width = CVPixelBufferGetWidth(buffer.get());
+ size_t height = CVPixelBufferGetHeight(buffer.get());
+
+#if USE(VIDEOTOOLBOX)
+ if (!VTPixelBufferConformerIsConformantPixelBuffer(m_pixelConformer.get(), buffer.get())) {
+ CVPixelBufferRef outputBuffer = nullptr;
+ OSStatus status = VTPixelBufferConformerCopyConformedPixelBuffer(m_pixelConformer.get(), buffer.get(), false, &outputBuffer);
+ if (status != noErr || !outputBuffer)
+ return nullptr;
+ buffer = adoptCF(outputBuffer);
+ }
+#endif
+
+ CGBitmapInfo bitmapInfo = kCGBitmapByteOrder32Little | kCGImageAlphaFirst;
+ size_t bytesPerRow = CVPixelBufferGetBytesPerRow(buffer.get());
+ size_t byteLength = CVPixelBufferGetDataSize(buffer.get());
+
+ CFRetain(buffer.get()); // Balanced by CVPixelBufferReleaseInfoCallback in providerCallbacks.
+ CGDataProviderDirectCallbacks providerCallbacks = { 0, CVPixelBufferGetBytePointerCallback, CVPixelBufferReleaseBytePointerCallback, 0, CVPixelBufferReleaseInfoCallback };
+ RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateDirect(buffer.get(), byteLength, &providerCallbacks));
+
+ return adoptCF(CGImageCreate(width, height, 8, 32, bytesPerRow, sRGBColorSpaceRef(), bitmapInfo, provider.get(), nullptr, false, kCGRenderingIntentDefault));
+}
+
+}
Added: trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.h (0 => 197375)
--- trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.h 2016-03-01 00:44:53 UTC (rev 197375)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PixelBufferConformerCV_h
+#define PixelBufferConformerCV_h
+
+#include <wtf/RetainPtr.h>
+
+typedef struct OpaqueVTPixelBufferConformer* VTPixelBufferConformerRef;
+typedef struct CGImage* CGImageRef;
+typedef struct __CVBuffer *CVPixelBufferRef;
+
+namespace WebCore {
+
+class PixelBufferConformerCV {
+public:
+ PixelBufferConformerCV(CFDictionaryRef attributes);
+ RetainPtr<CGImageRef> createImageFromPixelBuffer(CVPixelBufferRef);
+
+private:
+#if USE(VIDEOTOOLBOX)
+ RetainPtr<VTPixelBufferConformerRef> m_pixelConformer;
+#endif
+};
+
+}
+
+#endif // PixelBufferConformerCV_h
Added: trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.h (0 => 197375)
--- trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.h 2016-03-01 00:44:53 UTC (rev 197375)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef TextureCacheCV_h
+#define TextureCacheCV_h
+
+#include "GraphicsTypes3D.h"
+#include <wtf/Ref.h>
+#include <wtf/RetainPtr.h>
+#include <wtf/WeakPtr.h>
+
+typedef struct __CVBuffer* CVImageBufferRef;
+typedef CVImageBufferRef CVOpenGLTextureRef;
+typedef CVImageBufferRef CVOpenGLESTextureRef;
+typedef struct __CVOpenGLTextureCache *CVOpenGLTextureCacheRef;
+typedef struct __CVOpenGLESTextureCache *CVOpenGLESTextureCacheRef;
+
+namespace WebCore {
+
+class GraphicsContext3D;
+
+class TextureCacheCV {
+public:
+ static std::unique_ptr<TextureCacheCV> create(GraphicsContext3D&);
+
+#if PLATFORM(IOS)
+ typedef CVOpenGLESTextureCacheRef TextureCacheType;
+ typedef CVOpenGLESTextureRef TextureType;
+#else
+ typedef CVOpenGLTextureCacheRef TextureCacheType;
+ typedef CVOpenGLTextureRef TextureType;
+#endif
+
+ TextureCacheCV(GraphicsContext3D&, RetainPtr<TextureCacheType>&&);
+
+ RetainPtr<TextureType> textureFromImage(CVImageBufferRef, GC3Denum outputTarget, GC3Dint level, GC3Denum internalFormat, GC3Denum format, GC3Denum type);
+ GraphicsContext3D& context() { return m_context.get(); }
+
+private:
+ Ref<GraphicsContext3D> m_context;
+ RetainPtr<TextureCacheType> m_cache;
+ WeakPtrFactory<TextureCacheCV> m_weakPtrFactory;
+};
+
+}
+
+#endif // TextureCacheCV_h
Added: trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm (0 => 197375)
--- trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm (rev 0)
+++ trunk/Source/WebCore/platform/graphics/cv/TextureCacheCV.mm 2016-03-01 00:44:53 UTC (rev 197375)
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "TextureCacheCV.h"
+
+#include "GraphicsContext3D.h"
+
+#include "CoreVideoSoftLink.h"
+
+namespace WebCore {
+
+std::unique_ptr<TextureCacheCV> TextureCacheCV::create(GraphicsContext3D& context)
+{
+ TextureCacheType cache = nullptr;
+#if PLATFORM(IOS)
+ CVReturn error = CVOpenGLESTextureCacheCreate(kCFAllocatorDefault, nullptr, context.platformGraphicsContext3D(), nullptr, &cache);
+#else
+ CVReturn error = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, nullptr, context.platformGraphicsContext3D(), CGLGetPixelFormat(context.platformGraphicsContext3D()), nullptr, &cache);
+#endif
+ if (error != kCVReturnSuccess)
+ return nullptr;
+
+ RetainPtr<TextureCacheType> strongCache = adoptCF(cache);
+ return std::make_unique<TextureCacheCV>(context, WTFMove(strongCache));
+}
+
+TextureCacheCV::TextureCacheCV(GraphicsContext3D& context, RetainPtr<TextureCacheType>&& cache)
+ : m_context(context)
+ , m_cache(cache)
+ , m_weakPtrFactory(this)
+{
+}
+
+RetainPtr<TextureCacheCV::TextureType> TextureCacheCV::textureFromImage(CVImageBufferRef image, GC3Denum outputTarget, GC3Dint level, GC3Denum internalFormat, GC3Denum format, GC3Denum type)
+{
+ TextureType bareVideoTexture = nullptr;
+#if PLATFORM(IOS)
+ size_t width = CVPixelBufferGetWidth(image);
+ size_t height = CVPixelBufferGetHeight(image);
+ if (kCVReturnSuccess != CVOpenGLESTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_cache.get(), image, nullptr, outputTarget, internalFormat, width, height, format, type, level, &bareVideoTexture))
+ return nullptr;
+#else
+ UNUSED_PARAM(outputTarget);
+ UNUSED_PARAM(level);
+ UNUSED_PARAM(internalFormat);
+ UNUSED_PARAM(format);
+ UNUSED_PARAM(type);
+ if (kCVReturnSuccess != CVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault, m_cache.get(), image, nullptr, &bareVideoTexture))
+ return nullptr;
+#endif
+ RetainPtr<TextureType> videoTexture = adoptCF(bareVideoTexture);
+
+ auto weakThis = m_weakPtrFactory.createWeakPtr();
+ dispatch_async(dispatch_get_main_queue(), [weakThis] {
+ if (auto cache = weakThis->m_cache.get())
+#if PLATFORM(IOS)
+ CVOpenGLESTextureCacheFlush(cache, 0);
+#else
+ CVOpenGLTextureCacheFlush(cache, 0);
+#endif
+ });
+
+ return videoTexture;
+}
+
+}
Added: trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (0 => 197375)
--- trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2016-03-01 00:44:53 UTC (rev 197375)
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "VideoTextureCopierCV.h"
+
+#include "Logging.h"
+#include <wtf/NeverDestroyed.h>
+
+#if PLATFORM(IOS)
+#include <OpenGLES/ES3/glext.h>
+#endif
+
+#include "CoreVideoSoftLink.h"
+
+namespace WebCore {
+
+VideoTextureCopierCV::VideoTextureCopierCV(GraphicsContext3D& context)
+ : m_context(context)
+ , m_readFramebuffer(context.createFramebuffer())
+{
+}
+
+VideoTextureCopierCV::~VideoTextureCopierCV()
+{
+ m_context->deleteFramebuffer(m_readFramebuffer);
+}
+
+#if !LOG_DISABLED
+
+#define STRINGIFY_PAIR(e) e, #e
+static std::map<uint32_t, const char*>& enumToStringMap()
+{
+ static NeverDestroyed<std::map<uint32_t, const char*>> map;
+ if (map.get().empty()) {
+ std::map<uint32_t, const char*> stringMap;
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA));
+ map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE_ALPHA));
+ map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE));
+ map.get().emplace(STRINGIFY_PAIR(GL_ALPHA));
+ map.get().emplace(STRINGIFY_PAIR(GL_R8));
+ map.get().emplace(STRINGIFY_PAIR(GL_R16F));
+ map.get().emplace(STRINGIFY_PAIR(GL_R32F));
+ map.get().emplace(STRINGIFY_PAIR(GL_R8UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_R8I));
+ map.get().emplace(STRINGIFY_PAIR(GL_R16UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_R16I));
+ map.get().emplace(STRINGIFY_PAIR(GL_R32UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_R32I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG8));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG16F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG32F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG8UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG8I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG16UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG16I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG32UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG32I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB8));
+ map.get().emplace(STRINGIFY_PAIR(GL_SRGB8));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA8));
+ map.get().emplace(STRINGIFY_PAIR(GL_SRGB8_ALPHA8));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA4));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB10_A2));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT16));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT24));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT32F));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH24_STENCIL8));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH32F_STENCIL8));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA));
+ map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE_ALPHA));
+ map.get().emplace(STRINGIFY_PAIR(GL_LUMINANCE));
+ map.get().emplace(STRINGIFY_PAIR(GL_ALPHA));
+ map.get().emplace(STRINGIFY_PAIR(GL_RED));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG_INTEGER));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_STENCIL));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_BYTE));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_5_6_5));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_4_4_4_4));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT_5_5_5_1));
+ map.get().emplace(STRINGIFY_PAIR(GL_BYTE));
+ map.get().emplace(STRINGIFY_PAIR(GL_HALF_FLOAT));
+ map.get().emplace(STRINGIFY_PAIR(GL_FLOAT));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_SHORT));
+ map.get().emplace(STRINGIFY_PAIR(GL_SHORT));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT));
+ map.get().emplace(STRINGIFY_PAIR(GL_INT));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_2_10_10_10_REV));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_24_8));
+ map.get().emplace(STRINGIFY_PAIR(GL_FLOAT_32_UNSIGNED_INT_24_8_REV));
+
+#if PLATFORM(IOS)
+ map.get().emplace(STRINGIFY_PAIR(GL_RED_INTEGER));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB_INTEGER));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG8_SNORM));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB565));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB8_SNORM));
+ map.get().emplace(STRINGIFY_PAIR(GL_R11F_G11F_B10F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB9_E5));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB16F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB32F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB8UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB8I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB16UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB16I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB32UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB32I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA8_SNORM));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA16F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA32F));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA8UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA8I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB10_A2UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA16UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA16I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA32I));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA32UI));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGB5_A1));
+ map.get().emplace(STRINGIFY_PAIR(GL_RG));
+ map.get().emplace(STRINGIFY_PAIR(GL_RGBA_INTEGER));
+ map.get().emplace(STRINGIFY_PAIR(GL_DEPTH_COMPONENT));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_10F_11F_11F_REV));
+ map.get().emplace(STRINGIFY_PAIR(GL_UNSIGNED_INT_5_9_9_9_REV));
+#endif
+ }
+ return map.get();
+}
+
+#endif
+
+bool VideoTextureCopierCV::copyVideoTextureToPlatformTexture(TextureType inputTexture, size_t width, size_t height, Platform3DObject outputTexture, GC3Denum outputTarget, GC3Dint level, GC3Denum internalFormat, GC3Denum format, GC3Denum type, bool premultiplyAlpha, bool flipY)
+{
+ if (flipY || premultiplyAlpha)
+ return false;
+
+ if (!inputTexture)
+ return false;
+
+#if PLATFORM(IOS)
+ Platform3DObject videoTextureName = CVOpenGLESTextureGetName(inputTexture);
+ GC3Denum videoTextureTarget = CVOpenGLESTextureGetTarget(inputTexture);
+#else
+ Platform3DObject videoTextureName = CVOpenGLTextureGetName(inputTexture);
+ GC3Denum videoTextureTarget = CVOpenGLTextureGetTarget(inputTexture);
+#endif
+
+ LOG(Media, "VideoTextureCopierCV::copyVideoTextureToPlatformTexture(%p) - internalFormat: %s, format: %s, type: %s", this, enumToStringMap()[internalFormat], enumToStringMap()[format], enumToStringMap()[type]);
+
+ // Save the origial bound texture & framebuffer names so we can re-bind them after copying the video texture.
+ GC3Dint boundTexture = 0;
+ GC3Dint boundReadFramebuffer = 0;
+ m_context->getIntegerv(GraphicsContext3D::TEXTURE_BINDING_2D, &boundTexture);
+ m_context->getIntegerv(GraphicsContext3D::READ_FRAMEBUFFER_BINDING, &boundReadFramebuffer);
+
+ m_context->bindTexture(videoTextureTarget, videoTextureName);
+ m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
+ m_context->texParameterf(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
+ m_context->texParameterf(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
+
+ // Make that framebuffer the read source from which drawing commands will read voxels.
+ m_context->bindFramebuffer(GraphicsContext3D::READ_FRAMEBUFFER, m_readFramebuffer);
+
+ // Allocate uninitialized memory for the output texture.
+ m_context->bindTexture(outputTarget, outputTexture);
+ m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
+ m_context->texParameterf(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
+ m_context->texParameterf(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
+ m_context->texImage2DDirect(outputTarget, level, internalFormat, width, height, 0, format, type, nullptr);
+
+ // Attach the video texture to the framebuffer.
+ m_context->framebufferTexture2D(GraphicsContext3D::READ_FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, videoTextureTarget, videoTextureName, level);
+
+ GC3Denum status = m_context->checkFramebufferStatus(GraphicsContext3D::READ_FRAMEBUFFER);
+ if (status != GraphicsContext3D::FRAMEBUFFER_COMPLETE)
+ return false;
+
+ // Copy texture from the read framebuffer (and thus the video texture) to the output texture.
+ m_context->copyTexImage2D(outputTarget, level, internalFormat, 0, 0, width, height, 0);
+
+ // Restore the previous texture and framebuffer bindings.
+ m_context->bindTexture(outputTarget, boundTexture);
+ m_context->bindFramebuffer(GraphicsContext3D::READ_FRAMEBUFFER, boundReadFramebuffer);
+
+ return !m_context->getError();
+}
+
+
+}
Added: trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.h (0 => 197375)
--- trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.h 2016-03-01 00:44:53 UTC (rev 197375)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef VideoTextureCopierCV_h
+#define VideoTextureCopierCV_h
+
+#import "GraphicsContext3D.h"
+
+typedef struct __CVBuffer* CVImageBufferRef;
+typedef CVImageBufferRef CVOpenGLTextureRef;
+typedef CVImageBufferRef CVOpenGLESTextureRef;
+
+namespace WebCore {
+
+class VideoTextureCopierCV {
+public:
+ VideoTextureCopierCV(GraphicsContext3D&);
+ ~VideoTextureCopierCV();
+
+#if PLATFORM(IOS)
+ typedef CVOpenGLESTextureRef TextureType;
+#else
+ typedef CVOpenGLTextureRef TextureType;
+#endif
+
+ bool copyVideoTextureToPlatformTexture(TextureType, size_t width, size_t height, Platform3DObject outputTexture, GC3Denum outputTarget, GC3Dint level, GC3Denum internalFormat, GC3Denum format, GC3Denum type, bool premultiplyAlpha, bool flipY);
+
+ GraphicsContext3D& context() { return m_context.get(); }
+
+private:
+ Ref<GraphicsContext3D> m_context;
+ Platform3DObject m_readFramebuffer;
+};
+
+}
+
+#endif // VideoTextureCopierCV_h
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (197374 => 197375)
--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-03-01 00:39:20 UTC (rev 197374)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-03-01 00:44:53 UTC (rev 197375)
@@ -43,6 +43,7 @@
#import <objc/runtime.h>
#import "CoreMediaSoftLink.h"
+#import "CoreVideoSoftLink.h"
typedef AVCaptureConnection AVCaptureConnectionType;
typedef AVCaptureDevice AVCaptureDeviceType;
@@ -52,7 +53,6 @@
typedef AVCaptureVideoPreviewLayer AVCaptureVideoPreviewLayerType;
SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
-SOFT_LINK_FRAMEWORK_OPTIONAL(CoreVideo)
SOFT_LINK_CLASS(AVFoundation, AVCaptureConnection)
SOFT_LINK_CLASS(AVFoundation, AVCaptureDevice)
@@ -81,17 +81,6 @@
#define AVCaptureSessionPreset352x288 getAVCaptureSessionPreset352x288()
#define AVCaptureSessionPresetLow getAVCaptureSessionPresetLow()
-SOFT_LINK(CoreVideo, CVPixelBufferGetWidth, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetHeight, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetBaseAddress, void*, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetBytesPerRow, size_t, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferGetPixelFormatType, OSType, (CVPixelBufferRef pixelBuffer), (pixelBuffer))
-SOFT_LINK(CoreVideo, CVPixelBufferLockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
-SOFT_LINK(CoreVideo, CVPixelBufferUnlockBaseAddress, CVReturn, (CVPixelBufferRef pixelBuffer, CVOptionFlags lockFlags), (pixelBuffer, lockFlags))
-
-SOFT_LINK_POINTER(CoreVideo, kCVPixelBufferPixelFormatTypeKey, NSString *)
-#define kCVPixelBufferPixelFormatTypeKey getkCVPixelBufferPixelFormatTypeKey()
-
namespace WebCore {
RefPtr<AVMediaCaptureSource> AVVideoCaptureSource::create(AVCaptureDeviceType* device, const AtomicString& id, PassRefPtr<MediaConstraints> constraint)