tsai
/
ImageSharp
mirror of https://github.com/SixLabors/ImageSharp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Renaming Superblock variables

pull/2633/head
Ynse Hoornenborg 2 years ago
parent
441949fe68
commit
5d41465ef8
4 changed files with 45 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/ImageSharp/Formats/Heif/Av1/Av1Math.cs
  2. 72
      src/ImageSharp/Formats/Heif/Av1/OpenBitstreamUnit/ObuReader.cs
  3. 8
      src/ImageSharp/Formats/Heif/Av1/Tiling/Av1ParseAboveNeighbor4x4Context.cs
  4. 8
      src/ImageSharp/Formats/Heif/Av1/Tiling/Av1ParseLeftNeighbor4x4Context.cs

4
src/ImageSharp/Formats/Heif/Av1/Av1Math.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) Six Labors.
// Licensed under the Six Labors Split License.
namespace SixLabors.ImageSharp.Formats.Heif.Av1;
internal static class Av1Math
@ -141,4 +142,7 @@ internal static class Av1Math
internal static int Clamp(int value, int low, int high)
=> value < low ? low : (value > high ? high : value);
internal static int DivideLog2Ceiling(int value, int n)
=> (value + (1 << n) - 1) >> n;
}

72
src/ImageSharp/Formats/Heif/Av1/OpenBitstreamUnit/ObuReader.cs
View File

