From 5206f05fdf77bb65c125ddb133cf46a59608c671 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 24 Dec 2024 14:52:51 -0500 Subject: Bring in line with dependency changes Signed-off-by: Andrew Opalach --- src/codec/stb_image/demuxer.h | 2 +- src/codec/stb_image/impl.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/codec/stb_image') diff --git a/src/codec/stb_image/demuxer.h b/src/codec/stb_image/demuxer.h index 52f9256..d64e311 100644 --- a/src/codec/stb_image/demuxer.h +++ b/src/codec/stb_image/demuxer.h @@ -5,7 +5,7 @@ struct camu_stbi_demuxer { struct camu_demuxer demux; struct cch_handle *handle; - struct aki_buffer buffer; + struct nn_buffer buffer; bool eof; }; diff --git a/src/codec/stb_image/impl.c b/src/codec/stb_image/impl.c index ac1cbc5..bb38844 100644 --- a/src/codec/stb_image/impl.c +++ b/src/codec/stb_image/impl.c @@ -1,5 +1,5 @@ #include -#include +#include #include "../common.h" #define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_STATIC @@ -22,17 +22,17 @@ static bool stbi_demuxer_init(struct camu_demuxer *demux, struct cch_handle *han struct camu_stbi_demuxer *stb = (struct camu_stbi_demuxer *)demux; stb->handle = handle; - aki_buffer_init(&stb->buffer); + nn_buffer_init(&stb->buffer); stb->eof = false; cch_handle_seek(stb->handle, 0, SEEK_SET); off_t size = cch_entry_get_size(stb->handle->entry); - aki_buffer_ensure_space(&stb->buffer, size); - cch_handle_read(stb->handle, aki_buffer_get_ptr(&stb->buffer, 0), size); + nn_buffer_ensure_space(&stb->buffer, size); + cch_handle_read(stb->handle, nn_buffer_get_ptr(&stb->buffer, 0), size); stb->buffer.size = size; s32 w, h, channels; - u8 *data = aki_buffer_get_ptr(&stb->buffer, 0); + u8 *data = nn_buffer_get_ptr(&stb->buffer, 0); if (!stbi_info_from_memory(data, stb->buffer.size, &w, &h, &channels)) { goto err; } @@ -80,7 +80,7 @@ static bool stbi_demuxer_seek(struct camu_demuxer *demux, u64 pos) static void stbi_demuxer_free(struct camu_demuxer **demux) { struct camu_stbi_demuxer *stb = (struct camu_stbi_demuxer *)*demux; - aki_buffer_free(&stb->buffer); + nn_buffer_free(&stb->buffer); al_array_free(stb->demux.streams); al_free(stb); *demux = NULL; @@ -104,7 +104,7 @@ static s32 stbi_decoder_push(struct camu_decoder *dec, struct camu_codec_packet if (!packet) return CAMU_OK; s32 w, h, channels; - u8 *data = aki_buffer_get_ptr(packet->buffer, 0); + u8 *data = nn_buffer_get_ptr(packet->buffer, 0); u8 *pixels = stbi_load_from_memory(data, packet->buffer->size, &w, &h, &channels, 0); if (!pixels) return CAMU_ERR_ERROR; struct camu_video_format *fmt = &stb->stream->video.fmt; -- cgit v1.2.3-101-g0448