mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-14 20:03:29 +00:00
AK: Move bit streams from LibCore
This commit is contained in:
parent
94f139c111
commit
2470dd3bb5
|
@ -7,22 +7,15 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <AK/ByteBuffer.h>
|
#include <AK/ByteBuffer.h>
|
||||||
#include <AK/Concepts.h>
|
|
||||||
#include <AK/Error.h>
|
|
||||||
#include <AK/MaybeOwned.h>
|
#include <AK/MaybeOwned.h>
|
||||||
#include <AK/NonnullOwnPtr.h>
|
|
||||||
#include <AK/NonnullRefPtr.h>
|
|
||||||
#include <AK/OwnPtr.h>
|
#include <AK/OwnPtr.h>
|
||||||
#include <AK/Span.h>
|
#include <AK/Stream.h>
|
||||||
#include <AK/StdLibExtraDetails.h>
|
|
||||||
#include <AK/Types.h>
|
|
||||||
#include <LibCore/Stream.h>
|
|
||||||
|
|
||||||
namespace Core::Stream {
|
namespace AK {
|
||||||
|
|
||||||
/// A stream wrapper class that allows you to read arbitrary amounts of bits
|
/// A stream wrapper class that allows you to read arbitrary amounts of bits
|
||||||
/// in big-endian order from another stream.
|
/// in big-endian order from another stream.
|
||||||
class BigEndianInputBitStream : public AK::Stream {
|
class BigEndianInputBitStream : public Stream {
|
||||||
public:
|
public:
|
||||||
static ErrorOr<NonnullOwnPtr<BigEndianInputBitStream>> construct(MaybeOwned<Stream> stream)
|
static ErrorOr<NonnullOwnPtr<BigEndianInputBitStream>> construct(MaybeOwned<Stream> stream)
|
||||||
{
|
{
|
||||||
|
@ -131,7 +124,7 @@ private:
|
||||||
|
|
||||||
/// A stream wrapper class that allows you to read arbitrary amounts of bits
|
/// A stream wrapper class that allows you to read arbitrary amounts of bits
|
||||||
/// in little-endian order from another stream.
|
/// in little-endian order from another stream.
|
||||||
class LittleEndianInputBitStream : public AK::Stream {
|
class LittleEndianInputBitStream : public Stream {
|
||||||
public:
|
public:
|
||||||
static ErrorOr<NonnullOwnPtr<LittleEndianInputBitStream>> construct(MaybeOwned<Stream> stream)
|
static ErrorOr<NonnullOwnPtr<LittleEndianInputBitStream>> construct(MaybeOwned<Stream> stream)
|
||||||
{
|
{
|
||||||
|
@ -240,7 +233,7 @@ private:
|
||||||
|
|
||||||
/// A stream wrapper class that allows you to write arbitrary amounts of bits
|
/// A stream wrapper class that allows you to write arbitrary amounts of bits
|
||||||
/// in big-endian order to another stream.
|
/// in big-endian order to another stream.
|
||||||
class BigEndianOutputBitStream : public AK::Stream {
|
class BigEndianOutputBitStream : public Stream {
|
||||||
public:
|
public:
|
||||||
static ErrorOr<NonnullOwnPtr<BigEndianOutputBitStream>> construct(MaybeOwned<Stream> stream)
|
static ErrorOr<NonnullOwnPtr<BigEndianOutputBitStream>> construct(MaybeOwned<Stream> stream)
|
||||||
{
|
{
|
||||||
|
@ -323,7 +316,7 @@ private:
|
||||||
|
|
||||||
/// A stream wrapper class that allows you to write arbitrary amounts of bits
|
/// A stream wrapper class that allows you to write arbitrary amounts of bits
|
||||||
/// in little-endian order to another stream.
|
/// in little-endian order to another stream.
|
||||||
class LittleEndianOutputBitStream : public AK::Stream {
|
class LittleEndianOutputBitStream : public Stream {
|
||||||
public:
|
public:
|
||||||
static ErrorOr<NonnullOwnPtr<LittleEndianOutputBitStream>> construct(MaybeOwned<Stream> stream)
|
static ErrorOr<NonnullOwnPtr<LittleEndianOutputBitStream>> construct(MaybeOwned<Stream> stream)
|
||||||
{
|
{
|
|
@ -18,6 +18,8 @@ class ByteBuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
class Bitmap;
|
class Bitmap;
|
||||||
|
class BigEndianInputBitStream;
|
||||||
|
class BigEndianOutputBitStream;
|
||||||
using ByteBuffer = Detail::ByteBuffer<32>;
|
using ByteBuffer = Detail::ByteBuffer<32>;
|
||||||
class CircularBuffer;
|
class CircularBuffer;
|
||||||
class DeprecatedInputStream;
|
class DeprecatedInputStream;
|
||||||
|
@ -31,6 +33,8 @@ class IPv4Address;
|
||||||
class JsonArray;
|
class JsonArray;
|
||||||
class JsonObject;
|
class JsonObject;
|
||||||
class JsonValue;
|
class JsonValue;
|
||||||
|
class LittleEndianInputBitStream;
|
||||||
|
class LittleEndianOutputBitStream;
|
||||||
class StackInfo;
|
class StackInfo;
|
||||||
class DeprecatedFlyString;
|
class DeprecatedFlyString;
|
||||||
class DeprecatedString;
|
class DeprecatedString;
|
||||||
|
@ -152,6 +156,8 @@ class [[nodiscard]] ErrorOr;
|
||||||
using AK::Array;
|
using AK::Array;
|
||||||
using AK::Atomic;
|
using AK::Atomic;
|
||||||
using AK::Badge;
|
using AK::Badge;
|
||||||
|
using AK::BigEndianInputBitStream;
|
||||||
|
using AK::BigEndianOutputBitStream;
|
||||||
using AK::Bitmap;
|
using AK::Bitmap;
|
||||||
using AK::ByteBuffer;
|
using AK::ByteBuffer;
|
||||||
using AK::Bytes;
|
using AK::Bytes;
|
||||||
|
@ -177,6 +183,8 @@ using AK::IPv4Address;
|
||||||
using AK::JsonArray;
|
using AK::JsonArray;
|
||||||
using AK::JsonObject;
|
using AK::JsonObject;
|
||||||
using AK::JsonValue;
|
using AK::JsonValue;
|
||||||
|
using AK::LittleEndianInputBitStream;
|
||||||
|
using AK::LittleEndianOutputBitStream;
|
||||||
using AK::NonnullOwnPtr;
|
using AK::NonnullOwnPtr;
|
||||||
using AK::NonnullOwnPtrVector;
|
using AK::NonnullOwnPtrVector;
|
||||||
using AK::NonnullRefPtr;
|
using AK::NonnullRefPtr;
|
||||||
|
|
|
@ -10,6 +10,7 @@ set(AK_TEST_SOURCES
|
||||||
TestBinarySearch.cpp
|
TestBinarySearch.cpp
|
||||||
TestBitCast.cpp
|
TestBitCast.cpp
|
||||||
TestBitmap.cpp
|
TestBitmap.cpp
|
||||||
|
TestBitStream.cpp
|
||||||
TestBuiltinWrappers.cpp
|
TestBuiltinWrappers.cpp
|
||||||
TestByteBuffer.cpp
|
TestByteBuffer.cpp
|
||||||
TestCharacterTypes.cpp
|
TestCharacterTypes.cpp
|
||||||
|
|
121
Tests/AK/TestBitStream.cpp
Normal file
121
Tests/AK/TestBitStream.cpp
Normal file
|
@ -0,0 +1,121 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023, Tim Schumacher <timschumi@gmx.de>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <AK/BitStream.h>
|
||||||
|
#include <LibCore/MemoryStream.h>
|
||||||
|
#include <LibTest/TestCase.h>
|
||||||
|
|
||||||
|
// Note: This does not do any checks on the internal representation, it just ensures that the behavior of the input and output streams match.
|
||||||
|
TEST_CASE(little_endian_bit_stream_input_output_match)
|
||||||
|
{
|
||||||
|
auto memory_stream = make<Core::Stream::AllocatingMemoryStream>();
|
||||||
|
|
||||||
|
// Note: The bit stream only ever reads from/writes to the underlying stream in one byte chunks,
|
||||||
|
// so testing with sizes that will not trigger a write will yield unexpected results.
|
||||||
|
auto bit_write_stream = MUST(LittleEndianOutputBitStream::construct(MaybeOwned<AK::Stream>(*memory_stream)));
|
||||||
|
auto bit_read_stream = MUST(LittleEndianInputBitStream::construct(MaybeOwned<AK::Stream>(*memory_stream)));
|
||||||
|
|
||||||
|
// Test two mirrored chunks of a fully mirrored pattern to check that we are not dropping bits.
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b1111u, 4));
|
||||||
|
MUST(bit_write_stream->write_bits(0b1111u, 4));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1111u, result);
|
||||||
|
result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1111u, result);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b0000u, 4));
|
||||||
|
MUST(bit_write_stream->write_bits(0b0000u, 4));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b0000u, result);
|
||||||
|
result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b0000u, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test two mirrored chunks of a non-mirrored pattern to check that we are writing bits within a pattern in the correct order.
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
||||||
|
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1000u, result);
|
||||||
|
result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1000u, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test two different chunks to check that we are not confusing their order.
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
||||||
|
MUST(bit_write_stream->write_bits(0b0100u, 4));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1000u, result);
|
||||||
|
result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b0100u, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test a pattern that spans multiple bytes.
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b1101001000100001u, 16));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(16));
|
||||||
|
EXPECT_EQ(0b1101001000100001u, result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Note: This does not do any checks on the internal representation, it just ensures that the behavior of the input and output streams match.
|
||||||
|
TEST_CASE(big_endian_bit_stream_input_output_match)
|
||||||
|
{
|
||||||
|
auto memory_stream = make<Core::Stream::AllocatingMemoryStream>();
|
||||||
|
|
||||||
|
// Note: The bit stream only ever reads from/writes to the underlying stream in one byte chunks,
|
||||||
|
// so testing with sizes that will not trigger a write will yield unexpected results.
|
||||||
|
auto bit_write_stream = MUST(BigEndianOutputBitStream::construct(MaybeOwned<AK::Stream>(*memory_stream)));
|
||||||
|
auto bit_read_stream = MUST(BigEndianInputBitStream::construct(MaybeOwned<AK::Stream>(*memory_stream)));
|
||||||
|
|
||||||
|
// Test two mirrored chunks of a fully mirrored pattern to check that we are not dropping bits.
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b1111u, 4));
|
||||||
|
MUST(bit_write_stream->write_bits(0b1111u, 4));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1111u, result);
|
||||||
|
result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1111u, result);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b0000u, 4));
|
||||||
|
MUST(bit_write_stream->write_bits(0b0000u, 4));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b0000u, result);
|
||||||
|
result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b0000u, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test two mirrored chunks of a non-mirrored pattern to check that we are writing bits within a pattern in the correct order.
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
||||||
|
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1000u, result);
|
||||||
|
result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1000u, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test two different chunks to check that we are not confusing their order.
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
||||||
|
MUST(bit_write_stream->write_bits(0b0100u, 4));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b1000u, result);
|
||||||
|
result = MUST(bit_read_stream->read_bits(4));
|
||||||
|
EXPECT_EQ(0b0100u, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test a pattern that spans multiple bytes.
|
||||||
|
{
|
||||||
|
MUST(bit_write_stream->write_bits(0b1101001000100001u, 16));
|
||||||
|
auto result = MUST(bit_read_stream->read_bits(16));
|
||||||
|
EXPECT_EQ(0b1101001000100001u, result);
|
||||||
|
}
|
||||||
|
}
|
|
@ -7,9 +7,9 @@
|
||||||
#include <LibTest/TestCase.h>
|
#include <LibTest/TestCase.h>
|
||||||
|
|
||||||
#include <AK/Array.h>
|
#include <AK/Array.h>
|
||||||
|
#include <AK/BitStream.h>
|
||||||
#include <AK/Random.h>
|
#include <AK/Random.h>
|
||||||
#include <LibCompress/Deflate.h>
|
#include <LibCompress/Deflate.h>
|
||||||
#include <LibCore/BitStream.h>
|
|
||||||
#include <LibCore/MemoryStream.h>
|
#include <LibCore/MemoryStream.h>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ TEST_CASE(canonical_code_simple)
|
||||||
|
|
||||||
auto const huffman = Compress::CanonicalCode::from_bytes(code).value();
|
auto const huffman = Compress::CanonicalCode::from_bytes(code).value();
|
||||||
auto memory_stream = MUST(Core::Stream::FixedMemoryStream::construct(input));
|
auto memory_stream = MUST(Core::Stream::FixedMemoryStream::construct(input));
|
||||||
auto bit_stream = MUST(Core::Stream::LittleEndianInputBitStream::construct(move(memory_stream)));
|
auto bit_stream = MUST(LittleEndianInputBitStream::construct(move(memory_stream)));
|
||||||
|
|
||||||
for (size_t idx = 0; idx < 9; ++idx)
|
for (size_t idx = 0; idx < 9; ++idx)
|
||||||
EXPECT_EQ(MUST(huffman.read_symbol(*bit_stream)), output[idx]);
|
EXPECT_EQ(MUST(huffman.read_symbol(*bit_stream)), output[idx]);
|
||||||
|
@ -49,7 +49,7 @@ TEST_CASE(canonical_code_complex)
|
||||||
|
|
||||||
auto const huffman = Compress::CanonicalCode::from_bytes(code).value();
|
auto const huffman = Compress::CanonicalCode::from_bytes(code).value();
|
||||||
auto memory_stream = MUST(Core::Stream::FixedMemoryStream::construct(input));
|
auto memory_stream = MUST(Core::Stream::FixedMemoryStream::construct(input));
|
||||||
auto bit_stream = MUST(Core::Stream::LittleEndianInputBitStream::construct(move(memory_stream)));
|
auto bit_stream = MUST(LittleEndianInputBitStream::construct(move(memory_stream)));
|
||||||
|
|
||||||
for (size_t idx = 0; idx < 12; ++idx)
|
for (size_t idx = 0; idx < 12; ++idx)
|
||||||
EXPECT_EQ(MUST(huffman.read_symbol(*bit_stream)), output[idx]);
|
EXPECT_EQ(MUST(huffman.read_symbol(*bit_stream)), output[idx]);
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#include <AK/Format.h>
|
#include <AK/Format.h>
|
||||||
#include <AK/MaybeOwned.h>
|
#include <AK/MaybeOwned.h>
|
||||||
#include <AK/String.h>
|
#include <AK/String.h>
|
||||||
#include <LibCore/BitStream.h>
|
|
||||||
#include <LibCore/EventLoop.h>
|
#include <LibCore/EventLoop.h>
|
||||||
#include <LibCore/LocalServer.h>
|
#include <LibCore/LocalServer.h>
|
||||||
#include <LibCore/MemoryStream.h>
|
#include <LibCore/MemoryStream.h>
|
||||||
|
@ -717,117 +716,3 @@ TEST_CASE(allocating_memory_stream_10kb)
|
||||||
offset += file_span.size();
|
offset += file_span.size();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bit stream tests
|
|
||||||
|
|
||||||
// Note: This does not do any checks on the internal representation, it just ensures that the behavior of the input and output streams match.
|
|
||||||
TEST_CASE(little_endian_bit_stream_input_output_match)
|
|
||||||
{
|
|
||||||
auto memory_stream = make<Core::Stream::AllocatingMemoryStream>();
|
|
||||||
|
|
||||||
// Note: The bit stream only ever reads from/writes to the underlying stream in one byte chunks,
|
|
||||||
// so testing with sizes that will not trigger a write will yield unexpected results.
|
|
||||||
auto bit_write_stream = MUST(Core::Stream::LittleEndianOutputBitStream::construct(MaybeOwned<AK::Stream>(*memory_stream)));
|
|
||||||
auto bit_read_stream = MUST(Core::Stream::LittleEndianInputBitStream::construct(MaybeOwned<AK::Stream>(*memory_stream)));
|
|
||||||
|
|
||||||
// Test two mirrored chunks of a fully mirrored pattern to check that we are not dropping bits.
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b1111u, 4));
|
|
||||||
MUST(bit_write_stream->write_bits(0b1111u, 4));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1111u, result);
|
|
||||||
result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1111u, result);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b0000u, 4));
|
|
||||||
MUST(bit_write_stream->write_bits(0b0000u, 4));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b0000u, result);
|
|
||||||
result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b0000u, result);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test two mirrored chunks of a non-mirrored pattern to check that we are writing bits within a pattern in the correct order.
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
|
||||||
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1000u, result);
|
|
||||||
result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1000u, result);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test two different chunks to check that we are not confusing their order.
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
|
||||||
MUST(bit_write_stream->write_bits(0b0100u, 4));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1000u, result);
|
|
||||||
result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b0100u, result);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test a pattern that spans multiple bytes.
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b1101001000100001u, 16));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(16));
|
|
||||||
EXPECT_EQ(0b1101001000100001u, result);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note: This does not do any checks on the internal representation, it just ensures that the behavior of the input and output streams match.
|
|
||||||
TEST_CASE(big_endian_bit_stream_input_output_match)
|
|
||||||
{
|
|
||||||
auto memory_stream = make<Core::Stream::AllocatingMemoryStream>();
|
|
||||||
|
|
||||||
// Note: The bit stream only ever reads from/writes to the underlying stream in one byte chunks,
|
|
||||||
// so testing with sizes that will not trigger a write will yield unexpected results.
|
|
||||||
auto bit_write_stream = MUST(Core::Stream::BigEndianOutputBitStream::construct(MaybeOwned<AK::Stream>(*memory_stream)));
|
|
||||||
auto bit_read_stream = MUST(Core::Stream::BigEndianInputBitStream::construct(MaybeOwned<AK::Stream>(*memory_stream)));
|
|
||||||
|
|
||||||
// Test two mirrored chunks of a fully mirrored pattern to check that we are not dropping bits.
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b1111u, 4));
|
|
||||||
MUST(bit_write_stream->write_bits(0b1111u, 4));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1111u, result);
|
|
||||||
result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1111u, result);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b0000u, 4));
|
|
||||||
MUST(bit_write_stream->write_bits(0b0000u, 4));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b0000u, result);
|
|
||||||
result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b0000u, result);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test two mirrored chunks of a non-mirrored pattern to check that we are writing bits within a pattern in the correct order.
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
|
||||||
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1000u, result);
|
|
||||||
result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1000u, result);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test two different chunks to check that we are not confusing their order.
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b1000u, 4));
|
|
||||||
MUST(bit_write_stream->write_bits(0b0100u, 4));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b1000u, result);
|
|
||||||
result = MUST(bit_read_stream->read_bits(4));
|
|
||||||
EXPECT_EQ(0b0100u, result);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test a pattern that spans multiple bytes.
|
|
||||||
{
|
|
||||||
MUST(bit_write_stream->write_bits(0b1101001000100001u, 16));
|
|
||||||
auto result = MUST(bit_read_stream->read_bits(16));
|
|
||||||
EXPECT_EQ(0b1101001000100001u, result);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -8,17 +8,15 @@
|
||||||
|
|
||||||
#include "FlacTypes.h"
|
#include "FlacTypes.h"
|
||||||
#include "Loader.h"
|
#include "Loader.h"
|
||||||
|
#include <AK/BitStream.h>
|
||||||
#include <AK/Error.h>
|
#include <AK/Error.h>
|
||||||
#include <AK/Span.h>
|
#include <AK/Span.h>
|
||||||
#include <AK/Types.h>
|
#include <AK/Types.h>
|
||||||
#include <LibCore/BitStream.h>
|
|
||||||
#include <LibCore/MemoryStream.h>
|
#include <LibCore/MemoryStream.h>
|
||||||
#include <LibCore/Stream.h>
|
#include <LibCore/Stream.h>
|
||||||
|
|
||||||
namespace Audio {
|
namespace Audio {
|
||||||
|
|
||||||
using Core::Stream::BigEndianInputBitStream;
|
|
||||||
|
|
||||||
// Experimentally determined to be a decent buffer size on i686:
|
// Experimentally determined to be a decent buffer size on i686:
|
||||||
// 4K (the default) is slightly worse, and 64K is much worse.
|
// 4K (the default) is slightly worse, and 64K is much worse.
|
||||||
// At sufficiently large buffer sizes, the advantage of infrequent read() calls is outweighed by the memmove() overhead.
|
// At sufficiently large buffer sizes, the advantage of infrequent read() calls is outweighed by the memmove() overhead.
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <AK/Array.h>
|
#include <AK/Array.h>
|
||||||
|
#include <AK/BitStream.h>
|
||||||
#include <AK/Span.h>
|
#include <AK/Span.h>
|
||||||
|
|
||||||
namespace Audio::MP3::Tables::Huffman {
|
namespace Audio::MP3::Tables::Huffman {
|
||||||
|
@ -105,7 +106,7 @@ struct HuffmanDecodeResult {
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
HuffmanDecodeResult<T> huffman_decode(Core::Stream::BigEndianInputBitStream& bitstream, Span<HuffmanNode<T> const> tree, size_t max_bits_to_read)
|
HuffmanDecodeResult<T> huffman_decode(BigEndianInputBitStream& bitstream, Span<HuffmanNode<T> const> tree, size_t max_bits_to_read)
|
||||||
{
|
{
|
||||||
HuffmanNode<T> const* node = &tree[0];
|
HuffmanNode<T> const* node = &tree[0];
|
||||||
size_t bits_read = 0;
|
size_t bits_read = 0;
|
||||||
|
|
|
@ -41,7 +41,7 @@ Result<NonnullOwnPtr<MP3LoaderPlugin>, LoaderError> MP3LoaderPlugin::create(Byte
|
||||||
|
|
||||||
MaybeLoaderError MP3LoaderPlugin::initialize()
|
MaybeLoaderError MP3LoaderPlugin::initialize()
|
||||||
{
|
{
|
||||||
m_bitstream = LOADER_TRY(Core::Stream::BigEndianInputBitStream::construct(MaybeOwned<AK::Stream>(*m_stream)));
|
m_bitstream = LOADER_TRY(BigEndianInputBitStream::construct(MaybeOwned<AK::Stream>(*m_stream)));
|
||||||
|
|
||||||
TRY(synchronize());
|
TRY(synchronize());
|
||||||
|
|
||||||
|
@ -242,7 +242,7 @@ ErrorOr<MP3::MP3Frame, LoaderError> MP3LoaderPlugin::read_frame_data(MP3::Header
|
||||||
|
|
||||||
TRY(m_bit_reservoir.discard(old_reservoir_size - frame.main_data_begin));
|
TRY(m_bit_reservoir.discard(old_reservoir_size - frame.main_data_begin));
|
||||||
|
|
||||||
auto reservoir_stream = TRY(Core::Stream::BigEndianInputBitStream::construct(MaybeOwned<AK::Stream>(m_bit_reservoir)));
|
auto reservoir_stream = TRY(BigEndianInputBitStream::construct(MaybeOwned<AK::Stream>(m_bit_reservoir)));
|
||||||
|
|
||||||
for (size_t granule_index = 0; granule_index < 2; granule_index++) {
|
for (size_t granule_index = 0; granule_index < 2; granule_index++) {
|
||||||
for (size_t channel_index = 0; channel_index < header.channel_count(); channel_index++) {
|
for (size_t channel_index = 0; channel_index < header.channel_count(); channel_index++) {
|
||||||
|
@ -418,7 +418,7 @@ Array<float, 576> MP3LoaderPlugin::calculate_frame_exponents(MP3::MP3Frame const
|
||||||
return exponents;
|
return exponents;
|
||||||
}
|
}
|
||||||
|
|
||||||
ErrorOr<size_t, LoaderError> MP3LoaderPlugin::read_scale_factors(MP3::MP3Frame& frame, Core::Stream::BigEndianInputBitStream& reservoir, size_t granule_index, size_t channel_index)
|
ErrorOr<size_t, LoaderError> MP3LoaderPlugin::read_scale_factors(MP3::MP3Frame& frame, BigEndianInputBitStream& reservoir, size_t granule_index, size_t channel_index)
|
||||||
{
|
{
|
||||||
auto& channel = frame.channels[channel_index];
|
auto& channel = frame.channels[channel_index];
|
||||||
auto const& granule = channel.granules[granule_index];
|
auto const& granule = channel.granules[granule_index];
|
||||||
|
@ -486,7 +486,7 @@ ErrorOr<size_t, LoaderError> MP3LoaderPlugin::read_scale_factors(MP3::MP3Frame&
|
||||||
return bits_read;
|
return bits_read;
|
||||||
}
|
}
|
||||||
|
|
||||||
MaybeLoaderError MP3LoaderPlugin::read_huffman_data(MP3::MP3Frame& frame, Core::Stream::BigEndianInputBitStream& reservoir, size_t granule_index, size_t channel_index, size_t granule_bits_read)
|
MaybeLoaderError MP3LoaderPlugin::read_huffman_data(MP3::MP3Frame& frame, BigEndianInputBitStream& reservoir, size_t granule_index, size_t channel_index, size_t granule_bits_read)
|
||||||
{
|
{
|
||||||
auto const exponents = calculate_frame_exponents(frame, granule_index, channel_index);
|
auto const exponents = calculate_frame_exponents(frame, granule_index, channel_index);
|
||||||
auto& granule = frame.channels[channel_index].granules[granule_index];
|
auto& granule = frame.channels[channel_index].granules[granule_index];
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
|
|
||||||
#include "Loader.h"
|
#include "Loader.h"
|
||||||
#include "MP3Types.h"
|
#include "MP3Types.h"
|
||||||
|
#include <AK/BitStream.h>
|
||||||
#include <AK/Tuple.h>
|
#include <AK/Tuple.h>
|
||||||
#include <LibCore/BitStream.h>
|
|
||||||
#include <LibCore/MemoryStream.h>
|
#include <LibCore/MemoryStream.h>
|
||||||
#include <LibCore/Stream.h>
|
#include <LibCore/Stream.h>
|
||||||
#include <LibDSP/MDCT.h>
|
#include <LibDSP/MDCT.h>
|
||||||
|
@ -48,8 +48,8 @@ private:
|
||||||
ErrorOr<MP3::MP3Frame, LoaderError> read_next_frame();
|
ErrorOr<MP3::MP3Frame, LoaderError> read_next_frame();
|
||||||
ErrorOr<MP3::MP3Frame, LoaderError> read_frame_data(MP3::Header const&);
|
ErrorOr<MP3::MP3Frame, LoaderError> read_frame_data(MP3::Header const&);
|
||||||
MaybeLoaderError read_side_information(MP3::MP3Frame&);
|
MaybeLoaderError read_side_information(MP3::MP3Frame&);
|
||||||
ErrorOr<size_t, LoaderError> read_scale_factors(MP3::MP3Frame&, Core::Stream::BigEndianInputBitStream& reservoir, size_t granule_index, size_t channel_index);
|
ErrorOr<size_t, LoaderError> read_scale_factors(MP3::MP3Frame&, BigEndianInputBitStream& reservoir, size_t granule_index, size_t channel_index);
|
||||||
MaybeLoaderError read_huffman_data(MP3::MP3Frame&, Core::Stream::BigEndianInputBitStream& reservoir, size_t granule_index, size_t channel_index, size_t granule_bits_read);
|
MaybeLoaderError read_huffman_data(MP3::MP3Frame&, BigEndianInputBitStream& reservoir, size_t granule_index, size_t channel_index, size_t granule_bits_read);
|
||||||
static AK::Array<float, 576> calculate_frame_exponents(MP3::MP3Frame const&, size_t granule_index, size_t channel_index);
|
static AK::Array<float, 576> calculate_frame_exponents(MP3::MP3Frame const&, size_t granule_index, size_t channel_index);
|
||||||
static void reorder_samples(MP3::Granule&, u32 sample_rate);
|
static void reorder_samples(MP3::Granule&, u32 sample_rate);
|
||||||
static void reduce_alias(MP3::Granule&, size_t max_subband_index = 576);
|
static void reduce_alias(MP3::Granule&, size_t max_subband_index = 576);
|
||||||
|
@ -72,7 +72,7 @@ private:
|
||||||
|
|
||||||
AK::Optional<MP3::MP3Frame> m_current_frame;
|
AK::Optional<MP3::MP3Frame> m_current_frame;
|
||||||
u32 m_current_frame_read;
|
u32 m_current_frame_read;
|
||||||
OwnPtr<Core::Stream::BigEndianInputBitStream> m_bitstream;
|
OwnPtr<BigEndianInputBitStream> m_bitstream;
|
||||||
Core::Stream::AllocatingMemoryStream m_bit_reservoir;
|
Core::Stream::AllocatingMemoryStream m_bit_reservoir;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6,15 +6,15 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <AK/BitStream.h>
|
||||||
#include <AK/CircularQueue.h>
|
#include <AK/CircularQueue.h>
|
||||||
#include <AK/FixedArray.h>
|
#include <AK/FixedArray.h>
|
||||||
#include <LibCore/BitStream.h>
|
|
||||||
#include <LibCore/Stream.h>
|
#include <LibCore/Stream.h>
|
||||||
|
|
||||||
namespace Compress {
|
namespace Compress {
|
||||||
|
|
||||||
|
using AK::LittleEndianInputBitStream;
|
||||||
using AK::Stream;
|
using AK::Stream;
|
||||||
using Core::Stream::LittleEndianInputBitStream;
|
|
||||||
|
|
||||||
class BrotliDecompressionStream : public Stream {
|
class BrotliDecompressionStream : public Stream {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include <AK/Assertions.h>
|
#include <AK/Assertions.h>
|
||||||
#include <AK/BinaryHeap.h>
|
#include <AK/BinaryHeap.h>
|
||||||
#include <AK/BinarySearch.h>
|
#include <AK/BinarySearch.h>
|
||||||
|
#include <AK/BitStream.h>
|
||||||
#include <LibCore/MemoryStream.h>
|
#include <LibCore/MemoryStream.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
@ -98,7 +99,7 @@ Optional<CanonicalCode> CanonicalCode::from_bytes(ReadonlyBytes bytes)
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
ErrorOr<u32> CanonicalCode::read_symbol(Core::Stream::LittleEndianInputBitStream& stream) const
|
ErrorOr<u32> CanonicalCode::read_symbol(LittleEndianInputBitStream& stream) const
|
||||||
{
|
{
|
||||||
u32 code_bits = 1;
|
u32 code_bits = 1;
|
||||||
|
|
||||||
|
@ -115,7 +116,7 @@ ErrorOr<u32> CanonicalCode::read_symbol(Core::Stream::LittleEndianInputBitStream
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ErrorOr<void> CanonicalCode::write_symbol(Core::Stream::LittleEndianOutputBitStream& stream, u32 symbol) const
|
ErrorOr<void> CanonicalCode::write_symbol(LittleEndianOutputBitStream& stream, u32 symbol) const
|
||||||
{
|
{
|
||||||
TRY(stream.write_bits(m_bit_codes[symbol], m_bit_code_lengths[symbol]));
|
TRY(stream.write_bits(m_bit_codes[symbol], m_bit_code_lengths[symbol]));
|
||||||
return {};
|
return {};
|
||||||
|
@ -195,7 +196,7 @@ ErrorOr<NonnullOwnPtr<DeflateDecompressor>> DeflateDecompressor::construct(Maybe
|
||||||
}
|
}
|
||||||
|
|
||||||
DeflateDecompressor::DeflateDecompressor(MaybeOwned<AK::Stream> stream, CircularBuffer output_buffer)
|
DeflateDecompressor::DeflateDecompressor(MaybeOwned<AK::Stream> stream, CircularBuffer output_buffer)
|
||||||
: m_input_stream(make<Core::Stream::LittleEndianInputBitStream>(move(stream)))
|
: m_input_stream(make<LittleEndianInputBitStream>(move(stream)))
|
||||||
, m_output_buffer(move(output_buffer))
|
, m_output_buffer(move(output_buffer))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -448,12 +449,12 @@ ErrorOr<void> DeflateDecompressor::decode_codes(CanonicalCode& literal_code, Opt
|
||||||
|
|
||||||
ErrorOr<NonnullOwnPtr<DeflateCompressor>> DeflateCompressor::construct(MaybeOwned<AK::Stream> stream, CompressionLevel compression_level)
|
ErrorOr<NonnullOwnPtr<DeflateCompressor>> DeflateCompressor::construct(MaybeOwned<AK::Stream> stream, CompressionLevel compression_level)
|
||||||
{
|
{
|
||||||
auto bit_stream = TRY(Core::Stream::LittleEndianOutputBitStream::construct(move(stream)));
|
auto bit_stream = TRY(LittleEndianOutputBitStream::construct(move(stream)));
|
||||||
auto deflate_compressor = TRY(adopt_nonnull_own_or_enomem(new (nothrow) DeflateCompressor(move(bit_stream), compression_level)));
|
auto deflate_compressor = TRY(adopt_nonnull_own_or_enomem(new (nothrow) DeflateCompressor(move(bit_stream), compression_level)));
|
||||||
return deflate_compressor;
|
return deflate_compressor;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeflateCompressor::DeflateCompressor(NonnullOwnPtr<Core::Stream::LittleEndianOutputBitStream> stream, CompressionLevel compression_level)
|
DeflateCompressor::DeflateCompressor(NonnullOwnPtr<LittleEndianOutputBitStream> stream, CompressionLevel compression_level)
|
||||||
: m_compression_level(compression_level)
|
: m_compression_level(compression_level)
|
||||||
, m_compression_constants(compression_constants[static_cast<int>(m_compression_level)])
|
, m_compression_constants(compression_constants[static_cast<int>(m_compression_level)])
|
||||||
, m_output_stream(move(stream))
|
, m_output_stream(move(stream))
|
||||||
|
|
|
@ -9,9 +9,10 @@
|
||||||
|
|
||||||
#include <AK/ByteBuffer.h>
|
#include <AK/ByteBuffer.h>
|
||||||
#include <AK/Endian.h>
|
#include <AK/Endian.h>
|
||||||
|
#include <AK/Forward.h>
|
||||||
|
#include <AK/MaybeOwned.h>
|
||||||
#include <AK/Vector.h>
|
#include <AK/Vector.h>
|
||||||
#include <LibCompress/DeflateTables.h>
|
#include <LibCompress/DeflateTables.h>
|
||||||
#include <LibCore/BitStream.h>
|
|
||||||
#include <LibCore/Stream.h>
|
#include <LibCore/Stream.h>
|
||||||
|
|
||||||
namespace Compress {
|
namespace Compress {
|
||||||
|
@ -19,8 +20,8 @@ namespace Compress {
|
||||||
class CanonicalCode {
|
class CanonicalCode {
|
||||||
public:
|
public:
|
||||||
CanonicalCode() = default;
|
CanonicalCode() = default;
|
||||||
ErrorOr<u32> read_symbol(Core::Stream::LittleEndianInputBitStream&) const;
|
ErrorOr<u32> read_symbol(LittleEndianInputBitStream&) const;
|
||||||
ErrorOr<void> write_symbol(Core::Stream::LittleEndianOutputBitStream&, u32) const;
|
ErrorOr<void> write_symbol(LittleEndianOutputBitStream&, u32) const;
|
||||||
|
|
||||||
static CanonicalCode const& fixed_literal_codes();
|
static CanonicalCode const& fixed_literal_codes();
|
||||||
static CanonicalCode const& fixed_distance_codes();
|
static CanonicalCode const& fixed_distance_codes();
|
||||||
|
@ -100,7 +101,7 @@ private:
|
||||||
UncompressedBlock m_uncompressed_block;
|
UncompressedBlock m_uncompressed_block;
|
||||||
};
|
};
|
||||||
|
|
||||||
MaybeOwned<Core::Stream::LittleEndianInputBitStream> m_input_stream;
|
MaybeOwned<LittleEndianInputBitStream> m_input_stream;
|
||||||
CircularBuffer m_output_buffer;
|
CircularBuffer m_output_buffer;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -152,7 +153,7 @@ public:
|
||||||
static ErrorOr<ByteBuffer> compress_all(ReadonlyBytes bytes, CompressionLevel = CompressionLevel::GOOD);
|
static ErrorOr<ByteBuffer> compress_all(ReadonlyBytes bytes, CompressionLevel = CompressionLevel::GOOD);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DeflateCompressor(NonnullOwnPtr<Core::Stream::LittleEndianOutputBitStream>, CompressionLevel = CompressionLevel::GOOD);
|
DeflateCompressor(NonnullOwnPtr<LittleEndianOutputBitStream>, CompressionLevel = CompressionLevel::GOOD);
|
||||||
|
|
||||||
Bytes pending_block() { return { m_rolling_window + block_size, block_size }; }
|
Bytes pending_block() { return { m_rolling_window + block_size, block_size }; }
|
||||||
|
|
||||||
|
@ -184,7 +185,7 @@ private:
|
||||||
bool m_finished { false };
|
bool m_finished { false };
|
||||||
CompressionLevel m_compression_level;
|
CompressionLevel m_compression_level;
|
||||||
CompressionConstants m_compression_constants;
|
CompressionConstants m_compression_constants;
|
||||||
NonnullOwnPtr<Core::Stream::LittleEndianOutputBitStream> m_output_stream;
|
NonnullOwnPtr<LittleEndianOutputBitStream> m_output_stream;
|
||||||
|
|
||||||
u8 m_rolling_window[window_size];
|
u8 m_rolling_window[window_size];
|
||||||
size_t m_pending_block_size { 0 };
|
size_t m_pending_block_size { 0 };
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <AK/BitStream.h>
|
||||||
#include <AK/Tuple.h>
|
#include <AK/Tuple.h>
|
||||||
#include <LibCore/BitStream.h>
|
|
||||||
#include <LibCore/MemoryStream.h>
|
#include <LibCore/MemoryStream.h>
|
||||||
#include <LibPDF/CommonNames.h>
|
#include <LibPDF/CommonNames.h>
|
||||||
#include <LibPDF/Document.h>
|
#include <LibPDF/Document.h>
|
||||||
|
@ -598,7 +598,7 @@ PDFErrorOr<Vector<DocumentParser::PageOffsetHintTableEntry>> DocumentParser::par
|
||||||
auto input_stream = TRY(Core::Stream::FixedMemoryStream::construct(hint_stream_bytes));
|
auto input_stream = TRY(Core::Stream::FixedMemoryStream::construct(hint_stream_bytes));
|
||||||
TRY(input_stream->seek(sizeof(PageOffsetHintTable)));
|
TRY(input_stream->seek(sizeof(PageOffsetHintTable)));
|
||||||
|
|
||||||
auto bit_stream = TRY(Core::Stream::LittleEndianInputBitStream::construct(move(input_stream)));
|
auto bit_stream = TRY(LittleEndianInputBitStream::construct(move(input_stream)));
|
||||||
|
|
||||||
auto number_of_pages = m_linearization_dictionary.value().number_of_pages;
|
auto number_of_pages = m_linearization_dictionary.value().number_of_pages;
|
||||||
Vector<PageOffsetHintTableEntry> entries;
|
Vector<PageOffsetHintTableEntry> entries;
|
||||||
|
|
Loading…
Reference in a new issue