RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:48:12 +00:00
Code Issues Activity Actions

ImageDecoder: Use Core::AnonymousBuffer and Gfx::ShareableBitmap

Browse source 
...instead of sending shbufs back and forth. :^)
This commit is contained in:
Andreas Kling 2021-01-16 23:58:57 +01:00
parent 8a61aba1e5
commit 447e6da52c
4 changed files with 14 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Userland/Libraries/LibImageDecoderClient/Client.cpp
View file

@ -24,7 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/SharedBuffer.h>
#include <LibCore/AnonymousBuffer.h>
#include <LibImageDecoderClient/Client.h>
namespace ImageDecoderClient {
@ -51,38 +51,15 @@ RefPtr<Gfx::Bitmap> Client::decode_image(const ByteBuffer& encoded_data)
if (encoded_data.is_empty())
return nullptr;
auto encoded_buffer = SharedBuffer::create_with_size(encoded_data.size());
if (!encoded_buffer) {
dbgln("Could not allocate encoded shbuf");
auto encoded_buffer = Core::AnonymousBuffer::create_with_size(encoded_data.size());
if (!encoded_buffer.is_valid()) {
dbgln("Could not allocate encoded buffer");
return nullptr;
}
memcpy(encoded_buffer->data<void>(), encoded_data.data(), encoded_data.size());
encoded_buffer->seal();
encoded_buffer->share_with(server_pid());
auto response = send_sync<Messages::ImageDecoderServer::DecodeImage>(encoded_buffer->shbuf_id(), encoded_data.size());
auto bitmap_format = (Gfx::BitmapFormat)response->bitmap_format();
if (bitmap_format == Gfx::BitmapFormat::Invalid) {
#ifdef IMAGE_DECODER_CLIENT_DEBUG
dbgln("Response image was invalid");
#endif
return nullptr;
}
if (response->size().is_empty()) {
dbgln("Response image was empty");
return nullptr;
}
auto decoded_buffer = SharedBuffer::create_from_shbuf_id(response->decoded_shbuf_id());
if (!decoded_buffer) {
dbgln("Could not map decoded image shbuf_id={}", response->decoded_shbuf_id());
return nullptr;
}
return Gfx::Bitmap::create_with_shared_buffer(bitmap_format, decoded_buffer.release_nonnull(), response->size(), response->palette());
memcpy(encoded_buffer.data<void>(), encoded_data.data(), encoded_data.size());
auto response = send_sync<Messages::ImageDecoderServer::DecodeImage>(move(encoded_buffer));
return response->bitmap().bitmap();
}
}