mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
ca19b65a80
- Bug 1250873 - Rename HasInternalBuffer into HasIntermediateBuffer in layers. r=sotaro (578235105f) - Bug 1256045 - Add a null-check in BufferTextureHost::EnsureWrappingTextureSource. r=jnicol (943c73559d) - Bug 1251726 - Check if Compositor is set r=nical (550d5b0164) - Bug 1251427 - Require a full update when a TextureHost switches from a TextureSource to another. r=sotaro (bc59ac4cd7) - Bug 1256693 - ISurfaceAllocator cleanup. r=sotaro (098e824d4d) - Bug 1257939 - initialize BGRX alpha channel to opaque when clearing and ignore uninitialized alpha in texture clients. r=mchang (73d778496f) - more of reapply Bug 1200595 - Consolidate the TextureClient's destruction logic (74517415ed) - Bug 1256693 - Refer to ClientIPCAllocator instead of ISurfaceAllocator where it makes sense. r=sotaro (e81f2dd923) - Bug 1236112 - Block on d3d9 video frames to complete before returning them from the decoder. r=cpearce (25114bb3c4) - Bug 1196409 - Disable D3D11-DXVA for resolutions not supported in hardware. r=jya (3007b1ebff) - Bug 1196411 - Disable DXVA on 60fps 1080p videos for AMD cards that can't decode quick enough. r=jya (9f8f67e12b) - Bug 1200775 - Check intel specific h264 decoder when checking for DXVA support. r=cpearce (e7bcbb10be) - Bug 1257013 - Part 1: Use readback to synchronize d3d9 video. r=cpearce,Bas (d247a9bed6) - Bug 1257013 - Part 2: Use readback to synchronize d3d11 video. r=cpearce,Bas (43883c1607) - missing bit of Bug 1206568: P2 (58de11b22f) - Bug 1239093 - Add pref to allow overriding of hardcoded DXVA blacklist. r=jrmuizel (dfd5e57c2f) - Bug 1217185: To allow for sandboxing, use null HWNDs when creating the D3D device for video decoding. r=mattwoodrow (0c96e66a47) - Bug 1200775 - Followup to fix typo and indent issues (b1d1c76788) - bits of Bug 1207245 - part 3 (52a1939b74) - Bug 1224199 - Don't make the TextureClient wait for compositor recycle if the GLContext is shutting down - r=nical (9a0081f217) - more of Bug 1200595 (047201fd60) - Bug 1253094, part 2 - Stop using DebugOnly for class/struct members in gfx/. r=Bas (bab6569366)
216 lines
5.3 KiB
C++
Executable File
216 lines
5.3 KiB
C++
Executable File
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* vim: sw=2 ts=8 et :
|
|
*/
|
|
/* 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 "AsyncTransactionTracker.h"
|
|
|
|
#include "mozilla/layers/ImageBridgeChild.h" // for ImageBridgeChild
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
void
|
|
AsyncTransactionWaiter::WaitComplete()
|
|
{
|
|
MOZ_ASSERT(!InImageBridgeChildThread());
|
|
|
|
MonitorAutoLock mon(mCompletedMonitor);
|
|
int count = 0;
|
|
const int maxCount = 5;
|
|
while (mWaitCount > 0 && (count < maxCount)) {
|
|
if (!NS_SUCCEEDED(mCompletedMonitor.Wait(PR_MillisecondsToInterval(10000)))) {
|
|
NS_WARNING("Failed to wait Monitor");
|
|
return;
|
|
}
|
|
if (count > 1) {
|
|
printf_stderr("Waiting async transaction complete.\n");
|
|
}
|
|
count++;
|
|
}
|
|
|
|
if (mWaitCount > 0) {
|
|
printf_stderr("Timeout of waiting transaction complete.");
|
|
}
|
|
}
|
|
|
|
uint64_t AsyncTransactionTracker::sSerialCounter(0);
|
|
Mutex* AsyncTransactionTracker::sLock = nullptr;
|
|
|
|
AsyncTransactionTracker::AsyncTransactionTracker(AsyncTransactionWaiter* aWaiter)
|
|
: mSerial(GetNextSerial())
|
|
, mWaiter(aWaiter)
|
|
#ifdef DEBUG
|
|
, mCompleted(false)
|
|
#endif
|
|
{
|
|
if (mWaiter) {
|
|
mWaiter->IncrementWaitCount();
|
|
}
|
|
}
|
|
|
|
AsyncTransactionTracker::~AsyncTransactionTracker()
|
|
{
|
|
}
|
|
|
|
void
|
|
AsyncTransactionTracker::NotifyComplete()
|
|
{
|
|
MOZ_ASSERT(!mCompleted);
|
|
#ifdef DEBUG
|
|
mCompleted = true;
|
|
#endif
|
|
Complete();
|
|
if (mWaiter) {
|
|
mWaiter->DecrementWaitCount();
|
|
}
|
|
}
|
|
|
|
void
|
|
AsyncTransactionTracker::NotifyCancel()
|
|
{
|
|
MOZ_ASSERT(!mCompleted);
|
|
#ifdef DEBUG
|
|
mCompleted = true;
|
|
#endif
|
|
Cancel();
|
|
if (mWaiter) {
|
|
mWaiter->DecrementWaitCount();
|
|
}
|
|
}
|
|
|
|
uint64_t AsyncTransactionTrackersHolder::sSerialCounter(0);
|
|
Mutex* AsyncTransactionTrackersHolder::sHolderLock = nullptr;
|
|
|
|
std::map<uint64_t, AsyncTransactionTrackersHolder*> AsyncTransactionTrackersHolder::sTrackersHolders;
|
|
|
|
AsyncTransactionTrackersHolder::AsyncTransactionTrackersHolder()
|
|
: mSerial(GetNextSerial())
|
|
, mIsTrackersHolderDestroyed(false)
|
|
{
|
|
MOZ_COUNT_CTOR(AsyncTransactionTrackersHolder);
|
|
{
|
|
MOZ_ASSERT(sHolderLock);
|
|
MutexAutoLock lock(*sHolderLock);
|
|
sTrackersHolders[mSerial] = this;
|
|
}
|
|
}
|
|
|
|
AsyncTransactionTrackersHolder::~AsyncTransactionTrackersHolder()
|
|
{
|
|
if (!mIsTrackersHolderDestroyed) {
|
|
DestroyAsyncTransactionTrackersHolder();
|
|
}
|
|
|
|
{
|
|
if (sHolderLock) {
|
|
sHolderLock->Lock();
|
|
}
|
|
sTrackersHolders.erase(mSerial);
|
|
if (sHolderLock) {
|
|
sHolderLock->Unlock();
|
|
}
|
|
}
|
|
MOZ_COUNT_DTOR(AsyncTransactionTrackersHolder);
|
|
}
|
|
|
|
void
|
|
AsyncTransactionTrackersHolder::HoldUntilComplete(AsyncTransactionTracker* aTransactionTracker)
|
|
{
|
|
if (!aTransactionTracker) {
|
|
return;
|
|
}
|
|
|
|
if (mIsTrackersHolderDestroyed && aTransactionTracker) {
|
|
aTransactionTracker->NotifyComplete();
|
|
return;
|
|
}
|
|
|
|
if (aTransactionTracker) {
|
|
MutexAutoLock lock(*sHolderLock);
|
|
mAsyncTransactionTrackers[aTransactionTracker->GetId()] = aTransactionTracker;
|
|
}
|
|
}
|
|
|
|
void
|
|
AsyncTransactionTrackersHolder::TransactionCompleteted(uint64_t aTransactionId)
|
|
{
|
|
MutexAutoLock lock(*sHolderLock);
|
|
TransactionCompletetedInternal(aTransactionId);
|
|
}
|
|
|
|
void
|
|
AsyncTransactionTrackersHolder::TransactionCompletetedInternal(uint64_t aTransactionId)
|
|
{
|
|
std::map<uint64_t, RefPtr<AsyncTransactionTracker> >::iterator it
|
|
= mAsyncTransactionTrackers.find(aTransactionId);
|
|
if (it != mAsyncTransactionTrackers.end()) {
|
|
it->second->NotifyComplete();
|
|
mAsyncTransactionTrackers.erase(it);
|
|
}
|
|
}
|
|
|
|
void
|
|
AsyncTransactionTrackersHolder::SetReleaseFenceHandle(FenceHandle& aReleaseFenceHandle,
|
|
uint64_t aTransactionId)
|
|
{
|
|
std::map<uint64_t, RefPtr<AsyncTransactionTracker> >::iterator it
|
|
= mAsyncTransactionTrackers.find(aTransactionId);
|
|
if (it != mAsyncTransactionTrackers.end()) {
|
|
it->second->SetReleaseFenceHandle(aReleaseFenceHandle);
|
|
}
|
|
}
|
|
|
|
/*static*/ void
|
|
AsyncTransactionTrackersHolder::TransactionCompleteted(uint64_t aHolderId, uint64_t aTransactionId)
|
|
{
|
|
MutexAutoLock lock(*sHolderLock);
|
|
AsyncTransactionTrackersHolder* holder = sTrackersHolders[aHolderId];
|
|
if (!holder) {
|
|
return;
|
|
}
|
|
holder->TransactionCompletetedInternal(aTransactionId);
|
|
}
|
|
|
|
/*static*/ void
|
|
AsyncTransactionTrackersHolder::SetReleaseFenceHandle(FenceHandle& aReleaseFenceHandle,
|
|
uint64_t aHolderId,
|
|
uint64_t aTransactionId)
|
|
{
|
|
MutexAutoLock lock(*sHolderLock);
|
|
AsyncTransactionTrackersHolder* holder = sTrackersHolders[aHolderId];
|
|
if (!holder) {
|
|
return;
|
|
}
|
|
holder->SetReleaseFenceHandle(aReleaseFenceHandle, aTransactionId);
|
|
}
|
|
|
|
void
|
|
AsyncTransactionTrackersHolder::ClearAllAsyncTransactionTrackers()
|
|
{
|
|
if (sHolderLock) {
|
|
sHolderLock->Lock();
|
|
}
|
|
std::map<uint64_t, RefPtr<AsyncTransactionTracker> >::iterator it;
|
|
for (it = mAsyncTransactionTrackers.begin();
|
|
it != mAsyncTransactionTrackers.end(); it++) {
|
|
it->second->NotifyCancel();
|
|
}
|
|
mAsyncTransactionTrackers.clear();
|
|
if (sHolderLock) {
|
|
sHolderLock->Unlock();
|
|
}
|
|
}
|
|
|
|
void
|
|
AsyncTransactionTrackersHolder::DestroyAsyncTransactionTrackersHolder() {
|
|
mIsTrackersHolderDestroyed = true;
|
|
ClearAllAsyncTransactionTrackers();
|
|
}
|
|
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|