@ -694,21 +694,21 @@ internal class ObuReader
private static ObuTileGroupHeader ReadTileInfo(ref Av1BitStreamReader reader, ObuSequenceHeader sequenceHeader, ObuFrameHeader frameInfo)
{
ObuTileGroupHeader tileInfo = new();
int superBlockColumnCount;
int superBlockRowCount;
int superBlockShift = sequenceHeader.SuperblockSizeLog2 - Av1Constants.ModeInfoSizeLog2;
superBlockColumnCount = (frameInfo.ModeInfoColumnCount + sequenceHeader.SuperblockModeInfoSize - 1) >> superBlockShift;
superBlockRowCount = (frameInfo.ModeInfoRowCount + sequenceHeader.SuperblockModeInfoSize - 1) >> superBlockShift;
int superBlockSizeLog2 = superBlockShift + 2;
int maxTileAreaOfSuperBlock = Av1Constants.MaxTileArea >> (2 * superBlockSizeLog2);
tileInfo.MaxTileWidthSuperBlock = Av1Constants.MaxTileWidth >> superBlockSizeLog2;
tileInfo.MaxTileHeightSuperBlock = (Av1Constants.MaxTileArea / Av1Constants.MaxTileWidth) >> superBlockSizeLog2;
tileInfo.MinLog2TileColumnCount = TileLog2(tileInfo.MaxTileWidthSuperBlock, superBlockColumnCount);
tileInfo.MaxLog2TileColumnCount = TileLog2(1, Math.Min(superBlockColumnCount, Av1Constants.MaxTileColumnCount));
tileInfo.MaxLog2TileRowCount = TileLog2(1, Math.Min(superBlockRowCount, Av1Constants.MaxTileRowCount));
tileInfo.MinLog2TileCount = Math.Max(tileInfo.MinLog2TileColumnCount, TileLog2(maxTileAreaOfSuperBlock, superBlockColumnCount * superBlockRowCount));
int superblockColumnCount;
int superblockRowCount;
int superblockSizeLog2 = sequenceHeader.SuperblockSizeLog2;
int superblockShift = superblockSizeLog2 - Av1Constants.ModeInfoSizeLog2;
superblockColumnCount = (frameInfo.ModeInfoColumnCount + sequenceHeader.SuperblockModeInfoSize - 1) >> superblockShift;
superblockRowCount = (frameInfo.ModeInfoRowCount + sequenceHeader.SuperblockModeInfoSize - 1) >> superblockShift;
int maxTileAreaOfSuperBlock = Av1Constants.MaxTileArea >> (superblockSizeLog2 << 1);
tileInfo.MaxTileWidthSuperBlock = Av1Constants.MaxTileWidth >> superblockSizeLog2;
tileInfo.MaxTileHeightSuperBlock = (Av1Constants.MaxTileArea / Av1Constants.MaxTileWidth) >> superblockSizeLog2;
tileInfo.MinLog2TileColumnCount = TileLog2(tileInfo.MaxTileWidthSuperBlock, superblockColumnCount);
tileInfo.MaxLog2TileColumnCount = TileLog2(1, Math.Min(superblockColumnCount, Av1Constants.MaxTileColumnCount));
tileInfo.MaxLog2TileRowCount = TileLog2(1, Math.Min(superblockRowCount, Av1Constants.MaxTileRowCount));
tileInfo.MinLog2TileCount = Math.Max(tileInfo.MinLog2TileColumnCount, TileLog2(maxTileAreaOfSuperBlock, superblockColumnCount * superblockRowCount));
tileInfo.HasUniformTileSpacing = reader.ReadBoolean();
if (tileInfo.HasUniformTileSpacing)
{
@ -725,17 +725,13 @@ internal class ObuReader
}
}
int tileWidthSuperBlock = (superBlockColumnCount + (1 << tileInfo.TileColumnCountLog2) - 1) >> tileInfo.TileColumnCountLog2;
if (tileWidthSuperBlock > tileInfo.MaxTileWidthSuperBlock)
{
throw new ImageFormatException("Invalid tile width specified.");
}
int tileWidthSuperblock = Av1Math.DivideLog2Ceiling(superblockColumnCount, tileInfo.TileColumnCountLog2);
DebugGuard.MustBeLessThanOrEqualTo(tileWidthSuperblock, tileInfo.MaxTileWidthSuperBlock, nameof(tileWidthSuperblock));
int i = 0;
tileInfo.TileColumnStartModeInfo = new int[superBlockColumnCount + 1];
for (int startSuperBlock = 0; startSuperBlock < superBlockColumnCount; startSuperBlock += tileWidthSuperBlock)
tileInfo.TileColumnStartModeInfo = new int[superblockColumnCount + 1];
for (int startSuperBlock = 0; startSuperBlock < superblockColumnCount; startSuperBlock += tileWidthSuperblock)
{
tileInfo.TileColumnStartModeInfo[i] = startSuperBlock << superBlockShift;
tileInfo.TileColumnStartModeInfo[i] = startSuperBlock << superblockShift;
i++;
}
@ -756,17 +752,17 @@ internal class ObuReader
}
}
int tileHeightSuperBlock = (superBlockRowCount + (1 << tileInfo.TileRowCountLog2) - 1) >> tileInfo.TileRowCountLog2;
int tileHeightSuperBlock = Av1Math.DivideLog2Ceiling(superblockRowCount, tileInfo.TileRowCountLog2);
if (tileHeightSuperBlock > tileInfo.MaxTileHeightSuperBlock)
{
throw new ImageFormatException("Invalid tile height specified.");
}
i = 0;
tileInfo.TileRowStartModeInfo = new int[superBlockRowCount + 1];
for (int startSuperBlock = 0; startSuperBlock < superBlockRowCount; startSuperBlock += tileHeightSuperBlock)
tileInfo.TileRowStartModeInfo = new int[superblockRowCount + 1];
for (int startSuperBlock = 0; startSuperBlock < superblockRowCount; startSuperBlock += tileHeightSuperBlock)
{
tileInfo.TileRowStartModeInfo[i] = startSuperBlock << superBlockShift;
tileInfo.TileRowStartModeInfo[i] = startSuperBlock << superblockShift;
i++;
}
@ -778,16 +774,16 @@ internal class ObuReader
uint widestTileSuperBlock = 0U;
int startSuperBlock = 0;
int i = 0;
for (; startSuperBlock < superBlockColumnCount; i++)
for (; startSuperBlock < superblockColumnCount; i++)
{
tileInfo.TileColumnStartModeInfo[i] = startSuperBlock << superBlockShift;
uint maxWidth = (uint)Math.Min(superBlockColumnCount - startSuperBlock, tileInfo.MaxTileWidthSuperBlock);
tileInfo.TileColumnStartModeInfo[i] = startSuperBlock << superblockShift;
uint maxWidth = (uint)Math.Min(superblockColumnCount - startSuperBlock, tileInfo.MaxTileWidthSuperBlock);
uint widthInSuperBlocks = reader.ReadNonSymmetric(maxWidth) + 1;
widestTileSuperBlock = Math.Max(widthInSuperBlocks, widestTileSuperBlock);
startSuperBlock += (int)widthInSuperBlocks;
}
if (startSuperBlock != superBlockColumnCount)
if (startSuperBlock != superblockColumnCount)
{
throw new ImageFormatException("Super block tiles width does not add up to total width.");
}
@ -797,26 +793,26 @@ internal class ObuReader
tileInfo.TileColumnCountLog2 = TileLog2(1, tileInfo.TileColumnCount);
if (tileInfo.MinLog2TileCount > 0)
{
maxTileAreaOfSuperBlock = (superBlockRowCount * superBlockColumnCount) >> (tileInfo.MinLog2TileCount + 1);
maxTileAreaOfSuperBlock = (superblockRowCount * superblockColumnCount) >> (tileInfo.MinLog2TileCount + 1);
}
else
{
maxTileAreaOfSuperBlock = superBlockRowCount * superBlockColumnCount;
maxTileAreaOfSuperBlock = superblockRowCount * superblockColumnCount;
}
DebugGuard.MustBeGreaterThan(widestTileSuperBlock, 0U, nameof(widestTileSuperBlock));
tileInfo.MaxTileHeightSuperBlock = Math.Max(maxTileAreaOfSuperBlock / (int)widestTileSuperBlock, 1);
startSuperBlock = 0;
for (i = 0; startSuperBlock < superBlockRowCount; i++)
for (i = 0; startSuperBlock < superblockRowCount; i++)
{
tileInfo.TileRowStartModeInfo[i] = startSuperBlock << superBlockShift;
uint maxHeight = (uint)Math.Min(superBlockRowCount - startSuperBlock, tileInfo.MaxTileHeightSuperBlock);
tileInfo.TileRowStartModeInfo[i] = startSuperBlock << superblockShift;
uint maxHeight = (uint)Math.Min(superblockRowCount - startSuperBlock, tileInfo.MaxTileHeightSuperBlock);
uint heightInSuperBlocks = reader.ReadNonSymmetric(maxHeight) + 1;
startSuperBlock += (int)heightInSuperBlocks;
}
if (startSuperBlock != superBlockRowCount)
if (startSuperBlock != superblockRowCount)
{
throw new ImageFormatException("Super block tiles height does not add up to total height.");
}

