Namespace update

2 years ago · 056814f0b3
26 changed files with 61 additions and 30 deletions
--- a/src/ImageSharp/Formats/Heif/Av1/Av1Decoder.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Av1Decoder.cs
@ -2,7 +2,8 @@
 // Licensed under the Six Labors Split License.

 using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;
-using SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+using SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;
+using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;

 namespace SixLabors.ImageSharp.Formats.Heif.Av1;

@ -10,6 +11,7 @@ internal class Av1Decoder : IAv1TileReader
 {
    private readonly ObuReader obuReader;
    private Av1TileReader? tileReader;
+    private Av1FrameDecoder? frameDecoder;

    public Av1Decoder() => this.obuReader = new();

@ -23,9 +25,13 @@ internal class Av1Decoder : IAv1TileReader
    {
        Av1BitStreamReader reader = new(buffer);
        this.obuReader.ReadAll(ref reader, buffer.Length, this, false);
-        this.FrameBuffer = this.tileReader?.FrameBuffer;
+        Guard.NotNull(this.tileReader, nameof(this.tileReader));
+        Guard.NotNull(this.SequenceHeader, nameof(this.SequenceHeader));
+        Guard.NotNull(this.FrameHeader, nameof(this.FrameHeader));

-        // TODO: Decode the FrameBuffer
+        this.FrameBuffer = this.tileReader.FrameBuffer;
+        this.frameDecoder = new(this.SequenceHeader, this.FrameHeader, this.FrameBuffer);
+        this.frameDecoder.DecodeFrame();
    }

    public void ReadTile(Span<byte> tileData, int tileNum)
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1BlockModeInfo.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1BlockModeInfo.cs
@ -3,7 +3,7 @@

 using SixLabors.ImageSharp.Formats.Heif.Av1.Prediction;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1BlockModeInfo
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1DefaultDistributions.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1DefaultDistributions.cs
@ -3,7 +3,7 @@

 using System;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal static class Av1DefaultDistributions
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1Distribution.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1Distribution.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 /// <summary>
 /// Class representing the probability distribution used for symbol coding.
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1FilterIntraMode.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1FilterIntraMode.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal enum Av1FilterIntraMode
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1FrameBuffer.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1FrameBuffer.cs
@ -1,12 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-using System;
-using System.Reflection.Metadata.Ecma335;
 using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;
-using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal partial class Av1FrameBuffer
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1FrameModeInfoMap.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1FrameModeInfoMap.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal partial class Av1FrameBuffer
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1IntraFilterModeInfo.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1IntraFilterModeInfo.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1IntraFilterModeInfo
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1NzMap.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1NzMap.cs
@ -3,7 +3,7 @@

 using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal static class Av1NzMap
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1ParseAboveNeighbor4x4Context.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1ParseAboveNeighbor4x4Context.cs
@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;
 using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1ParseAboveNeighbor4x4Context
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1ParseLeftNeighbor4x4Context.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1ParseLeftNeighbor4x4Context.cs
@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;
 using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1ParseLeftNeighbor4x4Context
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1PartitionContext.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1PartitionContext.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 // Generates 5 bit field in which each bit set to 1 represents
 // a BlockSize partition  11111 means we split 128x128, 64x64, 32x32, 16x16
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1PartitionInfo.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1PartitionInfo.cs
@ -3,7 +3,7 @@

 using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1PartitionInfo
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1PlaneType.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1PlaneType.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal enum Av1PlaneType : int
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SuperblockInfo.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SuperblockInfo.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1SuperblockInfo
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SymbolDecoder.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SymbolDecoder.cs
@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.Formats.Heif.Av1.Prediction;
 using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal ref struct Av1SymbolDecoder
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SymbolEncoder.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SymbolEncoder.cs
@ -3,7 +3,7 @@

 using System.Buffers;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1SymbolEncoder : IDisposable
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SymbolReader.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SymbolReader.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal ref struct Av1SymbolReader
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SymbolWriter.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1SymbolWriter.cs
@ -4,7 +4,7 @@
 using System.Buffers;
 using SixLabors.ImageSharp.Memory;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1SymbolWriter : IDisposable
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1TileInfo.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1TileInfo.cs
@ -3,7 +3,7 @@

 using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1TileInfo
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1TileReader.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1TileReader.cs
@ -6,7 +6,7 @@ using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;
 using SixLabors.ImageSharp.Formats.Heif.Av1.Prediction;
 using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1TileReader : IAv1TileReader
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1TransformBlockContext.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1TransformBlockContext.cs
@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 internal class Av1TransformBlockContext
 {
--- a/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1TransformInfo.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Tiling/Av1TransformInfo.cs
@ -3,7 +3,7 @@

 using SixLabors.ImageSharp.Formats.Heif.Av1.Transform;

-namespace SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 /// <summary>
 /// Information of a single Transform Block.
--- a/src/ImageSharp/Formats/Heif/Av1/Transform/Av1FrameDecoder.cs
+++ b/src/ImageSharp/Formats/Heif/Av1/Transform/Av1FrameDecoder.cs
@ -0,0 +1,28 @@
+// Copyright (c) Six Labors.
+// Licensed under the Six Labors Split License.
+
+using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;
+using SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;
+
+namespace SixLabors.ImageSharp.Formats.Heif.Av1.Transform;
+
+internal class Av1FrameDecoder
+{
+    private ObuSequenceHeader sequenceHeader;
+    private ObuFrameHeader frameHeader;
+    private Av1FrameBuffer frameBuffer;
+
+    public Av1FrameDecoder(ObuSequenceHeader sequenceHeader, ObuFrameHeader frameHeader, Av1FrameBuffer frameBuffer)
+    {
+        this.sequenceHeader = sequenceHeader;
+        this.frameHeader = frameHeader;
+        this.frameBuffer = frameBuffer;
+    }
+
+    public void DecodeFrame()
+    {
+        Guard.NotNull(this.sequenceHeader);
+
+        // TODO: Implement.
+    }
+}
--- a/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1TilingTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Heif/Av1/Av1TilingTests.cs
@ -3,7 +3,7 @@

 using SixLabors.ImageSharp.Formats.Heif.Av1;
 using SixLabors.ImageSharp.Formats.Heif.Av1.OpenBitstreamUnit;
-using SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+using SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;

 namespace SixLabors.ImageSharp.Tests.Formats.Heif.Av1;

--- a/tests/ImageSharp.Tests/Formats/Heif/Av1/SymbolTest.cs
+++ b/tests/ImageSharp.Tests/Formats/Heif/Av1/SymbolTest.cs
@ -3,7 +3,7 @@

 using System.Buffers;
 using SixLabors.ImageSharp.Formats.Heif.Av1;
-using SixLabors.ImageSharp.Formats.Heif.Av1.Symbol;
+using SixLabors.ImageSharp.Formats.Heif.Av1.Tiling;
 using SixLabors.ImageSharp.Memory;

 namespace SixLabors.ImageSharp.Tests.Formats.Heif.Av1;