mirror of
https://github.com/SerenityOS/serenity
synced 2026-05-08 16:12:23 +02:00
f341138c70
There is an issue where gifs with many frames cannot be loaded, as each bitmap is sent over IPC using a separate file descriptor, and there is limit on the maximum number of descriptors per IPC message. Thus, trying to load gifs with more than 64 frames (the current limit) causes the image decoder process to die. This commit introduces the BitmapSequence class, which is a thin wrapper around the type Vector<Optional<NonnullRefPtr<Gfx::Bitmap>>> and provides an IPC encode/decode routine that collates all bitmap data into a single buffer so that only a single file descriptor is required per IPC transfer, even if multiple frames are being sent. (cherry picked from commit e0bd42be9590b967d0b5788ce7537a861a35ba74; amended to fix conflict on build files since we still BitmapMixer.cpp that upstream removed in LadybirdBrowser/ladybird#41, and BitmapSequence.cpp conflicted with that. Also amended to not have AlphaType in BitmapMetadata since we don't have that, and to have scale instead, which we still do have. Also updated encode() and decode() to send things in the order they're in in the struct.)
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AK/HashMap.h>
|
|
#include <ImageDecoder/ImageDecoderClientEndpoint.h>
|
|
#include <ImageDecoder/ImageDecoderServerEndpoint.h>
|
|
#include <LibCore/Promise.h>
|
|
#include <LibIPC/ConnectionToServer.h>
|
|
|
|
namespace ImageDecoderClient {
|
|
|
|
struct Frame {
|
|
NonnullRefPtr<Gfx::Bitmap> bitmap;
|
|
u32 duration { 0 };
|
|
};
|
|
|
|
struct DecodedImage {
|
|
bool is_animated { false };
|
|
Gfx::FloatPoint scale { 1, 1 };
|
|
u32 loop_count { 0 };
|
|
Vector<Frame> frames;
|
|
};
|
|
|
|
class Client final
|
|
: public IPC::ConnectionToServer<ImageDecoderClientEndpoint, ImageDecoderServerEndpoint>
|
|
, public ImageDecoderClientEndpoint {
|
|
IPC_CLIENT_CONNECTION(Client, "/tmp/session/%sid/portal/image"sv);
|
|
|
|
public:
|
|
Client(NonnullOwnPtr<Core::LocalSocket>);
|
|
|
|
NonnullRefPtr<Core::Promise<DecodedImage>> decode_image(ReadonlyBytes, Function<ErrorOr<void>(DecodedImage&)> on_resolved, Function<void(Error&)> on_rejected, Optional<Gfx::IntSize> ideal_size = {}, Optional<ByteString> mime_type = {});
|
|
|
|
Function<void()> on_death;
|
|
|
|
private:
|
|
virtual void die() override;
|
|
|
|
virtual void did_decode_image(i64 image_id, bool is_animated, u32 loop_count, Gfx::BitmapSequence const& bitmap_sequence, Vector<u32> const& durations, Gfx::FloatPoint scale) override;
|
|
virtual void did_fail_to_decode_image(i64 image_id, String const& error_message) override;
|
|
|
|
HashMap<i64, NonnullRefPtr<Core::Promise<DecodedImage>>> m_pending_decoded_images;
|
|
};
|
|
|
|
}
|