diff options
| author | Tom Ritter <tom@mozilla.com> | 2018-02-20 12:18:30 -0600 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-03-14 11:27:26 +0100 |
| commit | a32b7f7c4e4e31669e0787e6321d74e4db71e514 (patch) | |
| tree | e83acb2eb895162f010e7ff9ee2d39548c4d90b4 /dom/media | |
| parent | bd819cc43653220abdbfe040ba5c721e9861241c (diff) | |
| download | UXP-a32b7f7c4e4e31669e0787e6321d74e4db71e514.tar UXP-a32b7f7c4e4e31669e0787e6321d74e4db71e514.tar.gz UXP-a32b7f7c4e4e31669e0787e6321d74e4db71e514.tar.lz UXP-a32b7f7c4e4e31669e0787e6321d74e4db71e514.tar.xz UXP-a32b7f7c4e4e31669e0787e6321d74e4db71e514.zip | |
Bug 1430173 - Reduce the precision of all explicit clocks to 2ms. r=baku, a=RyanVM
Backport to ESR where we don't have the ResistFingerprinting component.
MozReview-Commit-ID: 9bjycHjR3SF
--HG--
extra : transplant_source : %EA%03%21%0A%E9%3F%8E%CD%7C%D79f%96%85%96%00%5D%7F%95X
Diffstat (limited to 'dom/media')
| -rwxr-xr-x[-rw-r--r--] | dom/media/DOMMediaStream.cpp | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | dom/media/webaudio/AudioContext.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp index 6794ee32f..c1d451035 100644..100755 --- a/dom/media/DOMMediaStream.cpp +++ b/dom/media/DOMMediaStream.cpp @@ -9,6 +9,7 @@ #include "nsIScriptError.h" #include "nsIUUIDGenerator.h" #include "nsPIDOMWindow.h" +#include "mozilla/TimerClamping.h" #include "mozilla/dom/MediaStreamBinding.h" #include "mozilla/dom/MediaStreamTrackEvent.h" #include "mozilla/dom/LocalMediaStreamBinding.h" @@ -544,8 +545,8 @@ DOMMediaStream::CurrentTime() if (!mPlaybackStream) { return 0.0; } - return mPlaybackStream-> - StreamTimeToSeconds(mPlaybackStream->GetCurrentTime() - mLogicalStreamStartTime); + return TimerClamping::ReduceSTimeValue(mPlaybackStream-> + StreamTimeToSeconds(mPlaybackStream->GetCurrentTime() - mLogicalStreamStartTime)); } void diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp index a36eda621..85842c811 100644..100755 --- a/dom/media/webaudio/AudioContext.cpp +++ b/dom/media/webaudio/AudioContext.cpp @@ -41,6 +41,7 @@ #include "nsNetUtil.h" #include "nsPIDOMWindow.h" #include "nsPrintfCString.h" +#include "mozilla/TimerClamping.h" #include "OscillatorNode.h" #include "PannerNode.h" #include "PeriodicWave.h" @@ -746,7 +747,7 @@ double AudioContext::CurrentTime() const { MediaStream* stream = Destination()->Stream(); - return stream->StreamTimeToSeconds(stream->GetCurrentTime()); + return TimerClamping::ReduceSTimeValue(stream->StreamTimeToSeconds(stream->GetCurrentTime())); } void |