Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Use CMClock as a timing source for PlatformClock where available.
https://bugs.webkit.org/show_bug.cgi?id=77885 Reviewed by Eric Carlson. Source/JavaScriptCore: * wtf/Platform.h: Added WTF_USE_COREMEDIA. Source/WebCore: No new tests; performance improvement covered by existing test cases. * WebCore.xcodeproj/project.pbxproj: * platform/Clock.cpp: (Clock::create): Use PlatformClockCM if available. * platform/mac/PlatformClockCM.h: Added. (WebCore::PlatformClockCM::playRate): (WebCore::PlatformClockCM::isRunning): * platform/mac/PlatformClockCM.mm: Added. (PlatformClockCM::PlatformClockCM): (PlatformClockCM::initializeWithTimingSource): (PlatformClockCM::setCurrentTime): (PlatformClockCM::currentTime): (PlatformClockCM::setPlayRate): (PlatformClockCM::start): (PlatformClockCM::stop): Canonical link: https://commits.webkit.org/94895@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106978 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
7 changed files
with
228 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright (C) 2012 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 COMPUTER, INC. ``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 COMPUTER, INC. OR | ||
| * 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 PlatformClockCM_h | ||
| #define PlatformClockCM_h | ||
|
|
||
| #if USE(COREMEDIA) | ||
|
|
||
| #include "Clock.h" | ||
| #include <wtf/RetainPtr.h> | ||
|
|
||
| typedef struct OpaqueCMTimebase* CMTimebaseRef; | ||
| typedef struct OpaqueCMClock* CMClockRef; | ||
|
|
||
| namespace WebCore { | ||
|
|
||
| class PlatformClockCM : public Clock { | ||
| public: | ||
| PlatformClockCM(); | ||
| PlatformClockCM(CMClockRef); | ||
|
|
||
| private: | ||
| void initializeWithTimingSource(CMClockRef); | ||
|
|
||
| virtual void setCurrentTime(float); | ||
| virtual float currentTime() const; | ||
|
|
||
| virtual void setPlayRate(float); | ||
| virtual float playRate() const { return m_rate; } | ||
|
|
||
| virtual void start(); | ||
| virtual void stop(); | ||
| virtual bool isRunning() const { return m_running; } | ||
|
|
||
| RetainPtr<CMTimebaseRef> m_timebase; | ||
| float m_rate; | ||
| bool m_running; | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| #endif | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * Copyright (C) 2012 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 COMPUTER, INC. ``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 COMPUTER, INC. OR | ||
| * 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. | ||
| */ | ||
|
|
||
| #import "config.h" | ||
|
|
||
| #if USE(COREMEDIA) | ||
|
|
||
| #import "PlatformClockCM.h" | ||
|
|
||
| #import "FloatConversion.h" | ||
| #import "SoftLinking.h" | ||
| #import <CoreMedia/CMAudioDeviceClock.h> | ||
|
|
||
| SOFT_LINK_FRAMEWORK_OPTIONAL(CoreMedia) | ||
|
|
||
| SOFT_LINK(CoreMedia, CMAudioDeviceClockCreate, int32_t, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut)) | ||
| SOFT_LINK(CoreMedia, CMTimebaseCreateWithMasterClock, int32_t, (CFAllocatorRef allocator, CMClockRef masterClock, CMTimebaseRef *timebaseOut), (allocator, masterClock, timebaseOut)) | ||
| SOFT_LINK(CoreMedia, CMTimebaseSetTime, int32_t, (CMTimebaseRef timebase, CMTime time), (timebase, time)) | ||
| SOFT_LINK(CoreMedia, CMTimebaseGetTime, CMTime, (CMTimebaseRef timebase), (timebase)) | ||
| SOFT_LINK(CoreMedia, CMTimebaseSetRate, int32_t, (CMTimebaseRef timebase, Float64 rate), (timebase, rate)) | ||
| SOFT_LINK(CoreMedia, CMTimeMakeWithSeconds, CMTime, (Float64 seconds, int32_t preferredTimeScale), (seconds, preferredTimeScale)) | ||
| SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time)) | ||
|
|
||
| using namespace WebCore; | ||
|
|
||
| // A default time scale of 1000 allows milli-second CMTime precision without scaling the timebase. | ||
| static const int32_t DefaultTimeScale = 1000; | ||
|
|
||
| PlatformClockCM::PlatformClockCM() | ||
| : m_timebase(0) | ||
| , m_running(false) | ||
| { | ||
| CMClockRef rawClockPtr = 0; | ||
| CMAudioDeviceClockCreate(kCFAllocatorDefault, NULL, &rawClockPtr); | ||
| RetainPtr<CMClockRef> clock(AdoptCF, rawClockPtr); | ||
| initializeWithTimingSource(clock.get()); | ||
| } | ||
|
|
||
| PlatformClockCM::PlatformClockCM(CMClockRef clock) | ||
| : m_timebase(0) | ||
| , m_running(false) | ||
| { | ||
| initializeWithTimingSource(clock); | ||
| } | ||
|
|
||
| void PlatformClockCM::initializeWithTimingSource(CMClockRef clock) | ||
| { | ||
| CMTimebaseRef rawTimebasePtr = 0; | ||
| CMTimebaseCreateWithMasterClock(kCFAllocatorDefault, clock, &rawTimebasePtr); | ||
| m_timebase.adoptCF(rawTimebasePtr); | ||
| } | ||
|
|
||
| void PlatformClockCM::setCurrentTime(float time) | ||
| { | ||
| CMTime cmTime = CMTimeMakeWithSeconds(time, DefaultTimeScale); | ||
| CMTimebaseSetTime(m_timebase.get(), cmTime); | ||
| } | ||
|
|
||
| float PlatformClockCM::currentTime() const | ||
| { | ||
| CMTime cmTime = CMTimebaseGetTime(m_timebase.get()); | ||
| return narrowPrecisionToFloat(CMTimeGetSeconds(cmTime)); | ||
| } | ||
|
|
||
| void PlatformClockCM::setPlayRate(float rate) | ||
| { | ||
| if (m_rate == rate) | ||
| return; | ||
|
|
||
| m_rate = rate; | ||
| if (m_running) | ||
| CMTimebaseSetRate(m_timebase.get(), rate); | ||
| } | ||
|
|
||
| void PlatformClockCM::start() | ||
| { | ||
| if (m_running) | ||
| return; | ||
| m_running = true; | ||
| CMTimebaseSetRate(m_timebase.get(), m_rate); | ||
| } | ||
|
|
||
| void PlatformClockCM::stop() | ||
| { | ||
| if (!m_running) | ||
| return; | ||
| m_running = false; | ||
| CMTimebaseSetRate(m_timebase.get(), 0); | ||
| } | ||
|
|
||
| #endif |