mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-07-01 21:01:18 +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
192 lines
6.1 KiB
C++
192 lines
6.1 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 <stdint.h> // for uint8_t, uint32_t
|
|
#include "BasicLayers.h" // for BasicLayerManager
|
|
#include "ImageContainer.h" // for PlanarYCbCrImage, etc
|
|
#include "ImageTypes.h" // for ImageFormat, etc
|
|
#include "cairo.h" // for cairo_user_data_key_t
|
|
#include "gfxASurface.h" // for gfxASurface, etc
|
|
#include "gfxPlatform.h" // for gfxPlatform, gfxImageFormat
|
|
#include "gfxUtils.h" // for gfxUtils
|
|
#include "mozilla/CheckedInt.h" // for bounds checks
|
|
#include "mozilla/mozalloc.h" // for operator delete[], etc
|
|
#include "nsAutoPtr.h" // for nsRefPtr, nsAutoArrayPtr
|
|
#include "nsAutoRef.h" // for nsCountedRef
|
|
#include "nsCOMPtr.h" // for already_AddRefed
|
|
#include "nsDebug.h" // for NS_ERROR, NS_ASSERTION
|
|
#include "nsISupportsImpl.h" // for Image::Release, etc
|
|
#include "nsThreadUtils.h" // for NS_IsMainThread
|
|
#include "mozilla/gfx/Point.h" // for IntSize
|
|
#include "gfx2DGlue.h"
|
|
#include "YCbCrUtils.h" // for YCbCr conversions
|
|
#ifdef XP_MACOSX
|
|
#include "gfxQuartzImageSurface.h"
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
class BasicPlanarYCbCrImage : public PlanarYCbCrImage
|
|
{
|
|
public:
|
|
BasicPlanarYCbCrImage(const gfx::IntSize& aScaleHint, gfxImageFormat aOffscreenFormat, BufferRecycleBin *aRecycleBin)
|
|
: PlanarYCbCrImage(aRecycleBin)
|
|
, mScaleHint(aScaleHint)
|
|
, mDelayedConversion(false)
|
|
{
|
|
SetOffscreenFormat(aOffscreenFormat);
|
|
}
|
|
|
|
~BasicPlanarYCbCrImage()
|
|
{
|
|
if (mDecodedBuffer) {
|
|
// Right now this only happens if the Image was never drawn, otherwise
|
|
// this will have been tossed away at surface destruction.
|
|
mRecycleBin->RecycleBuffer(mDecodedBuffer.forget(), mSize.height * mStride);
|
|
}
|
|
}
|
|
|
|
virtual void SetData(const Data& aData) override;
|
|
virtual void SetDelayedConversion(bool aDelayed) override { mDelayedConversion = aDelayed; }
|
|
|
|
TemporaryRef<gfx::SourceSurface> GetAsSourceSurface() override;
|
|
|
|
virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override
|
|
{
|
|
return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
|
|
}
|
|
|
|
virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override
|
|
{
|
|
size_t size = PlanarYCbCrImage::SizeOfExcludingThis(aMallocSizeOf);
|
|
size += mDecodedBuffer.SizeOfExcludingThis(aMallocSizeOf);
|
|
return size;
|
|
}
|
|
|
|
private:
|
|
nsAutoArrayPtr<uint8_t> mDecodedBuffer;
|
|
gfx::IntSize mScaleHint;
|
|
int mStride;
|
|
bool mDelayedConversion;
|
|
};
|
|
|
|
class BasicImageFactory : public ImageFactory
|
|
{
|
|
public:
|
|
BasicImageFactory() {}
|
|
|
|
virtual already_AddRefed<Image> CreateImage(ImageFormat aFormat,
|
|
const gfx::IntSize &aScaleHint,
|
|
BufferRecycleBin *aRecycleBin)
|
|
{
|
|
nsRefPtr<Image> image;
|
|
if (aFormat == ImageFormat::PLANAR_YCBCR) {
|
|
image = new BasicPlanarYCbCrImage(aScaleHint, gfxPlatform::GetPlatform()->GetOffscreenFormat(), aRecycleBin);
|
|
return image.forget();
|
|
}
|
|
|
|
return ImageFactory::CreateImage(aFormat, aScaleHint, aRecycleBin);
|
|
}
|
|
};
|
|
|
|
void
|
|
BasicPlanarYCbCrImage::SetData(const Data& aData)
|
|
{
|
|
PlanarYCbCrImage::SetData(aData);
|
|
|
|
if (mDelayedConversion) {
|
|
return;
|
|
}
|
|
|
|
// Do some sanity checks to prevent integer overflow
|
|
if (aData.mYSize.width > PlanarYCbCrImage::MAX_DIMENSION ||
|
|
aData.mYSize.height > PlanarYCbCrImage::MAX_DIMENSION) {
|
|
NS_ERROR("Illegal image source width or height");
|
|
return;
|
|
}
|
|
|
|
gfx::SurfaceFormat format = gfx::ImageFormatToSurfaceFormat(GetOffscreenFormat());
|
|
|
|
gfx::IntSize size(mScaleHint);
|
|
gfx::GetYCbCrToRGBDestFormatAndSize(aData, format, size);
|
|
if (size.width > PlanarYCbCrImage::MAX_DIMENSION ||
|
|
size.height > PlanarYCbCrImage::MAX_DIMENSION) {
|
|
NS_ERROR("Illegal image dest width or height");
|
|
return;
|
|
}
|
|
|
|
gfxImageFormat iFormat = gfx::SurfaceFormatToImageFormat(format);
|
|
mStride = gfxASurface::FormatStrideForWidth(iFormat, size.width);
|
|
mozilla::CheckedInt32 requiredBytes =
|
|
mozilla::CheckedInt32(size.height) * mozilla::CheckedInt32(mStride);
|
|
if (!requiredBytes.isValid()) {
|
|
// invalid size
|
|
return;
|
|
}
|
|
mDecodedBuffer = AllocateBuffer(requiredBytes.value());
|
|
if (!mDecodedBuffer) {
|
|
// out of memory
|
|
return;
|
|
}
|
|
|
|
gfx::ConvertYCbCrToRGB(aData, format, size, mDecodedBuffer, mStride);
|
|
SetOffscreenFormat(iFormat);
|
|
mSize = size;
|
|
}
|
|
|
|
TemporaryRef<gfx::SourceSurface>
|
|
BasicPlanarYCbCrImage::GetAsSourceSurface()
|
|
{
|
|
NS_ASSERTION(NS_IsMainThread(), "Must be main thread");
|
|
|
|
if (mSourceSurface) {
|
|
RefPtr<gfx::SourceSurface> surface(mSourceSurface);
|
|
return surface.forget();
|
|
}
|
|
|
|
if (!mDecodedBuffer) {
|
|
return PlanarYCbCrImage::GetAsSourceSurface();
|
|
}
|
|
|
|
gfxImageFormat format = GetOffscreenFormat();
|
|
|
|
RefPtr<gfx::SourceSurface> surface;
|
|
{
|
|
// Create a DrawTarget so that we can own the data inside mDecodeBuffer.
|
|
// We create the target out of mDecodedBuffer, and get a snapshot from it.
|
|
// The draw target is destroyed on scope exit and the surface owns the data.
|
|
RefPtr<gfx::DrawTarget> drawTarget
|
|
= gfxPlatform::GetPlatform()->CreateDrawTargetForData(mDecodedBuffer,
|
|
mSize,
|
|
mStride,
|
|
gfx::ImageFormatToSurfaceFormat(format));
|
|
if (!drawTarget) {
|
|
return nullptr;
|
|
}
|
|
|
|
surface = drawTarget->Snapshot();
|
|
}
|
|
|
|
mRecycleBin->RecycleBuffer(mDecodedBuffer.forget(), mSize.height * mStride);
|
|
|
|
mSourceSurface = surface;
|
|
return surface.forget();
|
|
}
|
|
|
|
|
|
ImageFactory*
|
|
BasicLayerManager::GetImageFactory()
|
|
{
|
|
if (!mFactory) {
|
|
mFactory = new BasicImageFactory();
|
|
}
|
|
|
|
return mFactory.get();
|
|
}
|
|
|
|
}
|
|
}
|