mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
cbd579ebc8
- backport of Bug 1188696 - Remove the XPCOM dependencies in nsRefPtr.h (6c2860799) - backport of Bug 1188696 - Hoist nsRefPtr.h into MFBT (e892acb58) - Backport of Bug 1138967 - Part 3: Add D3D11 YCbCr texture clients and upload on the client side (2e4218167) - Bug 1038536 - Flatten image/src/ directory (3adb2d635) - Bug 1038536 - Flatten image/public/ directory (22329f3b4) - Bug 1038536 - Flatten image/decoders/icon/qt/public/ directory. (7b5b8b2af) - Bug 1038536 - Update header guard after flatten image/build (20e1614ac) - Bug 1116905 - part 2 - add MakeAndAddRef helper function to facilitate constructing TemporaryRef (9c85f45a0) - update (ab2c6eccf) - Bug 1139781 - Implement VideoPlaybackQuality for MediaCodecReader. (1a7c6c0a7) - Bug 1138825 - Fix the crash at mAudioPromise: call decode audio data when the audio queue is empty and check the mAudioPromise is empty or not. (3f5d3a1c5) - Bug 875247 - Add support for DXVA2 via D3D11 (2ca491206) - Bug 1145513 - Upload YCbCr image data on the client side when using d3d9 layers. (50f7a69fa) - Bug 1053563 - Use a static create function to replace InitWith for TextureClient. (dd1c8fc89) - Bug 1145764 - Add some default-disabled logging to TextureClientPool (1cfc0d1b9) - Bug 1120780 - Fallback on lock_ycbcr when ColorConvertor fails (3a9b893f0) - Bug 1161815: Use a single ID2D1SolidColorBrush per DrawTarget. (a70b72ef6) - Bug 1160485 - remove implicit conversion from RefPtr<T> to TemporaryR…ef<T>; (e6e6224c5) - Bug 1116905 - part 3 - remove dependence on implicit conversion from T* to TemporaryRef<T>, gfx changes; (f71d3ffa8) - Bug 1116905 - part 1 - remove dependence on implicit conversion from T* to TemporaryRef<T>, non-gfx changes; (f66714955) - implement Event.srcElement as alias (6c1ee1c6d) - 1116905 - part 4 - remove implicit conversion from non-nullptr T* to TemporaryRef<T> (f94c680f9) - Bug 1031152 - Define a JS public API for working with SavedFrame instances (2aa41721a) - Update TLD's from ESR 60 (b9dbe0ca3) with some changes to fix building, reported to upstream: - https://github.com/wicknix/Arctic-Fox/commit/2e421816773b6a57502907ab22c285d994d8b024#r31893045 - https://github.com/wicknix/Arctic-Fox/commit/50f7a69fa9a36634aef1ae5a221415ca98284435#r31892913 - https://github.com/wicknix/Arctic-Fox/commit/f667149556ae0e64c9dbce08836bb5d957db2464#r31892928
271 lines
8.5 KiB
C++
271 lines
8.5 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* 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 <map>
|
|
#include <stack>
|
|
|
|
#include "gfxPlatform.h"
|
|
#include "mozilla/layers/GrallocTextureClient.h"
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
#include "mozilla/Mutex.h"
|
|
|
|
#include "TextureClientRecycleAllocator.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
class TextureClientRecycleAllocatorImp : public ISurfaceAllocator
|
|
{
|
|
~TextureClientRecycleAllocatorImp();
|
|
|
|
public:
|
|
explicit TextureClientRecycleAllocatorImp(ISurfaceAllocator* aAllocator);
|
|
|
|
void SetMaxPoolSize(uint32_t aMax)
|
|
{
|
|
if (aMax > 0) {
|
|
mMaxPooledSize = aMax;
|
|
}
|
|
}
|
|
|
|
// Creates and allocates a TextureClient.
|
|
TemporaryRef<TextureClient>
|
|
CreateOrRecycleForDrawing(gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
gfx::BackendType aMoz2dBackend,
|
|
TextureFlags aTextureFlags,
|
|
TextureAllocationFlags flags);
|
|
|
|
void Destroy();
|
|
|
|
void RecycleCallbackImp(TextureClient* aClient);
|
|
|
|
static void RecycleCallback(TextureClient* aClient, void* aClosure);
|
|
|
|
// ISurfaceAllocator
|
|
virtual LayersBackend GetCompositorBackendType() const override
|
|
{
|
|
return mSurfaceAllocator->GetCompositorBackendType();
|
|
}
|
|
|
|
virtual bool AllocShmem(size_t aSize,
|
|
mozilla::ipc::SharedMemory::SharedMemoryType aType,
|
|
mozilla::ipc::Shmem* aShmem) override
|
|
{
|
|
return mSurfaceAllocator->AllocShmem(aSize, aType, aShmem);
|
|
}
|
|
|
|
virtual bool AllocUnsafeShmem(size_t aSize,
|
|
mozilla::ipc::SharedMemory::SharedMemoryType aType,
|
|
mozilla::ipc::Shmem* aShmem) override
|
|
{
|
|
return mSurfaceAllocator->AllocUnsafeShmem(aSize, aType, aShmem);
|
|
}
|
|
|
|
virtual void DeallocShmem(mozilla::ipc::Shmem& aShmem) override
|
|
{
|
|
mSurfaceAllocator->DeallocShmem(aShmem);
|
|
}
|
|
|
|
virtual bool IsSameProcess() const override
|
|
{
|
|
return mSurfaceAllocator->IsSameProcess();
|
|
}
|
|
|
|
protected:
|
|
// ISurfaceAllocator
|
|
virtual bool IsOnCompositorSide() const override
|
|
{
|
|
return false;
|
|
}
|
|
|
|
private:
|
|
static const uint32_t kMaxPooledSized = 2;
|
|
|
|
// Used to keep TextureClient's reference count stable as not to disrupt recycling.
|
|
class TextureClientHolder
|
|
{
|
|
~TextureClientHolder() {}
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(TextureClientHolder)
|
|
|
|
explicit TextureClientHolder(TextureClient* aClient)
|
|
: mTextureClient(aClient)
|
|
{}
|
|
|
|
TextureClient* GetTextureClient()
|
|
{
|
|
return mTextureClient;
|
|
}
|
|
void ClearTextureClient() { mTextureClient = nullptr; }
|
|
protected:
|
|
RefPtr<TextureClient> mTextureClient;
|
|
};
|
|
|
|
bool mDestroyed;
|
|
uint32_t mMaxPooledSize;
|
|
RefPtr<ISurfaceAllocator> mSurfaceAllocator;
|
|
std::map<TextureClient*, RefPtr<TextureClientHolder> > mInUseClients;
|
|
|
|
// On b2g gonk, std::queue might be a better choice.
|
|
// On ICS, fence wait happens implicitly before drawing.
|
|
// Since JB, fence wait happens explicitly when fetching a client from the pool.
|
|
// stack is good from Graphics cache usage point of view.
|
|
std::stack<RefPtr<TextureClientHolder> > mPooledClients;
|
|
Mutex mLock;
|
|
};
|
|
|
|
TextureClientRecycleAllocatorImp::TextureClientRecycleAllocatorImp(ISurfaceAllocator *aAllocator)
|
|
: mDestroyed(false)
|
|
, mMaxPooledSize(kMaxPooledSized)
|
|
, mSurfaceAllocator(aAllocator)
|
|
, mLock("TextureClientRecycleAllocatorImp.mLock")
|
|
{
|
|
}
|
|
|
|
TextureClientRecycleAllocatorImp::~TextureClientRecycleAllocatorImp()
|
|
{
|
|
MOZ_ASSERT(mDestroyed);
|
|
MOZ_ASSERT(mPooledClients.empty());
|
|
MOZ_ASSERT(mInUseClients.empty());
|
|
}
|
|
|
|
TemporaryRef<TextureClient>
|
|
TextureClientRecycleAllocatorImp::CreateOrRecycleForDrawing(
|
|
gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
gfx::BackendType aMoz2DBackend,
|
|
TextureFlags aTextureFlags,
|
|
TextureAllocationFlags aAllocFlags)
|
|
{
|
|
// TextureAllocationFlags is actually used only by ContentClient.
|
|
// This class does not handle ConteClient's TextureClient allocation.
|
|
MOZ_ASSERT(aAllocFlags == TextureAllocationFlags::ALLOC_DEFAULT ||
|
|
aAllocFlags == TextureAllocationFlags::ALLOC_DISALLOW_BUFFERTEXTURECLIENT);
|
|
MOZ_ASSERT(!(aTextureFlags & TextureFlags::RECYCLE));
|
|
aTextureFlags = aTextureFlags | TextureFlags::RECYCLE; // Set recycle flag
|
|
|
|
RefPtr<TextureClientHolder> textureHolder;
|
|
|
|
if (aMoz2DBackend == gfx::BackendType::NONE) {
|
|
aMoz2DBackend = gfxPlatform::GetPlatform()->GetContentBackend();
|
|
}
|
|
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
if (mDestroyed) {
|
|
return nullptr;
|
|
} else if (!mPooledClients.empty()) {
|
|
textureHolder = mPooledClients.top();
|
|
mPooledClients.pop();
|
|
// If a pooled TextureClient is not compatible, release it.
|
|
if (textureHolder->GetTextureClient()->GetFormat() != aFormat ||
|
|
textureHolder->GetTextureClient()->GetSize() != aSize)
|
|
{
|
|
TextureClientReleaseTask* task = new TextureClientReleaseTask(textureHolder->GetTextureClient());
|
|
textureHolder->ClearTextureClient();
|
|
textureHolder = nullptr;
|
|
// Release TextureClient.
|
|
mSurfaceAllocator->GetMessageLoop()->PostTask(FROM_HERE, task);
|
|
} else {
|
|
textureHolder->GetTextureClient()->RecycleTexture(aTextureFlags);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!textureHolder) {
|
|
// Allocate new TextureClient
|
|
RefPtr<TextureClient> texture;
|
|
texture = TextureClient::CreateForDrawing(this, aFormat, aSize, aMoz2DBackend,
|
|
aTextureFlags, aAllocFlags);
|
|
if (!texture) {
|
|
return nullptr;
|
|
}
|
|
textureHolder = new TextureClientHolder(texture);
|
|
}
|
|
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
MOZ_ASSERT(mInUseClients.find(textureHolder->GetTextureClient()) == mInUseClients.end());
|
|
// Register TextureClient
|
|
mInUseClients[textureHolder->GetTextureClient()] = textureHolder;
|
|
}
|
|
textureHolder->GetTextureClient()->SetRecycleCallback(TextureClientRecycleAllocatorImp::RecycleCallback, this);
|
|
RefPtr<TextureClient> client(textureHolder->GetTextureClient());
|
|
return client.forget();
|
|
}
|
|
|
|
void
|
|
TextureClientRecycleAllocatorImp::Destroy()
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
if (mDestroyed) {
|
|
return;
|
|
}
|
|
mDestroyed = true;
|
|
while (!mPooledClients.empty()) {
|
|
mPooledClients.pop();
|
|
}
|
|
}
|
|
|
|
void
|
|
TextureClientRecycleAllocatorImp::RecycleCallbackImp(TextureClient* aClient)
|
|
{
|
|
RefPtr<TextureClientHolder> textureHolder;
|
|
aClient->ClearRecycleCallback();
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
if (mInUseClients.find(aClient) != mInUseClients.end()) {
|
|
textureHolder = mInUseClients[aClient]; // Keep reference count of TextureClientHolder within lock.
|
|
if (!mDestroyed && mPooledClients.size() < mMaxPooledSize) {
|
|
mPooledClients.push(textureHolder);
|
|
}
|
|
mInUseClients.erase(aClient);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* static */ void
|
|
TextureClientRecycleAllocatorImp::RecycleCallback(TextureClient* aClient, void* aClosure)
|
|
{
|
|
TextureClientRecycleAllocatorImp* recycleAllocator = static_cast<TextureClientRecycleAllocatorImp*>(aClosure);
|
|
recycleAllocator->RecycleCallbackImp(aClient);
|
|
}
|
|
|
|
TextureClientRecycleAllocator::TextureClientRecycleAllocator(ISurfaceAllocator *aAllocator)
|
|
{
|
|
mAllocator = new TextureClientRecycleAllocatorImp(aAllocator);
|
|
}
|
|
|
|
TextureClientRecycleAllocator::~TextureClientRecycleAllocator()
|
|
{
|
|
mAllocator->Destroy();
|
|
mAllocator = nullptr;
|
|
}
|
|
|
|
void
|
|
TextureClientRecycleAllocator::SetMaxPoolSize(uint32_t aMax)
|
|
{
|
|
mAllocator->SetMaxPoolSize(aMax);
|
|
}
|
|
|
|
TemporaryRef<TextureClient>
|
|
TextureClientRecycleAllocator::CreateOrRecycleForDrawing(
|
|
gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
gfx::BackendType aMoz2DBackend,
|
|
TextureFlags aTextureFlags,
|
|
TextureAllocationFlags aAllocFlags)
|
|
{
|
|
return mAllocator->CreateOrRecycleForDrawing(aFormat,
|
|
aSize,
|
|
aMoz2DBackend,
|
|
aTextureFlags,
|
|
aAllocFlags);
|
|
}
|
|
|
|
}
|
|
}
|