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)
340 lines
12 KiB
C++
340 lines
12 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 "ImageClient.h"
|
|
#include <stdint.h> // for uint32_t
|
|
#include "ImageContainer.h" // for Image, PlanarYCbCrImage, etc
|
|
#include "ImageTypes.h" // for ImageFormat::PLANAR_YCBCR, etc
|
|
#include "GLImages.h" // for SurfaceTextureImage::Data, etc
|
|
#include "gfx2DGlue.h" // for ImageFormatToSurfaceFormat
|
|
#include "gfxPlatform.h" // for gfxPlatform
|
|
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
|
|
#include "mozilla/RefPtr.h" // for RefPtr, already_AddRefed
|
|
#include "mozilla/gfx/BaseSize.h" // for BaseSize
|
|
#include "mozilla/gfx/Point.h" // for IntSize
|
|
#include "mozilla/gfx/Types.h" // for SurfaceFormat, etc
|
|
#include "mozilla/layers/CompositableClient.h" // for CompositableClient
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
#include "mozilla/layers/CompositorTypes.h" // for CompositableType, etc
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
|
|
#include "mozilla/layers/ShadowLayers.h" // for ShadowLayerForwarder
|
|
#include "mozilla/layers/TextureClient.h" // for TextureClient, etc
|
|
#include "mozilla/layers/TextureClientOGL.h" // for SurfaceTextureClient
|
|
#include "mozilla/mozalloc.h" // for operator delete, etc
|
|
#include "nsAutoPtr.h" // for nsRefPtr
|
|
#include "nsCOMPtr.h" // for already_AddRefed
|
|
#include "nsDebug.h" // for NS_WARNING, NS_ASSERTION
|
|
#include "nsISupportsImpl.h" // for Image::Release, etc
|
|
#include "nsRect.h" // for mozilla::gfx::IntRect
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "ClientLayerManager.h"
|
|
#ifdef MOZ_WIDGET_GONK
|
|
#include "GrallocImages.h"
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
/* static */ already_AddRefed<ImageClient>
|
|
ImageClient::CreateImageClient(CompositableType aCompositableHostType,
|
|
CompositableForwarder* aForwarder,
|
|
TextureFlags aFlags)
|
|
{
|
|
RefPtr<ImageClient> result = nullptr;
|
|
switch (aCompositableHostType) {
|
|
case CompositableType::IMAGE:
|
|
result = new ImageClientSingle(aForwarder, aFlags, CompositableType::IMAGE);
|
|
break;
|
|
case CompositableType::IMAGE_BRIDGE:
|
|
result = new ImageClientBridge(aForwarder, aFlags);
|
|
break;
|
|
case CompositableType::UNKNOWN:
|
|
result = nullptr;
|
|
break;
|
|
default:
|
|
MOZ_CRASH("GFX: unhandled program type image");
|
|
}
|
|
|
|
NS_ASSERTION(result, "Failed to create ImageClient");
|
|
|
|
return result.forget();
|
|
}
|
|
|
|
void
|
|
ImageClient::RemoveTexture(TextureClient* aTexture)
|
|
{
|
|
RemoveTextureWithWaiter(aTexture);
|
|
}
|
|
|
|
void
|
|
ImageClient::RemoveTextureWithWaiter(TextureClient* aTexture,
|
|
AsyncTransactionWaiter* aAsyncTransactionWaiter)
|
|
{
|
|
if ((aAsyncTransactionWaiter || GetForwarder()->UsesImageBridge())
|
|
#ifndef MOZ_WIDGET_GONK
|
|
// If the texture client is taking part in recycling then we should make sure
|
|
// the host has finished with it before dropping the ref and triggering
|
|
// the recycle callback.
|
|
&& aTexture->GetRecycleAllocator()
|
|
#endif
|
|
) {
|
|
RefPtr<AsyncTransactionTracker> request =
|
|
new RemoveTextureFromCompositableTracker(aAsyncTransactionWaiter);
|
|
// Hold TextureClient until the transaction complete to postpone
|
|
// the TextureClient recycle/delete.
|
|
request->SetTextureClient(aTexture);
|
|
GetForwarder()->RemoveTextureFromCompositableAsync(request, this, aTexture);
|
|
return;
|
|
}
|
|
|
|
GetForwarder()->RemoveTextureFromCompositable(this, aTexture);
|
|
}
|
|
|
|
ImageClientSingle::ImageClientSingle(CompositableForwarder* aFwd,
|
|
TextureFlags aFlags,
|
|
CompositableType aType)
|
|
: ImageClient(aFwd, aFlags, aType)
|
|
{
|
|
}
|
|
|
|
TextureInfo ImageClientSingle::GetTextureInfo() const
|
|
{
|
|
return TextureInfo(CompositableType::IMAGE);
|
|
}
|
|
|
|
void
|
|
ImageClientSingle::FlushAllImages(AsyncTransactionWaiter* aAsyncTransactionWaiter)
|
|
{
|
|
for (auto& b : mBuffers) {
|
|
RemoveTextureWithWaiter(b.mTextureClient, aAsyncTransactionWaiter);
|
|
}
|
|
mBuffers.Clear();
|
|
}
|
|
|
|
bool
|
|
ImageClientSingle::UpdateImage(ImageContainer* aContainer, uint32_t aContentFlags)
|
|
{
|
|
AutoTArray<ImageContainer::OwningImage,4> images;
|
|
uint32_t generationCounter;
|
|
aContainer->GetCurrentImages(&images, &generationCounter);
|
|
|
|
if (mLastUpdateGenerationCounter == generationCounter) {
|
|
return true;
|
|
}
|
|
mLastUpdateGenerationCounter = generationCounter;
|
|
|
|
for (int32_t i = images.Length() - 1; i >= 0; --i) {
|
|
if (!images[i].mImage->IsValid()) {
|
|
// Don't try to update to an invalid image.
|
|
images.RemoveElementAt(i);
|
|
}
|
|
}
|
|
if (images.IsEmpty()) {
|
|
// This can happen if a ClearAllImages raced with SetCurrentImages from
|
|
// another thread and ClearImagesFromImageBridge ran after the
|
|
// SetCurrentImages call but before UpdateImageClientNow.
|
|
// This can also happen if all images in the list are invalid.
|
|
// We return true because the caller would attempt to recreate the
|
|
// ImageClient otherwise, and that isn't going to help.
|
|
return true;
|
|
}
|
|
|
|
nsTArray<Buffer> newBuffers;
|
|
AutoTArray<CompositableForwarder::TimedTextureClient,4> textures;
|
|
|
|
for (auto& img : images) {
|
|
Image* image = img.mImage;
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
if (image->GetFormat() == ImageFormat::OVERLAY_IMAGE) {
|
|
OverlayImage* overlayImage = static_cast<OverlayImage*>(image);
|
|
OverlaySource source;
|
|
if (overlayImage->GetSidebandStream().IsValid()) {
|
|
// Duplicate GonkNativeHandle::NhObj for ipc,
|
|
// since ParamTraits<GonkNativeHandle>::Write() absorbs native_handle_t.
|
|
RefPtr<GonkNativeHandle::NhObj> nhObj = overlayImage->GetSidebandStream().GetDupNhObj();
|
|
GonkNativeHandle handle(nhObj);
|
|
if (!handle.IsValid()) {
|
|
gfxWarning() << "ImageClientSingle::UpdateImage failed in GetDupNhObj";
|
|
return false;
|
|
}
|
|
source.handle() = OverlayHandle(handle);
|
|
} else {
|
|
source.handle() = OverlayHandle(overlayImage->GetOverlayId());
|
|
}
|
|
source.size() = overlayImage->GetSize();
|
|
GetForwarder()->UseOverlaySource(this, source, image->GetPictureRect());
|
|
continue;
|
|
}
|
|
#endif
|
|
|
|
RefPtr<TextureClient> texture = image->GetTextureClient(this);
|
|
|
|
for (int32_t i = mBuffers.Length() - 1; i >= 0; --i) {
|
|
if (mBuffers[i].mImageSerial == image->GetSerial()) {
|
|
if (texture) {
|
|
MOZ_ASSERT(texture == mBuffers[i].mTextureClient);
|
|
} else {
|
|
texture = mBuffers[i].mTextureClient;
|
|
}
|
|
// Remove this element from mBuffers so mBuffers only contains
|
|
// images that aren't present in 'images'
|
|
mBuffers.RemoveElementAt(i);
|
|
}
|
|
}
|
|
|
|
if (!texture) {
|
|
// Slow path, we should not be hitting it very often and if we do it means
|
|
// we are using an Image class that is not backed by textureClient and we
|
|
// should fix it.
|
|
if (image->GetFormat() == ImageFormat::PLANAR_YCBCR) {
|
|
PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image);
|
|
const PlanarYCbCrData* data = ycbcr->GetData();
|
|
if (!data) {
|
|
return false;
|
|
}
|
|
texture = TextureClient::CreateForYCbCr(GetForwarder(),
|
|
data->mYSize, data->mCbCrSize, data->mStereoMode,
|
|
TextureFlags::DEFAULT | mTextureFlags
|
|
);
|
|
if (!texture) {
|
|
return false;
|
|
}
|
|
|
|
TextureClientAutoLock autoLock(texture, OpenMode::OPEN_WRITE_ONLY);
|
|
if (!autoLock.Succeeded()) {
|
|
return false;
|
|
}
|
|
|
|
bool status = UpdateYCbCrTextureClient(texture, *data);
|
|
MOZ_ASSERT(status);
|
|
if (!status) {
|
|
return false;
|
|
}
|
|
} else if (image->GetFormat() == ImageFormat::SURFACE_TEXTURE ||
|
|
image->GetFormat() == ImageFormat::EGLIMAGE) {
|
|
gfx::IntSize size = image->GetSize();
|
|
|
|
if (image->GetFormat() == ImageFormat::EGLIMAGE) {
|
|
EGLImageImage* typedImage = image->AsEGLImageImage();
|
|
texture = EGLImageTextureData::CreateTextureClient(
|
|
typedImage, size, GetForwarder(), mTextureFlags);
|
|
#ifdef MOZ_WIDGET_ANDROID
|
|
} else if (image->GetFormat() == ImageFormat::SURFACE_TEXTURE) {
|
|
SurfaceTextureImage* typedImage = image->AsSurfaceTextureImage();
|
|
texture = AndroidSurfaceTextureData::CreateTextureClient(
|
|
typedImage->GetSurfaceTexture(), size, typedImage->GetOriginPos(),
|
|
GetForwarder(), mTextureFlags
|
|
);
|
|
#endif
|
|
} else {
|
|
MOZ_ASSERT(false, "Bad ImageFormat.");
|
|
}
|
|
} else {
|
|
RefPtr<gfx::SourceSurface> surface = image->GetAsSourceSurface();
|
|
MOZ_ASSERT(surface);
|
|
texture = CreateTextureClientForDrawing(surface->GetFormat(), image->GetSize(),
|
|
BackendSelector::Content, mTextureFlags);
|
|
if (!texture) {
|
|
return false;
|
|
}
|
|
|
|
MOZ_ASSERT(texture->CanExposeDrawTarget());
|
|
|
|
if (!texture->Lock(OpenMode::OPEN_WRITE_ONLY)) {
|
|
return false;
|
|
}
|
|
|
|
{
|
|
// We must not keep a reference to the DrawTarget after it has been unlocked.
|
|
DrawTarget* dt = texture->BorrowDrawTarget();
|
|
if (!dt) {
|
|
gfxWarning() << "ImageClientSingle::UpdateImage failed in BorrowDrawTarget";
|
|
return false;
|
|
}
|
|
MOZ_ASSERT(surface.get());
|
|
dt->CopySurface(surface, IntRect(IntPoint(), surface->GetSize()), IntPoint());
|
|
}
|
|
|
|
texture->Unlock();
|
|
}
|
|
}
|
|
if (!texture || !AddTextureClient(texture)) {
|
|
return false;
|
|
}
|
|
|
|
|
|
CompositableForwarder::TimedTextureClient* t = textures.AppendElement();
|
|
t->mTextureClient = texture;
|
|
t->mTimeStamp = img.mTimeStamp;
|
|
t->mPictureRect = image->GetPictureRect();
|
|
t->mFrameID = img.mFrameID;
|
|
t->mProducerID = img.mProducerID;
|
|
|
|
Buffer* newBuf = newBuffers.AppendElement();
|
|
newBuf->mImageSerial = image->GetSerial();
|
|
newBuf->mTextureClient = texture;
|
|
|
|
texture->SyncWithObject(GetForwarder()->GetSyncObject());
|
|
}
|
|
|
|
GetForwarder()->UseTextures(this, textures);
|
|
|
|
for (auto& b : mBuffers) {
|
|
RemoveTexture(b.mTextureClient);
|
|
}
|
|
mBuffers.SwapElements(newBuffers);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
ImageClientSingle::AddTextureClient(TextureClient* aTexture)
|
|
{
|
|
MOZ_ASSERT((mTextureFlags & aTexture->GetFlags()) == mTextureFlags);
|
|
return CompositableClient::AddTextureClient(aTexture);
|
|
}
|
|
|
|
void
|
|
ImageClientSingle::OnDetach()
|
|
{
|
|
mBuffers.Clear();
|
|
}
|
|
|
|
ImageClient::ImageClient(CompositableForwarder* aFwd, TextureFlags aFlags,
|
|
CompositableType aType)
|
|
: CompositableClient(aFwd, aFlags)
|
|
, mLayer(nullptr)
|
|
, mType(aType)
|
|
, mLastUpdateGenerationCounter(0)
|
|
{}
|
|
|
|
ImageClientBridge::ImageClientBridge(CompositableForwarder* aFwd,
|
|
TextureFlags aFlags)
|
|
: ImageClient(aFwd, aFlags, CompositableType::IMAGE_BRIDGE)
|
|
, mAsyncContainerID(0)
|
|
{
|
|
}
|
|
|
|
bool
|
|
ImageClientBridge::UpdateImage(ImageContainer* aContainer, uint32_t aContentFlags)
|
|
{
|
|
if (!GetForwarder() || !mLayer) {
|
|
return false;
|
|
}
|
|
if (mAsyncContainerID == aContainer->GetAsyncContainerID()) {
|
|
return true;
|
|
}
|
|
mAsyncContainerID = aContainer->GetAsyncContainerID();
|
|
static_cast<ShadowLayerForwarder*>(GetForwarder())->AttachAsyncCompositable(mAsyncContainerID, mLayer);
|
|
return true;
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|