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/spng/demuxer.h | 2 +- src/codec/spng/impl.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/codec/spng') diff --git a/src/codec/spng/demuxer.h b/src/codec/spng/demuxer.h index 1947bb7..bd89ef1 100644 --- a/src/codec/spng/demuxer.h +++ b/src/codec/spng/demuxer.h @@ -5,7 +5,7 @@ struct camu_spng_demuxer { struct camu_demuxer demux; struct cch_handle *handle; - struct aki_buffer buffer; + struct nn_buffer buffer; bool eof; }; diff --git a/src/codec/spng/impl.c b/src/codec/spng/impl.c index 198d514..58b68f6 100644 --- a/src/codec/spng/impl.c +++ b/src/codec/spng/impl.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include "../../cache/entry.h" @@ -14,17 +14,17 @@ static bool spng_demuxer_init(struct camu_demuxer *demux, struct cch_handle *han struct camu_spng_demuxer *spng = (struct camu_spng_demuxer *)demux; spng->handle = handle; - aki_buffer_init(&spng->buffer); + nn_buffer_init(&spng->buffer); spng->eof = false; cch_handle_seek(spng->handle, 0, SEEK_SET); off_t size = cch_entry_get_size(spng->handle->entry); - aki_buffer_ensure_space(&spng->buffer, size); - cch_handle_read(spng->handle, aki_buffer_get_ptr(&spng->buffer, 0), size); + nn_buffer_ensure_space(&spng->buffer, size); + cch_handle_read(spng->handle, nn_buffer_get_ptr(&spng->buffer, 0), size); spng->buffer.size = size; spng_ctx *ctx = spng_ctx_new(SPNG_CTX_IGNORE_ADLER32); - spng_set_png_buffer(ctx, aki_buffer_get_ptr(&spng->buffer, 0), spng->buffer.size); + spng_set_png_buffer(ctx, nn_buffer_get_ptr(&spng->buffer, 0), spng->buffer.size); spng_set_option(ctx, SPNG_CHUNK_COUNT_LIMIT, 6250); spng_set_crc_action(ctx, SPNG_CRC_DISCARD, SPNG_CRC_DISCARD); @@ -73,7 +73,7 @@ static bool spng_demuxer_seek(struct camu_demuxer *demux, u64 pos) static void spng_demuxer_free(struct camu_demuxer **demux) { struct camu_spng_demuxer *spng = (struct camu_spng_demuxer *)*demux; - aki_buffer_free(&spng->buffer); + nn_buffer_free(&spng->buffer); al_array_free(spng->demux.streams); al_free(spng); *demux = NULL; @@ -96,7 +96,7 @@ static s32 spng_decoder_push(struct camu_decoder *dec, struct camu_codec_packet if (!packet) return CAMU_OK; spng_ctx *ctx = spng_ctx_new(SPNG_CTX_IGNORE_ADLER32); - spng_set_png_buffer(ctx, aki_buffer_get_ptr(packet->buffer, 0), packet->buffer->size); + spng_set_png_buffer(ctx, nn_buffer_get_ptr(packet->buffer, 0), packet->buffer->size); spng_set_option(ctx, SPNG_CHUNK_COUNT_LIMIT, 6250); spng_set_crc_action(ctx, SPNG_CRC_DISCARD, SPNG_CRC_DISCARD); -- cgit v1.2.3-101-g0448