nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1451297. r=nical

Browse source
This commit is contained in:
Andrew Osmond 2018-05-22 11:25:49 -04:00
parent 2698440ab3
commit 1f74824f6b
3 changed files with 46 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

35
gfx/layers/ImageDataSerializer.cpp
View file

@ -78,6 +78,41 @@ ComputeYCbCrBufferSize(const gfx::IntSize& aYSize, int32_t aYStride,
2 * GetAlignedStride<4>(aCbCrSize.height, aCbCrStride); 2 * GetAlignedStride<4>(aCbCrSize.height, 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)
{
MOZ_ASSERT(aYSize.height >= 0 && aYSize.width >= 0);
if (aYSize.height < 0 || aYSize.width < 0 || aCbCrSize.height < 0 || aCbCrSize.width < 0 ||
!gfx::Factory::AllowedSurfaceSize(IntSize(aYStride, aYSize.height)) ||
!gfx::Factory::AllowedSurfaceSize(IntSize(aCbCrStride, aCbCrSize.height))) {
return 0;
}
uint32_t yLength = GetAlignedStride<4>(aYStride, aYSize.height);
uint32_t cbCrLength = GetAlignedStride<4>(aCbCrStride, aCbCrSize.height);
if (yLength == 0 || cbCrLength == 0) {
return 0;
}
CheckedInt<uint32_t> yEnd = aYOffset;
yEnd += yLength;
CheckedInt<uint32_t> cbEnd = aCbOffset;
cbEnd += cbCrLength;
CheckedInt<uint32_t> crEnd = aCrOffset;
crEnd += cbCrLength;
if (!yEnd.isValid() || !cbEnd.isValid() || !crEnd.isValid() ||
yEnd.value() > aCbOffset || cbEnd.value() > aCrOffset) {
return 0;
}
return crEnd.value();
}
uint32_t uint32_t
ComputeYCbCrBufferSize(uint32_t aBufferSize) ComputeYCbCrBufferSize(uint32_t aBufferSize)
{ {

7
gfx/layers/ImageDataSerializer.h
View file

@ -44,6 +44,13 @@ uint32_t ComputeYCbCrBufferSize(const gfx::IntSize& aYSize,
int32_t aYStride, int32_t aYStride,
const gfx::IntSize& aCbCrSize, const gfx::IntSize& aCbCrSize,
int32_t aCbCrStride); 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); uint32_t ComputeYCbCrBufferSize(uint32_t aBufferSize);
void ComputeYCbCrOffsets(int32_t yStride, int32_t yHeight, void ComputeYCbCrOffsets(int32_t yStride, int32_t yHeight,

6
gfx/layers/composite/TextureHost.cpp
View file

@ -292,7 +292,9 @@ CreateBackendIndependentTextureHost(const SurfaceDescriptor& aDesc,
const YCbCrDescriptor& ycbcr = desc.get_YCbCrDescriptor(); const YCbCrDescriptor& ycbcr = desc.get_YCbCrDescriptor();
reqSize = reqSize =
ImageDataSerializer::ComputeYCbCrBufferSize(ycbcr.ySize(), ycbcr.yStride(), ImageDataSerializer::ComputeYCbCrBufferSize(ycbcr.ySize(), ycbcr.yStride(),
ycbcr.cbCrSize(), ycbcr.cbCrStride()); ycbcr.cbCrSize(), ycbcr.cbCrStride(),
ycbcr.yOffset(), ycbcr.cbOffset(),
ycbcr.crOffset());
break; break;
} }
case BufferDescriptor::TRGBDescriptor: { case BufferDescriptor::TRGBDescriptor: {
@ -305,7 +307,7 @@ CreateBackendIndependentTextureHost(const SurfaceDescriptor& aDesc,
MOZ_CRASH("GFX: Bad descriptor"); MOZ_CRASH("GFX: Bad descriptor");
} }
if (bufSize < reqSize) { if (reqSize == 0 || bufSize < reqSize) {
NS_ERROR("A client process gave a shmem too small to fit for its descriptor!"); NS_ERROR("A client process gave a shmem too small to fit for its descriptor!");
return nullptr; return nullptr;
} }