Changeset 222326 in webkit


Ignore:
Timestamp:
Sep 21, 2017 10:33:52 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

[PAL] Move MediaTimeAVFoundation into PAL
​https://bugs.webkit.org/show_bug.cgi?id=177222

Patch by Yoshiaki Jitsukawa <​Yoshiaki.Jitsukawa@sony.com> on 2017-09-21
Reviewed by Myles C. Maxfield.

Source/WebCore:

No new tests. No change in behavior..

  • Configurations/WebCore.unexp:
  • PlatformAppleWin.cmake:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/audio/mac/AudioSampleDataSource.mm:

(WebCore::AudioSampleDataSource::pushSamples):

  • platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:

(WebCore::AudioSourceProviderAVFObjC::process):

  • platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:

(WebCore::InbandTextTrackPrivateAVF::readNativeSampleBuffer):

  • platform/graphics/avfoundation/MediaSampleAVFObjC.h:
  • platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp:
  • platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:

(WebCore::MediaPlayerPrivateAVFoundationCF::platformDuration const):
(WebCore::MediaPlayerPrivateAVFoundationCF::currentMediaTime const):
(WebCore::MediaPlayerPrivateAVFoundationCF::platformBufferedTimeRanges const):
(WebCore::MediaPlayerPrivateAVFoundationCF::platformMinTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundationCF::platformMaxTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundationCF::platformMaxTimeLoaded const):
(WebCore::AVFWrapper::seekToTime):
(WebCore::AVFWrapper::legibleOutputCallback):
(WebCore::AVFWrapper::createImageForTimeInRect):

  • platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:

(WebCore::ImageDecoderAVFObjC::readSampleMetadata):
(WebCore::ImageDecoderAVFObjC::storeSampleBuffer):
(WebCore::ImageDecoderAVFObjC::createFrameImageAtIndex):

  • platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::platformDuration const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::currentMediaTime const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformBufferedTimeRanges const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformMinTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeSeekable const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeLoaded const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
(-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
(-[WebCoreAVFMovieObserver legibleOutput:didOutputAttributedStrings:nativeSampleBuffers:forItemTime:]):

  • platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::MediaPlayerPrivateMediaSourceAVFObjC):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentMediaTime const):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekInternal):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::durationChanged):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::sizeWillChangeAtTime):

  • platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::calculateTimelineOffset):

  • platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:

(WebCore::MediaSampleAVFObjC::presentationTime const):
(WebCore::MediaSampleAVFObjC::outputPresentationTime const):
(WebCore::MediaSampleAVFObjC::decodeTime const):
(WebCore::MediaSampleAVFObjC::duration const):
(WebCore::MediaSampleAVFObjC::outputDuration const):
(WebCore::MediaSampleAVFObjC::offsetTimestampsBy):
(WebCore::MediaSampleAVFObjC::setTimestamps):
(WebCore::MediaSampleAVFObjC::divide):

  • platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:

(WebCore::SourceBufferPrivateAVFObjC::didParseStreamDataAsAsset):

  • platform/graphics/cocoa/WebCoreDecompressionSession.mm:

(WebCore::WebCoreDecompressionSession::handleDecompressionOutput):
(WebCore::WebCoreDecompressionSession::automaticDequeue):
(WebCore::WebCoreDecompressionSession::enqueueDecodedSample):
(WebCore::WebCoreDecompressionSession::imageForTime):

  • platform/mac/PlatformClockCM.mm:

(PlatformClockCM::setCurrentMediaTime):
(PlatformClockCM::currentMediaTime const):

  • platform/mac/PlaybackSessionInterfaceMac.mm:

(WebCore::timeRangesToArray):

  • platform/mac/VideoFullscreenInterfaceMac.mm:
  • platform/mediastream/mac/CoreAudioCaptureSource.cpp:
  • platform/mediastream/mac/MockRealtimeAudioSourceMac.mm:

(WebCore::MockRealtimeAudioSourceMac::emitSampleBuffers):

  • platform/mediastream/mac/RealtimeIncomingAudioSource.cpp:

(WebCore::RealtimeIncomingAudioSource::OnData):

  • platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm:

Source/WebCore/PAL:

  • config.h:

Include PALHeaderDetection.h.
Define AVFOUNDATION-releavant definitions.

  • pal/PlatformWin.cmake:

Add PAL dereived sources directory to include paths.

  • PAL.xcodeproj/project.pbxproj:
  • pal/CMakeLists.txt:
  • pal/PlatformAppleWin.cmake:
  • pal/avfoundation/MediaTimeAVFoundation.cpp: Renamed from Source/WebCore/platform/graphics/avfoundation/MediaTimeAVFoundation.cpp.
  • pal/avfoundation/MediaTimeAVFoundation.h: Renamed from Source/WebCore/platform/graphics/avfoundation/MediaTimeAVFoundation.h.
  • pal/cf/CoreMediaSoftLink.cpp: Added.
  • pal/cf/CoreMediaSoftLink.h: Added.
