mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
d1af43433c
- Bug 1187817. Part 1 - Move Set{Volume,PlaybackRate,PreservesPitch} to the audio thread. r=kinetik. (a234a7080)
- Bug 1187817. Part 2 - remove unused code. r=kinetik. (836c52a19)
- Bug 1187763. Part 1 - move while loop out of WaitingForAudioToPlay(). r=kinetik. (a80d70f87)
- Bug 1187763. Part 2 - extract some code of AudioLoop() into its own function. r=kinetik. (275b8bfb6)
- Bug 1187763. Part 3 - refactor AudioSink::AudioLoop into a series of events. r=kinetik (7eb3f506f)
- Bug 1187817. Part 3 - move SetPlaying to the audio thread. r=kinetik. (0fef85968)
- Bug 1187817. Part 4 - move some code in Shutdown to the audio thread. r=kinetik. (8c73fbe6d)
- Bug 1187817. Part 5 - assert some code in the audio thread and don't enter the monitor. r=kinetik. (64de4616f)
- move include (f842b4b1e)
- Bug 1163486 - Update test to use new MP4Demuxer. r=bholley (b853be477)
- Bug 1190496 - Namespace the SharedThreadPool.h include. r=cpearce (196d25d42)
- Bug 1190496 - Hoist SharedThreadPool into xpcom. r=froydnj (3dad8176f)
- Bug 1190492 - Hoist AbstractThread and TaskDispatcher to xpcom. r=froydnj (c3329fa29)
- bug 1166107 documentation of mWaitForInternalDrain thread access r=gerald (f762764b1)
- correct comment (b623b2959)
- revert demuxer check from promise reject to assert like in 1156708 (f540b270c)
- more chekcs back to asserts (7e82a0f99)
- space (733bd85a3)
- Bug 1188220: Allow disabling HW acceleration even when SharedDecoderManager isn't used. r=cpearce (909a86682)
- bug 1161903 ensure pending DrainComplete is not run after Flush() r=cpearce (648cabbb7)
- Bug 1158089 - Fall back to d3d9 DXVA if d3d11 initialization fails. r=cpearce (84b3a8e6d)
183 lines
5.1 KiB
C++
183 lines
5.1 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "MediaTimer.h"
|
|
|
|
#include <math.h>
|
|
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "mozilla/DebugOnly.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "mozilla/SharedThreadPool.h"
|
|
|
|
namespace mozilla {
|
|
|
|
NS_IMPL_ADDREF(MediaTimer)
|
|
NS_IMPL_RELEASE_WITH_DESTROY(MediaTimer, DispatchDestroy())
|
|
|
|
MediaTimer::MediaTimer()
|
|
: mMonitor("MediaTimer Monitor")
|
|
, mTimer(do_CreateInstance("@mozilla.org/timer;1"))
|
|
, mCreationTimeStamp(TimeStamp::Now())
|
|
, mUpdateScheduled(false)
|
|
{
|
|
TIMER_LOG("MediaTimer::MediaTimer");
|
|
|
|
// Use the SharedThreadPool to create an nsIThreadPool with a maximum of one
|
|
// thread, which is equivalent to an nsIThread for our purposes.
|
|
RefPtr<SharedThreadPool> threadPool(
|
|
SharedThreadPool::Get(NS_LITERAL_CSTRING("MediaTimer"), 1));
|
|
mThread = threadPool.get();
|
|
mTimer->SetTarget(mThread);
|
|
}
|
|
|
|
void
|
|
MediaTimer::DispatchDestroy()
|
|
{
|
|
nsCOMPtr<nsIRunnable> task = NS_NewNonOwningRunnableMethod(this, &MediaTimer::Destroy);
|
|
// Hold a strong reference to the thread so that it doesn't get deleted in
|
|
// Destroy(), which may run completely before the stack if Dispatch() begins
|
|
// to unwind.
|
|
nsCOMPtr<nsIEventTarget> thread = mThread;
|
|
nsresult rv = thread->Dispatch(task, NS_DISPATCH_NORMAL);
|
|
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
|
|
(void) rv;
|
|
}
|
|
|
|
void
|
|
MediaTimer::Destroy()
|
|
{
|
|
MOZ_ASSERT(OnMediaTimerThread());
|
|
TIMER_LOG("MediaTimer::Destroy");
|
|
|
|
// Reject any outstanding entries. There's no need to acquire the monitor
|
|
// here, because we're on the timer thread and all other references to us
|
|
// must be gone.
|
|
while (!mEntries.empty()) {
|
|
mEntries.top().mPromise->Reject(false, __func__);
|
|
mEntries.pop();
|
|
}
|
|
|
|
// Cancel the timer if necessary.
|
|
CancelTimerIfArmed();
|
|
|
|
delete this;
|
|
}
|
|
|
|
bool
|
|
MediaTimer::OnMediaTimerThread()
|
|
{
|
|
bool rv = false;
|
|
mThread->IsOnCurrentThread(&rv);
|
|
return rv;
|
|
}
|
|
|
|
nsRefPtr<MediaTimerPromise>
|
|
MediaTimer::WaitUntil(const TimeStamp& aTimeStamp, const char* aCallSite)
|
|
{
|
|
MonitorAutoLock mon(mMonitor);
|
|
TIMER_LOG("MediaTimer::WaitUntil %lld", RelativeMicroseconds(aTimeStamp));
|
|
Entry e(aTimeStamp, aCallSite);
|
|
nsRefPtr<MediaTimerPromise> p = e.mPromise.get();
|
|
mEntries.push(e);
|
|
ScheduleUpdate();
|
|
return p;
|
|
}
|
|
|
|
void
|
|
MediaTimer::ScheduleUpdate()
|
|
{
|
|
mMonitor.AssertCurrentThreadOwns();
|
|
if (mUpdateScheduled) {
|
|
return;
|
|
}
|
|
mUpdateScheduled = true;
|
|
|
|
nsCOMPtr<nsIRunnable> task = NS_NewRunnableMethod(this, &MediaTimer::Update);
|
|
nsresult rv = mThread->Dispatch(task, NS_DISPATCH_NORMAL);
|
|
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
|
|
(void) rv;
|
|
}
|
|
|
|
void
|
|
MediaTimer::Update()
|
|
{
|
|
MonitorAutoLock mon(mMonitor);
|
|
UpdateLocked();
|
|
}
|
|
|
|
void
|
|
MediaTimer::UpdateLocked()
|
|
{
|
|
MOZ_ASSERT(OnMediaTimerThread());
|
|
mMonitor.AssertCurrentThreadOwns();
|
|
mUpdateScheduled = false;
|
|
|
|
TIMER_LOG("MediaTimer::UpdateLocked");
|
|
|
|
// Resolve all the promises whose time is up.
|
|
TimeStamp now = TimeStamp::Now();
|
|
while (!mEntries.empty() && mEntries.top().mTimeStamp <= now) {
|
|
mEntries.top().mPromise->Resolve(true, __func__);
|
|
DebugOnly<TimeStamp> poppedTimeStamp = mEntries.top().mTimeStamp;
|
|
mEntries.pop();
|
|
MOZ_ASSERT_IF(!mEntries.empty(), *&poppedTimeStamp <= mEntries.top().mTimeStamp);
|
|
}
|
|
|
|
// If we've got no more entries, cancel any pending timer and bail out.
|
|
if (mEntries.empty()) {
|
|
CancelTimerIfArmed();
|
|
return;
|
|
}
|
|
|
|
// We've got more entries - (re)arm the timer for the soonest one.
|
|
if (!TimerIsArmed() || mEntries.top().mTimeStamp < mCurrentTimerTarget) {
|
|
CancelTimerIfArmed();
|
|
ArmTimer(mEntries.top().mTimeStamp, now);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* We use a callback function, rather than a callback method, to ensure that
|
|
* the nsITimer does not artifically keep the refcount of the MediaTimer above
|
|
* zero. When the MediaTimer is destroyed, it safely cancels the nsITimer so that
|
|
* we never fire against a dangling closure.
|
|
*/
|
|
|
|
/* static */ void
|
|
MediaTimer::TimerCallback(nsITimer* aTimer, void* aClosure)
|
|
{
|
|
static_cast<MediaTimer*>(aClosure)->TimerFired();
|
|
}
|
|
|
|
void
|
|
MediaTimer::TimerFired()
|
|
{
|
|
MonitorAutoLock mon(mMonitor);
|
|
MOZ_ASSERT(OnMediaTimerThread());
|
|
mCurrentTimerTarget = TimeStamp();
|
|
UpdateLocked();
|
|
}
|
|
|
|
void
|
|
MediaTimer::ArmTimer(const TimeStamp& aTarget, const TimeStamp& aNow)
|
|
{
|
|
MOZ_DIAGNOSTIC_ASSERT(!TimerIsArmed());
|
|
MOZ_DIAGNOSTIC_ASSERT(aTarget > aNow);
|
|
|
|
// XPCOM timer resolution is in milliseconds. It's important to never resolve
|
|
// a timer when mTarget might compare < now (even if very close), so round up.
|
|
unsigned long delay = std::ceil((aTarget - aNow).ToMilliseconds());
|
|
TIMER_LOG("MediaTimer::ArmTimer delay=%lu", delay);
|
|
mCurrentTimerTarget = aTarget;
|
|
nsresult rv = mTimer->InitWithFuncCallback(&TimerCallback, this, delay, nsITimer::TYPE_ONE_SHOT);
|
|
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
|
|
(void) rv;
|
|
}
|
|
|
|
} // namespace mozilla
|