mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +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
106 lines
3.9 KiB
C++
106 lines
3.9 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 GFX_LAYERS_BLOBSURFACE_H
|
|
#define GFX_LAYERS_BLOBSURFACE_H
|
|
|
|
#include <stdint.h> // for uint8_t, uint32_t
|
|
#include "mozilla/Attributes.h" // for MOZ_STACK_CLASS
|
|
#include "mozilla/RefPtr.h" // for already_AddRefed
|
|
#include "mozilla/gfx/Point.h" // for IntSize
|
|
#include "mozilla/gfx/Rect.h" // for IntRect
|
|
#include "mozilla/gfx/Types.h" // for SurfaceFormat
|
|
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
class DataSourceSurface;
|
|
class DrawTarget;
|
|
} // namespace gfx
|
|
} // namespace mozilla
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
namespace ImageDataSerializer {
|
|
|
|
// RGB
|
|
|
|
int32_t ComputeRGBStride(gfx::SurfaceFormat aFormat, int32_t aWidth);
|
|
|
|
int32_t GetRGBStride(const RGBDescriptor& aDescriptor);
|
|
|
|
uint32_t ComputeRGBBufferSize(gfx::IntSize aSize, gfx::SurfaceFormat aFormat);
|
|
|
|
// YCbCr
|
|
|
|
/// This function is meant as a helper to know how much shared memory we need
|
|
/// to allocate in a shmem in order to place a shared YCbCr image blob of
|
|
/// given dimensions.
|
|
uint32_t ComputeYCbCrBufferSize(const gfx::IntSize& aYSize, int32_t aYStride,
|
|
const gfx::IntSize& aCbCrSize,
|
|
int32_t aCbCrStride);
|
|
uint32_t ComputeYCbCrBufferSize(const gfx::IntSize& aYSize, int32_t aYStride,
|
|
const gfx::IntSize& aCbCrSize,
|
|
int32_t aCbCrStride, uint32_t aYOffset,
|
|
uint32_t aCbOffset, uint32_t aCrOffset);
|
|
uint32_t ComputeYCbCrBufferSize(uint32_t aBufferSize);
|
|
|
|
void ComputeYCbCrOffsets(int32_t yStride, int32_t yHeight, int32_t cbCrStride,
|
|
int32_t cbCrHeight, uint32_t& outYOffset,
|
|
uint32_t& outCbOffset, uint32_t& outCrOffset);
|
|
|
|
gfx::SurfaceFormat FormatFromBufferDescriptor(
|
|
const BufferDescriptor& aDescriptor);
|
|
|
|
gfx::IntSize SizeFromBufferDescriptor(const BufferDescriptor& aDescriptor);
|
|
|
|
gfx::IntRect RectFromBufferDescriptor(const BufferDescriptor& aDescriptor);
|
|
|
|
Maybe<gfx::IntSize> CbCrSizeFromBufferDescriptor(
|
|
const BufferDescriptor& aDescriptor);
|
|
|
|
Maybe<int32_t> YStrideFromBufferDescriptor(const BufferDescriptor& aDescriptor);
|
|
|
|
Maybe<int32_t> CbCrStrideFromBufferDescriptor(
|
|
const BufferDescriptor& aDescriptor);
|
|
|
|
Maybe<gfx::YUVColorSpace> YUVColorSpaceFromBufferDescriptor(
|
|
const BufferDescriptor& aDescriptor);
|
|
|
|
Maybe<gfx::ColorDepth> ColorDepthFromBufferDescriptor(
|
|
const BufferDescriptor& aDescriptor);
|
|
|
|
Maybe<gfx::ColorRange> ColorRangeFromBufferDescriptor(
|
|
const BufferDescriptor& aDescriptor);
|
|
|
|
Maybe<StereoMode> StereoModeFromBufferDescriptor(
|
|
const BufferDescriptor& aDescriptor);
|
|
|
|
uint8_t* GetYChannel(uint8_t* aBuffer, const YCbCrDescriptor& aDescriptor);
|
|
|
|
uint8_t* GetCbChannel(uint8_t* aBuffer, const YCbCrDescriptor& aDescriptor);
|
|
|
|
uint8_t* GetCrChannel(uint8_t* aBuffer, const YCbCrDescriptor& aDescriptor);
|
|
|
|
already_AddRefed<gfx::DataSourceSurface> DataSourceSurfaceFromYCbCrDescriptor(
|
|
uint8_t* aBuffer, const YCbCrDescriptor& aDescriptor,
|
|
gfx::DataSourceSurface* aSurface = nullptr);
|
|
|
|
void ConvertAndScaleFromYCbCrDescriptor(uint8_t* aBuffer,
|
|
const YCbCrDescriptor& aDescriptor,
|
|
const gfx::SurfaceFormat& aDestFormat,
|
|
const gfx::IntSize& aDestSize,
|
|
unsigned char* aDestBuffer,
|
|
int32_t aStride);
|
|
|
|
} // namespace ImageDataSerializer
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|
|
|
|
#endif
|