Location:
trunk/Source/WebCore
Files:
4 added
30 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r222325 r222326  
     12017-09-21  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
     2
     3        [PAL] Move MediaTimeAVFoundation into PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=177222
     5
     6        Reviewed by Myles C. Maxfield.
     7
     8        No new tests. No change in behavior..
     9
     10        * Configurations/WebCore.unexp:
     11        * PlatformAppleWin.cmake:
     12        * WebCore.xcodeproj/project.pbxproj:
     13        * platform/audio/mac/AudioSampleDataSource.mm:
     14        (WebCore::AudioSampleDataSource::pushSamples):
     15        * platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
     16        (WebCore::AudioSourceProviderAVFObjC::process):
     17        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
     18        (WebCore::InbandTextTrackPrivateAVF::readNativeSampleBuffer):
     19        * platform/graphics/avfoundation/MediaSampleAVFObjC.h:
     20        * platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp:
     21        * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
     22        (WebCore::MediaPlayerPrivateAVFoundationCF::platformDuration const):
     23        (WebCore::MediaPlayerPrivateAVFoundationCF::currentMediaTime const):
     24        (WebCore::MediaPlayerPrivateAVFoundationCF::platformBufferedTimeRanges const):
     25        (WebCore::MediaPlayerPrivateAVFoundationCF::platformMinTimeSeekable const):
     26        (WebCore::MediaPlayerPrivateAVFoundationCF::platformMaxTimeSeekable const):
     27        (WebCore::MediaPlayerPrivateAVFoundationCF::platformMaxTimeLoaded const):
     28        (WebCore::AVFWrapper::seekToTime):
     29        (WebCore::AVFWrapper::legibleOutputCallback):
     30        (WebCore::AVFWrapper::createImageForTimeInRect):
     31        * platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:
     32        (WebCore::ImageDecoderAVFObjC::readSampleMetadata):
     33        (WebCore::ImageDecoderAVFObjC::storeSampleBuffer):
     34        (WebCore::ImageDecoderAVFObjC::createFrameImageAtIndex):
     35        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     36        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformDuration const):
     37        (WebCore::MediaPlayerPrivateAVFoundationObjC::currentMediaTime const):
     38        (WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime):
     39        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformBufferedTimeRanges const):
     40        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformMinTimeSeekable const):
     41        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeSeekable const):
     42        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeLoaded const):
     43        (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
     44        (-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
     45        (-[WebCoreAVFMovieObserver legibleOutput:didOutputAttributedStrings:nativeSampleBuffers:forItemTime:]):
     46        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
     47        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::MediaPlayerPrivateMediaSourceAVFObjC):
     48        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::currentMediaTime const):
     49        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekInternal):
     50        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::durationChanged):
     51        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::sizeWillChangeAtTime):
     52        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
     53        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::calculateTimelineOffset):
     54        * platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:
     55        (WebCore::MediaSampleAVFObjC::presentationTime const):
     56        (WebCore::MediaSampleAVFObjC::outputPresentationTime const):
     57        (WebCore::MediaSampleAVFObjC::decodeTime const):
     58        (WebCore::MediaSampleAVFObjC::duration const):
     59        (WebCore::MediaSampleAVFObjC::outputDuration const):
     60        (WebCore::MediaSampleAVFObjC::offsetTimestampsBy):
     61        (WebCore::MediaSampleAVFObjC::setTimestamps):
     62        (WebCore::MediaSampleAVFObjC::divide):
     63        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
     64        (WebCore::SourceBufferPrivateAVFObjC::didParseStreamDataAsAsset):
     65        * platform/graphics/cocoa/WebCoreDecompressionSession.mm:
     66        (WebCore::WebCoreDecompressionSession::handleDecompressionOutput):
     67        (WebCore::WebCoreDecompressionSession::automaticDequeue):
     68        (WebCore::WebCoreDecompressionSession::enqueueDecodedSample):
     69        (WebCore::WebCoreDecompressionSession::imageForTime):
     70        * platform/mac/PlatformClockCM.mm:
     71        (PlatformClockCM::setCurrentMediaTime):
     72        (PlatformClockCM::currentMediaTime const):
     73        * platform/mac/PlaybackSessionInterfaceMac.mm:
     74        (WebCore::timeRangesToArray):
     75        * platform/mac/VideoFullscreenInterfaceMac.mm:
     76        * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
     77        * platform/mediastream/mac/MockRealtimeAudioSourceMac.mm:
     78        (WebCore::MockRealtimeAudioSourceMac::emitSampleBuffers):
     79        * platform/mediastream/mac/RealtimeIncomingAudioSource.cpp:
     80        (WebCore::RealtimeIncomingAudioSource::OnData):
     81        * platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm:
     82
    1832017-09-21  Alex Christensen  <achristensen@webkit.org>
    284

  • trunk/Source/WebCore/Configurations/WebCore.unexp

    r206245 r222326  
    6060# Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
    6161__ZTVN9Inspector22InspectorDebuggerAgent8ListenerE
     62
     63# Member functions of an exported C++ class in WTF
     64
     65# Source/WTF/wtf/MediaTime.h
     66__ZNK3WTF9MediaTime14hasBeenRoundedEv
     67__ZNK3WTF9MediaTime14hasDoubleValueEv
     68__ZNK3WTF9MediaTime18isNegativeInfiniteEv
     69__ZNK3WTF9MediaTime18isPositiveInfiniteEv
     70__ZNK3WTF9MediaTime7isValidEv
     71__ZNK3WTF9MediaTime9timeScaleEv
     72__ZNK3WTF9MediaTime9timeValueEv

  • trunk/Source/WebCore/PAL/ChangeLog

    r222259 r222326  
     12017-09-21  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
     2
     3        [PAL] Move MediaTimeAVFoundation into PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=177222
     5
     6        Reviewed by Myles C. Maxfield.
     7
     8        * config.h:
     9        Include PALHeaderDetection.h.
     10        Define AVFOUNDATION-releavant definitions.
     11
     12        * pal/PlatformWin.cmake:
     13        Add PAL dereived sources directory to include paths.
     14
     15        * PAL.xcodeproj/project.pbxproj:
     16        * pal/CMakeLists.txt:
     17        * pal/PlatformAppleWin.cmake:
     18        * pal/avfoundation/MediaTimeAVFoundation.cpp: Renamed from Source/WebCore/platform/graphics/avfoundation/MediaTimeAVFoundation.cpp.
     19        * pal/avfoundation/MediaTimeAVFoundation.h: Renamed from Source/WebCore/platform/graphics/avfoundation/MediaTimeAVFoundation.h.
     20        * pal/cf/CoreMediaSoftLink.cpp: Added.
     21        * pal/cf/CoreMediaSoftLink.h: Added.
     22
    1232017-09-20  Antti Koivisto  <antti@apple.com>
    224

  • trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj

    r222150 r222326  
    2424                0708AC331F4C874B001F788F /* Logger.h in Headers */ = {isa = PBXBuildFile; fileRef = 0708AC321F4C874A001F788F /* Logger.h */; };
    2525                07377ADC1F5777D90027F16D /* LoggerHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 07377ADB1F5777D70027F16D /* LoggerHelper.h */; };
     26                0C00CFD41F68CE4600AAC26D /* MediaTimeAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C00CFD21F68CE4600AAC26D /* MediaTimeAVFoundation.h */; };
    2627                0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */; };
    2728                0C2DA06D1F33CA8400DBC317 /* CFLocaleSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2DA0671F33CA8400DBC317 /* CFLocaleSPI.h */; };
    … …  
    9697                0C7785A01F45130F00F4EBB6 /* QuickLookMacSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C7785871F45130F00F4EBB6 /* QuickLookMacSPI.h */; };
    9798                0C7785A11F45130F00F4EBB6 /* TUCallSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C7785881F45130F00F4EBB6 /* TUCallSPI.h */; };
     99                0CF99CA41F736375007EE793 /* MediaTimeAVFoundation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C00CFD11F68CE4600AAC26D /* MediaTimeAVFoundation.cpp */; };
     100                0CF99CA81F738437007EE793 /* CoreMediaSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0CF99CA61F738436007EE793 /* CoreMediaSoftLink.cpp */; };
     101                0CF99CA91F738437007EE793 /* CoreMediaSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CF99CA71F738437007EE793 /* CoreMediaSoftLink.h */; };
    98102                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0521E31C44100725F18 /* CryptoDigest.h */; };
    99103                1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C09D0551E31C46500725F18 /* CryptoDigestCommonCrypto.cpp */; };
    … …  
    146150                0708AC321F4C874A001F788F /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = "<group>"; };
    147151                07377ADB1F5777D70027F16D /* LoggerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoggerHelper.h; sourceTree = "<group>"; };
     152                0C00CFD11F68CE4600AAC26D /* MediaTimeAVFoundation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MediaTimeAVFoundation.cpp; path = avfoundation/MediaTimeAVFoundation.cpp; sourceTree = "<group>"; };
     153                0C00CFD21F68CE4600AAC26D /* MediaTimeAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaTimeAVFoundation.h; path = avfoundation/MediaTimeAVFoundation.h; sourceTree = "<group>"; };
    148154                0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExportMacros.h; sourceTree = "<group>"; };
    149155                0C2DA0671F33CA8400DBC317 /* CFLocaleSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFLocaleSPI.h; sourceTree = "<group>"; };
    … …  
    218224                0C7785871F45130F00F4EBB6 /* QuickLookMacSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookMacSPI.h; sourceTree = "<group>"; };
    219225                0C7785881F45130F00F4EBB6 /* TUCallSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUCallSPI.h; sourceTree = "<group>"; };
     226                0CF99CA61F738436007EE793 /* CoreMediaSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CoreMediaSoftLink.cpp; path = pal/cf/CoreMediaSoftLink.cpp; sourceTree = SOURCE_ROOT; };
     227                0CF99CA71F738437007EE793 /* CoreMediaSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreMediaSoftLink.h; path = pal/cf/CoreMediaSoftLink.h; sourceTree = SOURCE_ROOT; };
    220228                1C09D03D1E31C32800725F18 /* libPAL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPAL.a; sourceTree = BUILT_PRODUCTS_DIR; };
    221229                1C09D0521E31C44100725F18 /* CryptoDigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoDigest.h; sourceTree = "<group>"; };
    … …  
    273281
    274282/* Begin PBXGroup section */
     283                0C00CFCC1F68CE2300AAC26D /* avfoundation */ = {
     284                        isa = PBXGroup;
     285                        children = (
     286                                0C00CFD11F68CE4600AAC26D /* MediaTimeAVFoundation.cpp */,
     287                                0C00CFD21F68CE4600AAC26D /* MediaTimeAVFoundation.h */,
     288                        );
     289                        name = avfoundation;
     290                        sourceTree = "<group>";
     291                };
    275292                0C2DA0651F33CA3300DBC317 /* spi */ = {
    276293                        isa = PBXGroup;
    … …  
    401418                        sourceTree = "<group>";
    402419                };
     420                0CF99CA51F73841C007EE793 /* cf */ = {
     421                        isa = PBXGroup;
     422                        children = (
     423                                0CF99CA61F738436007EE793 /* CoreMediaSoftLink.cpp */,
     424                                0CF99CA71F738437007EE793 /* CoreMediaSoftLink.h */,
     425                        );
     426                        name = cf;
     427                        path = "New Group";
     428                        sourceTree = "<group>";
     429                };
    403430                1C09D0341E31C32800725F18 = {
    404431                        isa = PBXGroup;
    … …  
    422449                        isa = PBXGroup;
    423450                        children = (
     451                                0C00CFCC1F68CE2300AAC26D /* avfoundation */,
     452                                0CF99CA51F73841C007EE793 /* cf */,
    424453                                1C09D0511E31C41200725F18 /* crypto */,
    425454                                0C2DA0651F33CA3300DBC317 /* spi */,
    … …  
    540569                                0C2DA0711F33CA8400DBC317 /* CoreAudioSPI.h in Headers */,
    541570                                0C2DA11E1F3BE9E000DBC317 /* CoreGraphicsSPI.h in Headers */,
     571                                0CF99CA91F738437007EE793 /* CoreMediaSoftLink.h in Headers */,
    542572                                0C2DA0721F33CA8400DBC317 /* CoreMediaSPI.h in Headers */,
    543573                                0C2DA1401F3BEB4900DBC317 /* CoreTextSPI.h in Headers */,
    … …  
    568598                                0C5AF91D1F43A4C7002EAC02 /* MediaPlayerSPI.h in Headers */,
    569599                                0C77858C1F45130F00F4EBB6 /* MediaRemoteSPI.h in Headers */,
     600                                0C00CFD41F68CE4600AAC26D /* MediaTimeAVFoundation.h in Headers */,
    570601                                A1F55DCF1F5528EC00EDB75F /* MetadataSPI.h in Headers */,
    571602                                0C5AF91E1F43A4C7002EAC02 /* MobileGestaltSPI.h in Headers */,
    … …  
    714745                        buildActionMask = 2147483647;
    715746                        files = (
     747                                0CF99CA81F738437007EE793 /* CoreMediaSoftLink.cpp in Sources */,
    716748                                1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */,
    717749                                A1175B581F6B470500C4B9F0 /* DefaultSearchProvider.cpp in Sources */,
    718750                                A30D41221F0DD0EA00B71954 /* KillRing.cpp in Sources */,
    719751                                A30D41251F0DD12D00B71954 /* KillRingMac.mm in Sources */,
     752                                0CF99CA41F736375007EE793 /* MediaTimeAVFoundation.cpp in Sources */,
    720753                                A1175B4F1F6B337300C4B9F0 /* PopupMenu.mm in Sources */,
    721754                                A3C66CDC1F462D6A009E6EE9 /* SessionID.cpp in Sources */,

  • trunk/Source/WebCore/PAL/config.h

    r218843 r222326  
    2424#endif
    2525
     26#include <wtf/Platform.h>
     27
     28#if PLATFORM(WIN)
     29#include <PALHeaderDetection.h>
     30#endif
     31
    2632#include <pal/ExportMacros.h>
    2733
    … …  
    3945
    4046#include <wtf/DisallowCType.h>
     47
     48#if PLATFORM(WIN) && USE(CG) && HAVE(AVCF)
     49#define USE_AVFOUNDATION 1
     50
     51#if HAVE(AVCF_LEGIBLE_OUTPUT)
     52#define USE_AVFOUNDATION 1
     53#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
     54#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
     55#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
     56#endif
     57
     58#endif

  • trunk/Source/WebCore/PAL/pal/CMakeLists.txt

    r220887 r222326  
    1818
    1919set(PAL_LIBRARIES
    20     WTF
     20    PRIVATE WTF
    2121)
    2222

  • trunk/Source/WebCore/PAL/pal/PlatformAppleWin.cmake

    r220506 r222326  
    99    )
    1010endif ()
     11
     12list(APPEND PAL_SOURCES
     13    avfoundation/MediaTimeAVFoundation.cpp
     14
     15    cf/CoreMediaSoftLink.cpp
     16)
     17
     18list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
     19    "${PAL_DIR}/pal/cf"
     20)

  • trunk/Source/WebCore/PAL/pal/PlatformWin.cmake

    r222148 r222326  
    1010    "${CMAKE_BINARY_DIR}"
    1111    "${CMAKE_BINARY_DIR}/../include/private"
     12    "${DERIVED_SOURCES_PAL_DIR}"
    1213)
    1314

  • trunk/Source/WebCore/PAL/pal/avfoundation/MediaTimeAVFoundation.cpp

    r222325 r222326  
    3131#include "CoreMediaSoftLink.h"
    3232
    33 namespace WebCore {
     33namespace PAL {
    3434
    3535static bool CMTimeHasFlags(const CMTime& cmTime, uint32_t flags)

  • trunk/Source/WebCore/PAL/pal/avfoundation/MediaTimeAVFoundation.h

    r222325 r222326  
    2424 */
    2525
    26 #ifndef MediaTimeAVFoundation_h
    27 #define MediaTimeAVFoundation_h
     26#pragma once
    2827
    2928#if USE(AVFOUNDATION)
    … …  
    3231#include <wtf/MediaTime.h>
    3332
    34 namespace WebCore {
     33namespace PAL {
    3534
    36 CMTime toCMTime(const MediaTime&);
    37 MediaTime toMediaTime(const CMTime&);
     35PAL_EXPORT CMTime toCMTime(const MediaTime&);
     36PAL_EXPORT MediaTime toMediaTime(const CMTime&);
    3837
    3938}
    4039
    4140#endif
    42 
    43 #endif

  • trunk/Source/WebCore/PlatformAppleWin.cmake

    r221340 r222326  
    3838    platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
    3939    platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
    40     platform/graphics/avfoundation/MediaTimeAVFoundation.cpp
    4140    platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp
    4241

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r222306 r222326  
    63226322                CD641EB31818F5ED00EE4C41 /* MediaSourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EB11818F5ED00EE4C41 /* MediaSourcePrivate.h */; };
    63236323                CD641EB41818F5ED00EE4C41 /* SourceBufferPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EB21818F5ED00EE4C41 /* SourceBufferPrivate.h */; };
    6324                 CD641EBF1819B36000EE4C41 /* MediaTimeAVFoundation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD641EBD1819B35900EE4C41 /* MediaTimeAVFoundation.cpp */; };
    6325                 CD641EC01819B36000EE4C41 /* MediaTimeAVFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EBE1819B35900EE4C41 /* MediaTimeAVFoundation.h */; };
    63266324                CD669D681D23364B004D1866 /* MediaSessionManagerCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD669D661D232DFF004D1866 /* MediaSessionManagerCocoa.cpp */; };
    63276325                CD7D33431C7A123F00041293 /* PixelBufferConformerCV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD7D33411C7A123F00041293 /* PixelBufferConformerCV.cpp */; };
    … …  
    1506315061                CD641EB11818F5ED00EE4C41 /* MediaSourcePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSourcePrivate.h; sourceTree = "<group>"; };
    1506415062                CD641EB21818F5ED00EE4C41 /* SourceBufferPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceBufferPrivate.h; sourceTree = "<group>"; };
    15065                 CD641EBD1819B35900EE4C41 /* MediaTimeAVFoundation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTimeAVFoundation.cpp; sourceTree = "<group>"; };
    15066                 CD641EBE1819B35900EE4C41 /* MediaTimeAVFoundation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaTimeAVFoundation.h; sourceTree = "<group>"; };
    1506715063                CD641EC7181ED60100EE4C41 /* MediaSample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSample.h; sourceTree = "<group>"; };
    1506815064                CD669D661D232DFF004D1866 /* MediaSessionManagerCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MediaSessionManagerCocoa.cpp; path = cocoa/MediaSessionManagerCocoa.cpp; sourceTree = "<group>"; };
    … …  
    1664416640                                CDBEAEAB19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h */,
    1664516641                                CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */,
    16646                                 CD641EBD1819B35900EE4C41 /* MediaTimeAVFoundation.cpp */,
    16647                                 CD641EBE1819B35900EE4C41 /* MediaTimeAVFoundation.h */,
    1664816642                                CD336F6317FA0A4D00DDDCD0 /* VideoTrackPrivateAVF.h */,
    1664916643                                0709D7901AE5557E004E42F8 /* WebMediaSessionManagerMac.cpp */,
    … …  
    2931729311                                078E091917D14D1C00420AA1 /* MediaStreamTrackEvent.h in Headers */,
    2931829312                                07FFDE69181AED420072D409 /* MediaStreamTrackPrivate.h in Headers */,
    29319                                 CD641EC01819B36000EE4C41 /* MediaTimeAVFoundation.h in Headers */,
    2932029313                                CD60C0C7193E87C7003C656B /* MediaTimeQTKit.h in Headers */,
    2932129314                                932CC0B71DFFD158004C0F9F /* MediaTrackConstraints.h in Headers */,
    … …  
    3337933372                                078E090317D14CEE00420AA1 /* MediaStreamTrackEvent.cpp in Sources */,
    3338033373                                07FFDE68181AED420072D409 /* MediaStreamTrackPrivate.cpp in Sources */,
    33381                                 CD641EBF1819B36000EE4C41 /* MediaTimeAVFoundation.cpp in Sources */,
    3338233374                                CD60C0C6193E87C7003C656B /* MediaTimeQTKit.mm in Sources */,
    3338333375                                932CC0F71DFFDA1F004C0F9F /* MediaTrackConstraints.cpp in Sources */,

  • trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm

    r219230 r222326  
    3232#include "CARingBuffer.h"
    3333#include "Logging.h"
    34 #include "MediaTimeAVFoundation.h"
    3534#include <AudioToolbox/AudioConverter.h>
    3635#include <mach/mach.h>
    3736#include <mach/mach_time.h>
    3837#include <mutex>
     38#include <pal/avfoundation/MediaTimeAVFoundation.h>
    3939#include <syslog.h>
    4040#include <wtf/CurrentTime.h>
    … …  
    193193   
    194194    WebAudioBufferList list(*m_inputDescription, sampleBuffer);
    195     pushSamplesInternal(list, toMediaTime(CMSampleBufferGetPresentationTimeStamp(sampleBuffer)), CMSampleBufferGetNumSamples(sampleBuffer));
     195    pushSamplesInternal(list, PAL::toMediaTime(CMSampleBufferGetPresentationTimeStamp(sampleBuffer)), CMSampleBufferGetNumSamples(sampleBuffer));
    196196}
    197197

  • trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm

    r219179 r222326  
    3434#import "CARingBuffer.h"
    3535#import "Logging.h"
    36 #import "MediaTimeAVFoundation.h"
    3736#import <AVFoundation/AVAssetTrack.h>
    3837#import <AVFoundation/AVAudioMix.h>
    … …  
    4140#import <mutex>
    4241#import <objc/runtime.h>
     42#import <pal/avfoundation/MediaTimeAVFoundation.h>
    4343#import <wtf/Lock.h>
    4444#import <wtf/MainThread.h>
    … …  
    368368        return;
    369369
    370     MediaTime rangeStart = toMediaTime(rangeOut.start);
    371     MediaTime rangeDuration = toMediaTime(rangeOut.duration);
     370    MediaTime rangeStart = PAL::toMediaTime(rangeOut.start);
     371    MediaTime rangeDuration = PAL::toMediaTime(rangeOut.duration);
    372372
    373373    if (rangeStart.isInvalid())
    374374        return;
    375375
    376     MediaTime currentTime = toMediaTime(CMTimebaseGetTime([m_avPlayerItem timebase]));
     376    MediaTime currentTime = PAL::toMediaTime(CMTimebaseGetTime([m_avPlayerItem timebase]));
    377377    if (currentTime.isInvalid())
    378378        return;

  • trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp

    r222091 r222326  
    3333#include "Logging.h"
    3434#include "MediaPlayer.h"
    35 #include "MediaTimeAVFoundation.h"
     35#include <pal/avfoundation/MediaTimeAVFoundation.h>
    3636#include <runtime/ArrayBuffer.h>
    3737#include <runtime/DataView.h>
    3838#include <runtime/Int8Array.h>
    3939#include <wtf/MediaTime.h>
     40#include <wtf/StringPrintStream.h>
    4041#include <wtf/text/CString.h>
    4142#include <wtf/text/StringBuilder.h>
    4243#include <wtf/text/WTFString.h>
    4344#include <wtf/unicode/CharacterNames.h>
    44 #include <wtf/StringPrintStream.h>
    45 
    4645#include "CoreMediaSoftLink.h"
    4746
    … …  
    556555    }
    557556
    558     duration = toMediaTime(timingInfo.duration);
     557    duration = PAL::toMediaTime(timingInfo.duration);
    559558
    560559    CMBlockBufferRef blockBuffer = CMSampleBufferGetDataBuffer(sampleBuffer);

  • trunk/Source/WebCore/platform/graphics/avfoundation/MediaSampleAVFObjC.h

    r222113 r222326  
    2727
    2828#include "MediaSample.h"
    29 #include "MediaTimeAVFoundation.h"
     29#include <pal/avfoundation/MediaTimeAVFoundation.h>
    3030
    3131#include <runtime/Uint8ClampedArray.h>

  • trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp

    r219702 r222326  
    3535#include "InbandTextTrackPrivateAVF.h"
    3636#include "Logging.h"
    37 #include "MediaTimeAVFoundation.h"
    3837#include <JavaScriptCore/ArrayBuffer.h>
     38#include <pal/avfoundation/MediaTimeAVFoundation.h>
    3939#include <wtf/SoftLinking.h>
    4040

  • trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp

    r219876 r222326  
    4242#include "InbandTextTrackPrivateLegacyAVCF.h"
    4343#endif
    44 #include "MediaTimeAVFoundation.h"
    45 #include "URL.h"
    4644#include "Logging.h"
    4745#include "PlatformCALayerClient.h"
    4846#include "PlatformCALayerWin.h"
    4947#include "TimeRanges.h"
     48#include "URL.h"
    5049#include "WebCoreAVCFResourceLoader.h"
     50#include <pal/avfoundation/MediaTimeAVFoundation.h>
    5151
    5252#include <AVFoundationCF/AVCFPlayerItem.h>
    … …  
    593593
    594594    if (CMTIME_IS_NUMERIC(cmDuration))
    595         return toMediaTime(cmDuration);
     595        return PAL::toMediaTime(cmDuration);
    596596
    597597    if (CMTIME_IS_INDEFINITE(cmDuration))
    … …  
    609609    CMTime itemTime = AVCFPlayerItemGetCurrentTime(avPlayerItem(m_avfWrapper));
    610610    if (CMTIME_IS_NUMERIC(itemTime))
    611         return max(toMediaTime(itemTime), MediaTime::zeroTime());
     611        return max(PAL::toMediaTime(itemTime), MediaTime::zeroTime());
    612612
    613613    return MediaTime::zeroTime();
    … …  
    695695       
    696696        if (timeRangeIsValidAndNotEmpty(start, duration)) {
    697             MediaTime rangeStart = toMediaTime(start);
    698             MediaTime rangeEnd = rangeStart + toMediaTime(duration);
     697            MediaTime rangeStart = PAL::toMediaTime(start);
     698            MediaTime rangeEnd = rangeStart + PAL::toMediaTime(duration);
    699699            timeRanges->add(rangeStart, rangeEnd);
    700700        }
    … …  
    721721
    722722        hasValidRange = true;
    723         MediaTime startOfRange = toMediaTime(start);
     723        MediaTime startOfRange = PAL::toMediaTime(start);
    724724        if (minTimeSeekable > startOfRange)
    725725            minTimeSeekable = startOfRange;
    … …  
    746746            continue;
    747747       
    748         MediaTime endOfRange = toMediaTime(CMTimeAdd(start, duration));
     748        MediaTime endOfRange = PAL::toMediaTime(CMTimeAdd(start, duration));
    749749        if (maxTimeSeekable < endOfRange)
    750750            maxTimeSeekable = endOfRange;
    … …  
    772772            continue;
    773773       
    774         MediaTime endOfRange = toMediaTime(CMTimeAdd(start, duration));
     774        MediaTime endOfRange = PAL::toMediaTime(CMTimeAdd(start, duration));
    775775        if (maxTimeLoaded < endOfRange)
    776776            maxTimeLoaded = endOfRange;
    … …  
    17961796{
    17971797    ASSERT(avPlayerItem());
    1798     CMTime cmTime = toCMTime(time);
    1799     CMTime cmBefore = toCMTime(negativeTolerance);
    1800     CMTime cmAfter = toCMTime(positiveTolerance);
     1798    CMTime cmTime = PAL::toCMTime(time);
     1799    CMTime cmBefore = PAL::toCMTime(negativeTolerance);
     1800    CMTime cmAfter = PAL::toCMTime(positiveTolerance);
    18011801    AVCFPlayerItemSeekToTimeWithToleranceAndCompletionCallback(avPlayerItem(), cmTime, cmBefore, cmAfter, &seekCompletedCallback, callbackContext());
    18021802}
    … …  
    18521852    ASSERT(legibleOutput == self->m_legibleOutput);
    18531853
    1854     auto legibleOutputData = std::make_unique<LegibleOutputData>(attributedStrings, nativeSampleBuffers, toMediaTime(itemTime), context);
     1854    auto legibleOutputData = std::make_unique<LegibleOutputData>(attributedStrings, nativeSampleBuffers, PAL::toMediaTime(itemTime), context);
    18551855
    18561856    dispatch_async_f(dispatch_get_main_queue(), legibleOutputData.release(), processCue);
    … …  
    20642064
    20652065    AVCFAssetImageGeneratorSetMaximumSize(m_imageGenerator.get(), CGSize(rect.size()));
    2066     RetainPtr<CGImageRef> rawimage = adoptCF(AVCFAssetImageGeneratorCopyCGImageAtTime(m_imageGenerator.get(), toCMTime(time), 0, 0));
     2066    RetainPtr<CGImageRef> rawimage = adoptCF(AVCFAssetImageGeneratorCopyCGImageAtTime(m_imageGenerator.get(), PAL::toCMTime(time), 0, 0));
    20672067    RetainPtr<CGImageRef> image = adoptCF(CGImageCreateCopyWithColorSpace(rawimage.get(), adoptCF(CGColorSpaceCreateDeviceRGB()).get()));
    20682068

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm

    r222225 r222326  
    3434#import "FloatSize.h"
    3535#import "MIMETypeRegistry.h"
    36 #import "MediaTimeAVFoundation.h"
    3736#import "SharedBuffer.h"
    3837#import "UTIUtilities.h"
    … …  
    4645#import <VideoToolbox/VTUtilities.h>
    4746#import <map>
     47#import <pal/avfoundation/MediaTimeAVFoundation.h>
    4848#import <wtf/MainThread.h>
    4949#import <wtf/MediaTime.h>
    … …  
    339339        auto& sampleData = m_sampleData[index];
    340340        sampleData.duration = Seconds(CMTimeGetSeconds([cursor currentSampleDuration]));
    341         sampleData.decodeTime = toMediaTime([cursor decodeTimeStamp]);
    342         sampleData.presentationTime = toMediaTime([cursor presentationTimeStamp]);
     341        sampleData.decodeTime = PAL::toMediaTime([cursor decodeTimeStamp]);
     342        sampleData.presentationTime = PAL::toMediaTime([cursor presentationTimeStamp]);
    343343        auto request = adoptNS([allocAVSampleBufferRequestInstance() initWithStartCursor:cursor.get()]);
    344344        sampleData.sample = adoptCF([m_generator createSampleBufferForRequest:request.get()]);
    … …  
    369369        return false;
    370370
    371     auto presentationTime = toMediaTime(CMSampleBufferGetPresentationTimeStamp(sampleBuffer));
     371    auto presentationTime = PAL::toMediaTime(CMSampleBufferGetPresentationTimeStamp(sampleBuffer));
    372372    auto indexIter = m_presentationTimeToIndex.find(presentationTime);
    373373
    … …  
    548548        m_cursor = [m_track makeSampleCursorAtFirstSampleInDecodeOrder];
    549549
    550     auto frameCursor = [m_track makeSampleCursorWithPresentationTimeStamp:toCMTime(sampleData.presentationTime)];
     550    auto frameCursor = [m_track makeSampleCursorWithPresentationTimeStamp:PAL::toCMTime(sampleData.presentationTime)];
    551551    if ([frameCursor comparePositionInDecodeOrderWithPositionOfCursor:m_cursor.get()] == NSOrderedAscending)  {
    552552        // Rewind cursor to the last sync sample to begin decoding
    … …  
    567567            return nullptr;
    568568
    569         auto presentationTime = toMediaTime(m_cursor.get().presentationTimeStamp);
     569        auto presentationTime = PAL::toMediaTime(m_cursor.get().presentationTimeStamp);
    570570        auto indexIter = m_presentationTimeToIndex.find(presentationTime);
    571571        advanceCursor();

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r222234 r222326  
    4949#import "MediaPlaybackTargetMock.h"
    5050#import "MediaSelectionGroupAVFObjC.h"
    51 #import "MediaTimeAVFoundation.h"
    5251#import "OutOfBandTextTrackPrivateAVF.h"
    5352#import "PixelBufferConformerCV.h"
    … …  
    6968#import <map>
    7069#import <objc/runtime.h>
     70#import <pal/avfoundation/MediaTimeAVFoundation.h>
    7171#import <pal/spi/cocoa/QuartzCoreSPI.h>
    7272#import <pal/spi/mac/AVFoundationSPI.h>
    … …  
    13671367
    13681368    if (CMTIME_IS_NUMERIC(cmDuration))
    1369         return toMediaTime(cmDuration);
     1369        return PAL::toMediaTime(cmDuration);
    13701370
    13711371    if (CMTIME_IS_INDEFINITE(cmDuration))
    … …  
    13831383    CMTime itemTime = [m_avPlayerItem.get() currentTime];
    13841384    if (CMTIME_IS_NUMERIC(itemTime))
    1385         return std::max(toMediaTime(itemTime), MediaTime::zeroTime());
     1385        return std::max(PAL::toMediaTime(itemTime), MediaTime::zeroTime());
    13861386
    13871387    return MediaTime::zeroTime();
    … …  
    13961396        m_metadataTrack->flushPartialCues();
    13971397
    1398     CMTime cmTime = toCMTime(time);
    1399     CMTime cmBefore = toCMTime(negativeTolerance);
    1400     CMTime cmAfter = toCMTime(positiveTolerance);
     1398    CMTime cmTime = PAL::toCMTime(time);
     1399    CMTime cmBefore = PAL::toCMTime(negativeTolerance);
     1400    CMTime cmAfter = PAL::toCMTime(positiveTolerance);
    14011401
    14021402    // [AVPlayerItem seekToTime] will throw an exception if toleranceBefore is negative.
    … …  
    15071507        CMTimeRange timeRange = [thisRangeValue CMTimeRangeValue];
    15081508        if (CMTIMERANGE_IS_VALID(timeRange) && !CMTIMERANGE_IS_EMPTY(timeRange))
    1509             timeRanges->add(toMediaTime(timeRange.start), toMediaTime(CMTimeRangeGetEnd(timeRange)));
     1509            timeRanges->add(PAL::toMediaTime(timeRange.start), PAL::toMediaTime(CMTimeRangeGetEnd(timeRange)));
    15101510    }
    15111511    return timeRanges;
    … …  
    15251525
    15261526        hasValidRange = true;
    1527         MediaTime startOfRange = toMediaTime(timeRange.start);
     1527        MediaTime startOfRange = PAL::toMediaTime(timeRange.start);
    15281528        if (minTimeSeekable > startOfRange)
    15291529            minTimeSeekable = startOfRange;
    … …  
    15431543            continue;
    15441544       
    1545         MediaTime endOfRange = toMediaTime(CMTimeRangeGetEnd(timeRange));
     1545        MediaTime endOfRange = PAL::toMediaTime(CMTimeRangeGetEnd(timeRange));
    15461546        if (maxTimeSeekable < endOfRange)
    15471547            maxTimeSeekable = endOfRange;
    … …  
    15611561            continue;
    15621562       
    1563         MediaTime endOfRange = toMediaTime(CMTimeRangeGetEnd(timeRange));
     1563        MediaTime endOfRange = PAL::toMediaTime(CMTimeRangeGetEnd(timeRange));
    15641564        if (maxTimeLoaded < endOfRange)
    15651565            maxTimeLoaded = endOfRange;
    … …  
    31843184    MediaTime earliestStartTime = MediaTime::positiveInfiniteTime();
    31853185    for (AVMetadataItemType *item in m_currentMetaData.get()) {
    3186         MediaTime start = std::max(toMediaTime(item.time), MediaTime::zeroTime());
     3186        MediaTime start = std::max(PAL::toMediaTime(item.time), MediaTime::zeroTime());
    31873187        if (start < earliestStartTime)
    31883188            earliestStartTime = start;
    … …  
    31913191
    31923192    for (AVMetadataItemType *item in m_currentMetaData.get()) {
    3193         MediaTime start = std::max(toMediaTime(item.time), MediaTime::zeroTime());
     3193        MediaTime start = std::max(PAL::toMediaTime(item.time), MediaTime::zeroTime());
    31943194        MediaTime end = MediaTime::positiveInfiniteTime();
    31953195        if (CMTIME_IS_VALID(item.duration))
    3196             end = start + toMediaTime(item.duration);
     3196            end = start + PAL::toMediaTime(item.duration);
    31973197
    31983198        AtomicString type = nullAtom();
    … …  
    34573457            function = std::bind(&MediaPlayerPrivateAVFoundationObjC::presentationSizeDidChange, m_callback, FloatSize([newValue sizeValue]));
    34583458        else if ([keyPath isEqualToString:@"duration"])
    3459             function = std::bind(&MediaPlayerPrivateAVFoundationObjC::durationDidChange, m_callback, toMediaTime([newValue CMTimeValue]));
     3459            function = std::bind(&MediaPlayerPrivateAVFoundationObjC::durationDidChange, m_callback, PAL::toMediaTime([newValue CMTimeValue]));
    34603460        else if ([keyPath isEqualToString:@"timedMetadata"] && newValue) {
    34613461            MediaTime now;
    34623462            CMTime itemTime = [(AVPlayerItemType *)object currentTime];
    34633463            if (CMTIME_IS_NUMERIC(itemTime))
    3464                 now = std::max(toMediaTime(itemTime), MediaTime::zeroTime());
     3464                now = std::max(PAL::toMediaTime(itemTime), MediaTime::zeroTime());
    34653465            function = std::bind(&MediaPlayerPrivateAVFoundationObjC::metadataDidArrive, m_callback, RetainPtr<NSArray>(newValue), now);
    34663466            shouldLogValue = false;
    … …  
    34913491        if (shouldLogValue) {
    34923492            if ([keyPath isEqualToString:@"duration"])
    3493                 m_callback->logger().debug(m_callback->logChannel(), identifier, "did change '", [keyPath UTF8String], "' to ", toMediaTime([newValue CMTimeValue]));
     3493                m_callback->logger().debug(m_callback->logChannel(), identifier, "did change '", [keyPath UTF8String], "' to ", PAL::toMediaTime([newValue CMTimeValue]));
    34943494            else {
    34953495                RetainPtr<NSString> valueString = adoptNS([[NSString alloc] initWithFormat:@"%@", newValue]);
    … …  
    35313531        if (!callback)
    35323532            return;
    3533         MediaTime time = std::max(toMediaTime(itemTime), MediaTime::zeroTime());
     3533        MediaTime time = std::max(PAL::toMediaTime(itemTime), MediaTime::zeroTime());
    35343534        callback->processCue(protectedStrings.get(), protectedNativeSamples.get(), time);
    35353535    });

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm

    r222225 r222326  
    3838#import "MediaSourcePrivateAVFObjC.h"
    3939#import "MediaSourcePrivateClient.h"
    40 #import "MediaTimeAVFoundation.h"
    4140#import "PixelBufferConformerCV.h"
    4241#import "PlatformClockCM.h"
    … …  
    5049#import <QuartzCore/CALayer.h>
    5150#import <objc_runtime.h>
     51#import <pal/avfoundation/MediaTimeAVFoundation.h>
    5252#import <pal/spi/mac/AVFoundationSPI.h>
    5353#import <wtf/Deque.h>
    … …  
    148148    // an arbitrarily large time value of once an hour:
    149149    __block auto weakThis = createWeakPtr();
    150     m_timeJumpedObserver = [m_synchronizer addPeriodicTimeObserverForInterval:toCMTime(MediaTime::createWithDouble(3600)) queue:dispatch_get_main_queue() usingBlock:^(CMTime time) {
     150    m_timeJumpedObserver = [m_synchronizer addPeriodicTimeObserverForInterval:PAL::toCMTime(MediaTime::createWithDouble(3600)) queue:dispatch_get_main_queue() usingBlock:^(CMTime time) {
    151151#if LOG_DISABLED
    152152        UNUSED_PARAM(time);
    … …  
    157157
    158158        if (m_seeking && !m_pendingSeek) {
    159             LOG(MediaSource, "MediaPlayerPrivateMediaSourceAVFObjC::m_timeJumpedObserver(%p) - time(%s)", weakThis.get(), toString(toMediaTime(time)).utf8().data());
     159            LOG(MediaSource, "MediaPlayerPrivateMediaSourceAVFObjC::m_timeJumpedObserver(%p) - time(%s)", weakThis.get(), toString(PAL::toMediaTime(time)).utf8().data());
    160160            m_seeking = false;
    161161
    … …  
    389389MediaTime MediaPlayerPrivateMediaSourceAVFObjC::currentMediaTime() const
    390390{
    391     MediaTime synchronizerTime = toMediaTime(CMTimebaseGetTime([m_synchronizer timebase]));
     391    MediaTime synchronizerTime = PAL::toMediaTime(CMTimebaseGetTime([m_synchronizer timebase]));
    392392    if (synchronizerTime < MediaTime::zeroTime())
    393393        return MediaTime::zeroTime();
    … …  
    437437    LOG(MediaSource, "MediaPlayerPrivateMediaSourceAVFObjC::seekInternal(%p) - seekTime(%s)", this, toString(m_lastSeekTime).utf8().data());
    438438
    439     MediaTime synchronizerTime = toMediaTime(CMTimebaseGetTime([m_synchronizer timebase]));
     439    MediaTime synchronizerTime = PAL::toMediaTime(CMTimebaseGetTime([m_synchronizer timebase]));
    440440    bool doesNotRequireSeek = synchronizerTime == m_lastSeekTime;
    441441
    442442    m_mediaSourcePrivate->willSeek();
    443     [m_synchronizer setRate:0 time:toCMTime(m_lastSeekTime)];
     443    [m_synchronizer setRate:0 time:PAL::toCMTime(m_lastSeekTime)];
    444444    m_mediaSourcePrivate->seekToTime(m_lastSeekTime);
    445445
    … …  
    860860    MediaTime duration = m_mediaSourcePrivate->duration();
    861861    auto weakThis = createWeakPtr();
    862     NSArray* times = @[[NSValue valueWithCMTime:toCMTime(duration)]];
     862    NSArray* times = @[[NSValue valueWithCMTime:PAL::toCMTime(duration)]];
    863863
    864864    LOG(MediaSource, "MediaPlayerPrivateMediaSourceAVFObjC::durationChanged(%p) - duration = %s", this, toString(duration).utf8().data());
    … …  
    874874        if (now < duration) {
    875875            LOG(MediaSource, "   ERROR: boundary time observer called before duration!", weakThis.get());
    876             [weakThis->m_synchronizer setRate:0 time:toCMTime(duration)];
     876            [weakThis->m_synchronizer setRate:0 time:PAL::toCMTime(duration)];
    877877        }
    878878        weakThis->m_player->timeChanged();
    … …  
    892892{
    893893    auto weakThis = m_sizeChangeObserverWeakPtrFactory.createWeakPtr();
    894     NSArray* times = @[[NSValue valueWithCMTime:toCMTime(time)]];
     894    NSArray* times = @[[NSValue valueWithCMTime:PAL::toCMTime(time)]];
    895895    RetainPtr<id> observer = [m_synchronizer addBoundaryTimeObserverForTimes:times queue:dispatch_get_main_queue() usingBlock:[this, weakThis, size] {
    896896        if (!weakThis)

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm

    r222105 r222326  
    3434#import "Logging.h"
    3535#import "MediaStreamPrivate.h"
    36 #import "MediaTimeAVFoundation.h"
    3736#import "PixelBufferConformerCV.h"
    3837#import "VideoTrackPrivateMediaStream.h"
    … …  
    4140#import <QuartzCore/CATransaction.h>
    4241#import <objc_runtime.h>
     42#import <pal/avfoundation/MediaTimeAVFoundation.h>
    4343#import <pal/spi/mac/AVFoundationSPI.h>
    4444#import <wtf/Function.h>
    … …  
    305305    MediaTime timelineOffset = streamTime() - sampleTime + MediaTime::createWithDouble(latency);
    306306    if (timelineOffset.timeScale() != sampleTime.timeScale())
    307         timelineOffset = toMediaTime(CMTimeConvertScale(toCMTime(timelineOffset), sampleTime.timeScale(), kCMTimeRoundingMethod_Default));
     307        timelineOffset = PAL::toMediaTime(CMTimeConvertScale(PAL::toCMTime(timelineOffset), sampleTime.timeScale(), kCMTimeRoundingMethod_Default));
    308308    return timelineOffset;
    309309}

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm

    r217489 r222326  
    7575MediaTime MediaSampleAVFObjC::presentationTime() const
    7676{
    77     return toMediaTime(CMSampleBufferGetPresentationTimeStamp(m_sample.get()));
     77    return PAL::toMediaTime(CMSampleBufferGetPresentationTimeStamp(m_sample.get()));
    7878}
    7979
    8080MediaTime MediaSampleAVFObjC::outputPresentationTime() const
    8181{
    82     return toMediaTime(CMSampleBufferGetOutputPresentationTimeStamp(m_sample.get()));
     82    return PAL::toMediaTime(CMSampleBufferGetOutputPresentationTimeStamp(m_sample.get()));
    8383}
    8484
    8585MediaTime MediaSampleAVFObjC::decodeTime() const
    8686{
    87     return toMediaTime(CMSampleBufferGetDecodeTimeStamp(m_sample.get()));
     87    return PAL::toMediaTime(CMSampleBufferGetDecodeTimeStamp(m_sample.get()));
    8888}
    8989
    9090MediaTime MediaSampleAVFObjC::duration() const
    9191{
    92     return toMediaTime(CMSampleBufferGetDuration(m_sample.get()));
     92    return PAL::toMediaTime(CMSampleBufferGetDuration(m_sample.get()));
    9393}
    9494
    9595MediaTime MediaSampleAVFObjC::outputDuration() const
    9696{
    97     return toMediaTime(CMSampleBufferGetOutputDuration(m_sample.get()));
     97    return PAL::toMediaTime(CMSampleBufferGetOutputDuration(m_sample.get()));
    9898}
    9999
    … …  
    177177   
    178178    for (auto& timing : timingInfoArray) {
    179         timing.presentationTimeStamp = toCMTime(toMediaTime(timing.presentationTimeStamp) + offset);
    180         timing.decodeTimeStamp = toCMTime(toMediaTime(timing.decodeTimeStamp) + offset);
     179        timing.presentationTimeStamp = PAL::toCMTime(PAL::toMediaTime(timing.presentationTimeStamp) + offset);
     180        timing.decodeTimeStamp = PAL::toCMTime(PAL::toMediaTime(timing.decodeTimeStamp) + offset);
    181181    }
    182182   
    … …  
    200200   
    201201    for (auto& timing : timingInfoArray) {
    202         timing.presentationTimeStamp = toCMTime(presentationTimestamp);
    203         timing.decodeTimeStamp = toCMTime(decodeTimestamp);
     202        timing.presentationTimeStamp = PAL::toCMTime(presentationTimestamp);
     203        timing.decodeTimeStamp = PAL::toCMTime(decodeTimestamp);
    204204    }
    205205   
    … …  
    230230
    231231    CMSampleBufferCallBlockForEachSample(m_sample.get(), [&] (CMSampleBufferRef sampleBuffer, CMItemCount) -> OSStatus {
    232         if (toMediaTime(CMSampleBufferGetPresentationTimeStamp(sampleBuffer)) >= presentationTime)
     232        if (PAL::toMediaTime(CMSampleBufferGetPresentationTimeStamp(sampleBuffer)) >= presentationTime)
    233233            return 1;
    234234        ++samplesBeforePresentationTime;

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm

    r220979 r222326  
    4040#import "MediaSampleAVFObjC.h"
    4141#import "MediaSourcePrivateAVFObjC.h"
    42 #import "MediaTimeAVFoundation.h"
    4342#import "NotImplemented.h"
    4443#import "SourceBufferPrivateClient.h"
    … …  
    5049#import <map>
    5150#import <objc/runtime.h>
     51#import <pal/avfoundation/MediaTimeAVFoundation.h>
    5252#import <pal/spi/mac/AVFoundationSPI.h>
    5353#import <runtime/TypedArrayInlines.h>
    … …  
    527527
    528528    if ([m_asset respondsToSelector:@selector(overallDurationHint)])
    529         segment.duration = toMediaTime([m_asset overallDurationHint]);
     529        segment.duration = PAL::toMediaTime([m_asset overallDurationHint]);
    530530
    531531    if (segment.duration.isInvalid() || segment.duration == MediaTime::zeroTime())
    532         segment.duration = toMediaTime([m_asset duration]);
     532        segment.duration = PAL::toMediaTime([m_asset duration]);
    533533
    534534    for (AVAssetTrack* track in [m_asset tracks]) {

  • trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm

    r222225 r222326  
    3030
    3131#import "Logging.h"
    32 #import "MediaTimeAVFoundation.h"
    3332#import "PixelBufferConformerCV.h"
    3433#import <CoreMedia/CMBufferQueue.h>
    3534#import <CoreMedia/CMFormatDescription.h>
     35#import <pal/avfoundation/MediaTimeAVFoundation.h>
    3636#import <wtf/MainThread.h>
    3737#import <wtf/MediaTime.h>
    … …  
    307307        auto currentRate = CMTimebaseGetRate(m_timebase.get());
    308308        if (currentRate > 0 && CMTimeCompare(presentationTimeStamp, currentTime) < 0)
    309             m_totalFrameDelay += toMediaTime(CMTimeSubtract(currentTime, presentationTimeStamp));
     309            m_totalFrameDelay += PAL::toMediaTime(CMTimeSubtract(currentTime, presentationTimeStamp));
    310310    }
    311311
    … …  
    335335        return;
    336336
    337     auto time = toMediaTime(CMTimebaseGetTime(m_timebase.get()));
     337    auto time = PAL::toMediaTime(CMTimebaseGetTime(m_timebase.get()));
    338338    LOG(Media, "WebCoreDecompressionSession::automaticDequeue(%p) - purging all samples before time(%s)", this, toString(time).utf8().data());
    339339
    … …  
    342342
    343343    while (CMSampleBufferRef firstSample = (CMSampleBufferRef)CMBufferQueueGetHead(m_producerQueue.get())) {
    344         MediaTime presentationTimestamp = toMediaTime(CMSampleBufferGetPresentationTimeStamp(firstSample));
    345         MediaTime duration = toMediaTime(CMSampleBufferGetDuration(firstSample));
     344        MediaTime presentationTimestamp = PAL::toMediaTime(CMSampleBufferGetPresentationTimeStamp(firstSample));
     345        MediaTime duration = PAL::toMediaTime(CMSampleBufferGetDuration(firstSample));
    346346        MediaTime presentationEndTimestamp = presentationTimestamp + duration;
    347347        if (time > presentationEndTimestamp) {
    … …  
    352352
    353353#if !LOG_DISABLED
    354         auto begin = toMediaTime(CMBufferQueueGetFirstPresentationTimeStamp(m_producerQueue.get()));
    355         auto end = toMediaTime(CMBufferQueueGetEndPresentationTimeStamp(m_producerQueue.get()));
     354        auto begin = PAL::toMediaTime(CMBufferQueueGetFirstPresentationTimeStamp(m_producerQueue.get()));
     355        auto end = PAL::toMediaTime(CMBufferQueueGetEndPresentationTimeStamp(m_producerQueue.get()));
    356356        LOG(Media, "WebCoreDecompressionSession::automaticDequeue(%p) - queue(%s -> %s)", this, toString(begin).utf8().data(), toString(end).utf8().data());
    357357#endif
    … …  
    365365
    366366    LOG(Media, "WebCoreDecompressionSession::automaticDequeue(%p) - queue empty", this, toString(time).utf8().data());
    367     CMTimebaseSetTimerDispatchSourceNextFireTime(m_timebase.get(), m_timerSource.get(), toCMTime(nextFireTime), 0);
     367    CMTimebaseSetTimerDispatchSourceNextFireTime(m_timebase.get(), m_timerSource.get(), PAL::toCMTime(nextFireTime), 0);
    368368}
    369369
    … …  
    383383
    384384#if !LOG_DISABLED
    385     auto begin = toMediaTime(CMBufferQueueGetFirstPresentationTimeStamp(m_producerQueue.get()));
    386     auto end = toMediaTime(CMBufferQueueGetEndPresentationTimeStamp(m_producerQueue.get()));
    387     auto presentationTime = toMediaTime(CMSampleBufferGetPresentationTimeStamp(sample));
     385    auto begin = PAL::toMediaTime(CMBufferQueueGetFirstPresentationTimeStamp(m_producerQueue.get()));
     386    auto end = PAL::toMediaTime(CMBufferQueueGetEndPresentationTimeStamp(m_producerQueue.get()));
     387    auto presentationTime = PAL::toMediaTime(CMSampleBufferGetPresentationTimeStamp(sample));
    388388    LOG(Media, "WebCoreDecompressionSession::enqueueDecodedSample(%p) - presentationTime(%s), framesBeingDecoded(%d), producerQueue(%s -> %s)", this, toString(presentationTime).utf8().data(), m_framesBeingDecoded, toString(begin).utf8().data(), toString(end).utf8().data());
    389389#endif
    … …  
    396396
    397397    if (m_timebase) {
    398         auto currentTime = toMediaTime(CMTimebaseGetTime(m_timebase.get()));
    399         auto presentationStartTime = toMediaTime(CMSampleBufferGetPresentationTimeStamp(sample));
    400         auto presentationEndTime = presentationStartTime + toMediaTime(CMSampleBufferGetDuration(sample));
     398        auto currentTime = PAL::toMediaTime(CMTimebaseGetTime(m_timebase.get()));
     399        auto presentationStartTime = PAL::toMediaTime(CMSampleBufferGetPresentationTimeStamp(sample));
     400        auto presentationEndTime = presentationStartTime + PAL::toMediaTime(CMSampleBufferGetDuration(sample));
    401401        if (currentTime < presentationStartTime || currentTime >= presentationEndTime)
    402402            return;
    … …  
    455455    bool allowLater = flags == WebCoreDecompressionSession::AllowLater;
    456456
    457     MediaTime startTime = toMediaTime(CMBufferQueueGetFirstPresentationTimeStamp(m_producerQueue.get()));
    458     MediaTime endTime = toMediaTime(CMBufferQueueGetEndPresentationTimeStamp(m_producerQueue.get()));
     457    MediaTime startTime = PAL::toMediaTime(CMBufferQueueGetFirstPresentationTimeStamp(m_producerQueue.get()));
     458    MediaTime endTime = PAL::toMediaTime(CMBufferQueueGetEndPresentationTimeStamp(m_producerQueue.get()));
    459459    if (!allowLater && time < startTime) {
    460460        LOG(Media, "WebCoreDecompressionSession::imageForTime(%p) - time(%s) too early for queue(%s -> %s)", this, toString(time).utf8().data(), toString(startTime).utf8().data(), toString(endTime).utf8().data());
    … …  
    465465
    466466    while (CMSampleBufferRef firstSample = (CMSampleBufferRef)CMBufferQueueGetHead(m_producerQueue.get())) {
    467         MediaTime presentationTimestamp = toMediaTime(CMSampleBufferGetPresentationTimeStamp(firstSample));
    468         MediaTime duration = toMediaTime(CMSampleBufferGetDuration(firstSample));
     467        MediaTime presentationTimestamp = PAL::toMediaTime(CMSampleBufferGetPresentationTimeStamp(firstSample));
     468        MediaTime duration = PAL::toMediaTime(CMSampleBufferGetDuration(firstSample));
    469469        MediaTime presentationEndTimestamp = presentationTimestamp + duration;
    470470        if (!allowLater && presentationTimestamp > time)

  • trunk/Source/WebCore/platform/mac/PlatformClockCM.mm

    r181036 r222326  
    3030#import "PlatformClockCM.h"
    3131
    32 #import "MediaTimeAVFoundation.h"
     32#import <pal/avfoundation/MediaTimeAVFoundation.h>
    3333
    3434#import "CoreMediaSoftLink.h"
    … …  
    8282void PlatformClockCM::setCurrentMediaTime(const MediaTime& time)
    8383{
    84     CMTimebaseSetTime(m_timebase.get(), toCMTime(time));
     84    CMTimebaseSetTime(m_timebase.get(), PAL::toCMTime(time));
    8585}
    8686
    8787MediaTime PlatformClockCM::currentMediaTime() const
    8888{
    89     return toMediaTime(CMTimebaseGetTime(m_timebase.get()));
     89    return PAL::toMediaTime(CMTimebaseGetTime(m_timebase.get()));
    9090}
    9191

  • trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm

    r220506 r222326  
    3131#import "IntRect.h"
    3232#import "MediaSelectionOption.h"
    33 #import "MediaTimeAVFoundation.h"
    3433#import "PlaybackSessionModel.h"
    3534#import "TimeRanges.h"
    3635#import "WebPlaybackControlsManager.h"
    3736#import <AVFoundation/AVTime.h>
     37#import <pal/avfoundation/MediaTimeAVFoundation.h>
    3838#import <pal/spi/cocoa/AVKitSPI.h>
    3939
    … …  
    123123    for (unsigned i = 0; i < timeRanges.length(); i++) {
    124124        const PlatformTimeRanges& ranges = timeRanges.ranges();
    125         CMTimeRange range = CMTimeRangeMake(toCMTime(ranges.start(i)), toCMTime(ranges.end(i)));
     125        CMTimeRange range = CMTimeRangeMake(PAL::toCMTime(ranges.start(i)), PAL::toCMTime(ranges.end(i)));
    126126        [rangeArray addObject:[NSValue valueWithCMTimeRange:range]];
    127127    }

  • trunk/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm

    r220979 r222326  
    3131#import "IntRect.h"
    3232#import "Logging.h"
    33 #import "MediaTimeAVFoundation.h"
    3433#import "PlaybackSessionInterfaceMac.h"
    3534#import "TimeRanges.h"
    … …  
    3837#import "WebPlaybackControlsManager.h"
    3938#import <AVFoundation/AVTime.h>
     39#import <pal/avfoundation/MediaTimeAVFoundation.h>
    4040#import <pal/spi/cocoa/AVKitSPI.h>
    4141#import <pal/spi/mac/PIPSPI.h>

  • trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp

    r220243 r222326  
    3838#include "CoreAudioCaptureSourceIOS.h"
    3939#include "Logging.h"
    40 #include "MediaTimeAVFoundation.h"
    4140#include "Timer.h"
    4241#include "WebAudioSourceProviderAVFObjC.h"
    … …  
    4544#include <CoreMedia/CMSync.h>
    4645#include <mach/mach_time.h>
     46#include <pal/avfoundation/MediaTimeAVFoundation.h>
    4747#include <pal/spi/cf/CoreAudioSPI.h>
    4848#include <sys/time.h>

  • trunk/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm

    r218497 r222326  
    107107    m_samplesEmitted += frameCount;
    108108
    109     audioSamplesAvailable(toMediaTime(startTime), *m_audioBufferList, CAAudioStreamDescription(m_streamFormat), frameCount);
     109    audioSamplesAvailable(PAL::toMediaTime(startTime), *m_audioBufferList, CAAudioStreamDescription(m_streamFormat), frameCount);
    110110}
    111111

  • trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp

    r218497 r222326  
    3737#include "CAAudioStreamDescription.h"
    3838#include "LibWebRTCAudioFormat.h"
    39 #include "MediaTimeAVFoundation.h"
    4039#include "WebAudioBufferList.h"
    4140#include "WebAudioSourceProviderAVFObjC.h"
     41#include <pal/avfoundation/MediaTimeAVFoundation.h>
    4242
    4343#include "CoreMediaSoftLink.h"
    … …  
    8484
    8585    CMTime startTime = CMTimeMake(m_numberOfFrames, sampleRate);
    86     auto mediaTime = toMediaTime(startTime);
     86    auto mediaTime = PAL::toMediaTime(startTime);
    8787    m_numberOfFrames += numberOfFrames;
    8888

  • trunk/Source/WebCore/platform/mediastream/mac/WebAudioSourceProviderAVFObjC.mm

    r219090 r222326  
    3434#import "AudioSourceProviderClient.h"
    3535#import "Logging.h"
    36 #import "MediaTimeAVFoundation.h"
    3736#import "WebAudioBufferList.h"
    3837#import <objc/runtime.h>
Note: See TracChangeset for help on using the changeset viewer.