8
src/ImageSharp/Formats/Heif/Av1/Tiling/Av1ParseAboveNeighbor4x4Context.cs
View File

@ -69,10 +69,9 @@ internal class Av1ParseAboveNeighbor4x4Context
int startIndex = modeInfoLocation.X - tileLoc.ModeInfoColumnStart;
int bw = blockSize.Get4x4WideCount();
int value = Av1PartitionContext.GetAboveContext(subSize);
for (int i = 0; i < bw; i++)
{
this.AbovePartitionWidth[startIndex + i] = value;
}
DebugGuard.MustBeLessThanOrEqualTo(startIndex, this.AboveTransformWidth.Length - bw, nameof(startIndex));
Array.Fill(this.AbovePartitionWidth, value, startIndex, bw);
}
public void UpdateTransformation(Point modeInfoLocation, Av1TileInfo tileInfo, Av1TransformSize transformSize, Av1BlockSize blockSize, bool skip)
@ -85,6 +84,7 @@ internal class Av1ParseAboveNeighbor4x4Context
transformWidth = n4w << Av1Constants.ModeInfoSizeLog2;
}
DebugGuard.MustBeLessThanOrEqualTo(startIndex, this.AboveTransformWidth.Length - n4w, nameof(startIndex));
Array.Fill(this.AboveTransformWidth, transformWidth, startIndex, n4w);
}

8
src/ImageSharp/Formats/Heif/Av1/Tiling/Av1ParseLeftNeighbor4x4Context.cs
View File

@ -69,10 +69,8 @@ internal class Av1ParseLeftNeighbor4x4Context
int startIndex = (modeInfoLocation.Y - superblockInfo.Position.Y) & Av1PartitionContext.Mask;
int bh = blockSize.Get4x4HighCount();
int value = Av1PartitionContext.GetLeftContext(subSize);
for (int i = 0; i < bh; i++)
{
this.LeftPartitionHeight[startIndex + i] = value;
}
DebugGuard.MustBeLessThanOrEqualTo(startIndex, this.LeftTransformHeight.Length - bh, nameof(startIndex));
Array.Fill(this.LeftPartitionHeight, value, startIndex, bh);
}
public void UpdateTransformation(Point modeInfoLocation, Av1SuperblockInfo superblockInfo, Av1TransformSize transformSize, Av1BlockSize blockSize, bool skip)
@ -85,7 +83,7 @@ internal class Av1ParseLeftNeighbor4x4Context
transformHeight = n4h << Av1Constants.ModeInfoSizeLog2;
}
DebugGuard.MustBeLessThanOrEqualTo(startIndex + n4h, this.LeftTransformHeight.Length, nameof(startIndex));
DebugGuard.MustBeLessThanOrEqualTo(startIndex, this.LeftTransformHeight.Length - n4h, nameof(startIndex));
Array.Fill(this.LeftTransformHeight, transformHeight, startIndex, n4h);
}

Write Preview
Loading…
Cancel
Save