RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 05:34:58 +00:00
Code Issues Activity Actions

LibGfx+LibVideo: Move VP9/BooleanDecoder to LibGfx/ImageFormats

Browse source 
...and keep a forwarding header around in VP9, so we don't have to
update all references to the class there.

In time, we probably want to merge LibGfx/ImageDecoders and LibVideo
into LibMedia, but for now I need just this class for the lossy
webp decoder. So move just it over.

No behvior change.
This commit is contained in:
Nico Weber 2023-05-26 15:04:31 -04:00 • committed by Andreas Kling
parent ab5b89eb95
commit fbc53c1ec3
5 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibGfx/CMakeLists.txt
View file

@ -33,6 +33,7 @@ set(SOURCES
ICC/WellKnownProfiles.cpp
ImageFormats/BMPLoader.cpp
ImageFormats/BMPWriter.cpp
ImageFormats/BooleanDecoder.cpp
ImageFormats/DDSLoader.cpp
ImageFormats/GIFLoader.cpp
ImageFormats/ICOLoader.cpp

2
Userland/Libraries/LibVideo/VP9/BooleanDecoder.cpp → Userland/Libraries/LibGfx/ImageFormats/BooleanDecoder.cpp
View file

@ -9,7 +9,7 @@
#include "BooleanDecoder.h"
namespace Video::VP9 {
namespace Gfx {
/* 9.2.1 */
ErrorOr<BooleanDecoder> BooleanDecoder::initialize(MaybeOwned<BigEndianInputBitStream> bit_stream, size_t size_in_bytes)

40
Userland/Libraries/LibGfx/ImageFormats/BooleanDecoder.h Normal file
View file

@ -0,0 +1,40 @@
/*
* Copyright (c) 2021, Hunter Salyer <thefalsehonesty@gmail.com>
* Copyright (c) 2022, Gregory Bertilson <zaggy1024@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/BitStream.h>
#include <AK/Error.h>
#include <AK/Optional.h>
#include <AK/Types.h>
namespace Gfx {
class BooleanDecoder {
public:
/* (9.2) */
static ErrorOr<BooleanDecoder> initialize(MaybeOwned<BigEndianInputBitStream> bit_stream, size_t size_in_bytes);
ErrorOr<bool> read_bool(u8 probability);
ErrorOr<u8> read_literal(u8 bits);
ErrorOr<void> finish_decode();
private:
BooleanDecoder(MaybeOwned<BigEndianInputBitStream>&& bit_stream, u8 value, u8 range, u64 bits_left)
: m_bit_stream(move(bit_stream))
, m_value(value)
, m_range(range)
, m_bits_left(bits_left)
{
}
MaybeOwned<BigEndianInputBitStream> m_bit_stream;
u8 m_value { 0 };
u8 m_range { 0 };
u64 m_bits_left { 0 };
};
}

1
Userland/Libraries/LibVideo/CMakeLists.txt
View file

@ -6,7 +6,6 @@ set(SOURCES
Containers/Matroska/Reader.cpp
PlaybackManager.cpp
VideoFrame.cpp
VP9/BooleanDecoder.cpp
VP9/Decoder.cpp
VP9/Parser.cpp
VP9/ProbabilityTables.cpp

31
Userland/Libraries/LibVideo/VP9/BooleanDecoder.h
View file

@ -1,40 +1,15 @@
/*
* Copyright (c) 2021, Hunter Salyer <thefalsehonesty@gmail.com>
* Copyright (c) 2022, Gregory Bertilson <zaggy1024@gmail.com>
* Copyright (c) 2023, Nico Weber <thakis@chromium.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/BitStream.h>
#include <AK/Error.h>
#include <AK/Optional.h>
#include <AK/Types.h>
#include <LibGfx/ImageFormats/BooleanDecoder.h>
namespace Video::VP9 {
class BooleanDecoder {
public:
/* (9.2) */
static ErrorOr<BooleanDecoder> initialize(MaybeOwned<BigEndianInputBitStream> bit_stream, size_t size_in_bytes);
ErrorOr<bool> read_bool(u8 probability);
ErrorOr<u8> read_literal(u8 bits);
ErrorOr<void> finish_decode();
private:
BooleanDecoder(MaybeOwned<BigEndianInputBitStream>&& bit_stream, u8 value, u8 range, u64 bits_left)
: m_bit_stream(move(bit_stream))
, m_value(value)
, m_range(range)
, m_bits_left(bits_left)
{
}
MaybeOwned<BigEndianInputBitStream> m_bit_stream;
u8 m_value { 0 };
u8 m_range { 0 };
u64 m_bits_left { 0 };
};
using BooleanDecoder = Gfx::BooleanDecoder;
}