mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
5de404e405
The code always assumed that the size of the image with the Y plane dimensions, which, while often the case, isn't correct. We remove the assertions that the display offset was always (0,0) and properly carry the actual data over IPC. Remoting the theora decoder and enabling fast video copy exposed several other related issues in the various D3D11 image types. Various WPT uses theora YUV44 images (because we do not support YUV444 H264 ones). Those images are made of 32 pixels planes with a display size set to 20 pixels. Prior P1D the backend image was a ShareYCbCrPlanar image which correctly handled the size settings. Like the image serializer, the various D3D11 images always assumed that the Y plane size was the image size. This however expose existing issues where the offset position of the display is completely ignored for some image type. See bug 1669054 All those problems explain why sometimes we displayed more pixels than we should have. Depends on D91914 Differential Revision: https://phabricator.services.mozilla.com/D92233
129 lines
4.6 KiB
C++
129 lines
4.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#ifndef MOZILLA_LAYERS_BUFFERETEXTURE
|
|
#define MOZILLA_LAYERS_BUFFERETEXTURE
|
|
|
|
#include "mozilla/RefPtr.h"
|
|
#include "mozilla/gfx/2D.h"
|
|
#include "mozilla/gfx/Types.h"
|
|
#include "mozilla/ipc/SharedMemory.h"
|
|
#include "mozilla/layers/TextureClient.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
bool ComputeHasIntermediateBuffer(gfx::SurfaceFormat aFormat,
|
|
LayersBackend aLayersBackend,
|
|
bool aSupportsTextureDirectMapping);
|
|
|
|
class BufferTextureData : public TextureData {
|
|
public:
|
|
// ShmemAllocator needs to implement IShmemAllocator and IsSameProcess,
|
|
// as done in LayersIPCChannel and ISurfaceAllocator.
|
|
template <typename ShmemAllocator>
|
|
static BufferTextureData* Create(gfx::IntSize aSize,
|
|
gfx::SurfaceFormat aFormat,
|
|
gfx::BackendType aMoz2DBackend,
|
|
LayersBackend aLayersBackend,
|
|
TextureFlags aFlags,
|
|
TextureAllocationFlags aAllocFlags,
|
|
ShmemAllocator aAllocator);
|
|
|
|
static BufferTextureData* CreateForYCbCr(
|
|
KnowsCompositor* aAllocator, const gfx::IntRect& aDisplay,
|
|
const gfx::IntSize& aYSize, uint32_t aYStride,
|
|
const gfx::IntSize& aCbCrSize, uint32_t aCbCrStride,
|
|
StereoMode aStereoMode, gfx::ColorDepth aColorDepth,
|
|
gfx::YUVColorSpace aYUVColorSpace, gfx::ColorRange aColorRange,
|
|
TextureFlags aTextureFlags);
|
|
|
|
bool Lock(OpenMode aMode) override { return true; }
|
|
|
|
void Unlock() override {}
|
|
|
|
void FillInfo(TextureData::Info& aInfo) const override;
|
|
|
|
already_AddRefed<gfx::DrawTarget> BorrowDrawTarget() override;
|
|
|
|
bool BorrowMappedData(MappedTextureData& aMap) override;
|
|
|
|
bool BorrowMappedYCbCrData(MappedYCbCrTextureData& aMap) override;
|
|
|
|
// use TextureClient's default implementation
|
|
bool UpdateFromSurface(gfx::SourceSurface* aSurface) override;
|
|
|
|
BufferTextureData* AsBufferTextureData() override { return this; }
|
|
|
|
// Don't use this.
|
|
void SetDescriptor(BufferDescriptor&& aDesc);
|
|
|
|
Maybe<gfx::IntSize> GetCbCrSize() const;
|
|
|
|
Maybe<int32_t> GetYStride() const;
|
|
|
|
Maybe<int32_t> GetCbCrStride() const;
|
|
|
|
Maybe<gfx::YUVColorSpace> GetYUVColorSpace() const;
|
|
|
|
Maybe<gfx::ColorDepth> GetColorDepth() const;
|
|
|
|
Maybe<StereoMode> GetStereoMode() const;
|
|
|
|
protected:
|
|
gfx::IntSize GetSize() const;
|
|
gfx::IntRect GetPictureRect() const;
|
|
|
|
gfx::SurfaceFormat GetFormat() const;
|
|
|
|
static BufferTextureData* Create(
|
|
gfx::IntSize aSize, gfx::SurfaceFormat aFormat,
|
|
gfx::BackendType aMoz2DBackend, LayersBackend aLayersBackend,
|
|
TextureFlags aFlags, TextureAllocationFlags aAllocFlags,
|
|
mozilla::ipc::IShmemAllocator* aAllocator, bool aIsSameProcess);
|
|
|
|
static BufferTextureData* CreateInternal(LayersIPCChannel* aAllocator,
|
|
const BufferDescriptor& aDesc,
|
|
gfx::BackendType aMoz2DBackend,
|
|
int32_t aBufferSize,
|
|
TextureFlags aTextureFlags);
|
|
|
|
virtual uint8_t* GetBuffer() = 0;
|
|
virtual size_t GetBufferSize() = 0;
|
|
|
|
BufferTextureData(const BufferDescriptor& aDescriptor,
|
|
gfx::BackendType aMoz2DBackend)
|
|
: mDescriptor(aDescriptor), mMoz2DBackend(aMoz2DBackend) {}
|
|
|
|
BufferDescriptor mDescriptor;
|
|
gfx::BackendType mMoz2DBackend;
|
|
};
|
|
|
|
template <typename ShmemAllocator>
|
|
inline BufferTextureData* BufferTextureData::Create(
|
|
gfx::IntSize aSize, gfx::SurfaceFormat aFormat,
|
|
gfx::BackendType aMoz2DBackend, LayersBackend aLayersBackend,
|
|
TextureFlags aFlags, TextureAllocationFlags aAllocFlags,
|
|
ShmemAllocator aAllocator) {
|
|
return Create(aSize, aFormat, aMoz2DBackend, aLayersBackend, aFlags,
|
|
aAllocFlags, aAllocator, aAllocator->IsSameProcess());
|
|
}
|
|
|
|
// nullptr allocator specialization
|
|
template <>
|
|
inline BufferTextureData* BufferTextureData::Create(
|
|
gfx::IntSize aSize, gfx::SurfaceFormat aFormat,
|
|
gfx::BackendType aMoz2DBackend, LayersBackend aLayersBackend,
|
|
TextureFlags aFlags, TextureAllocationFlags aAllocFlags, std::nullptr_t) {
|
|
return Create(aSize, aFormat, aMoz2DBackend, aLayersBackend, aFlags,
|
|
aAllocFlags, nullptr, true);
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|
|
|
|
#endif
|