summaryrefslogtreecommitdiff
path: root/src/codec/wuffs
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-12-24 14:52:51 -0500
committerAndrew Opalach <andrew@akon.city> 2024-12-24 14:52:51 -0500
commit5206f05fdf77bb65c125ddb133cf46a59608c671 (patch)
tree69707685b0245f1db508a6bce98d8ab5399a932c /src/codec/wuffs
parent3d55d2722a3129449ab1418e73abd97caa7fd2ae (diff)
downloadcamu-5206f05fdf77bb65c125ddb133cf46a59608c671.tar.gz
camu-5206f05fdf77bb65c125ddb133cf46a59608c671.tar.bz2
camu-5206f05fdf77bb65c125ddb133cf46a59608c671.zip
Bring in line with dependency changes
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/codec/wuffs')
-rw-r--r--src/codec/wuffs/demuxer.h2
-rw-r--r--src/codec/wuffs/impl.c14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/codec/wuffs/demuxer.h b/src/codec/wuffs/demuxer.h
index 6e9e391..c2cb8a5 100644
--- a/src/codec/wuffs/demuxer.h
+++ b/src/codec/wuffs/demuxer.h
@@ -5,7 +5,7 @@
struct camu_wuffs_demuxer {
struct camu_demuxer demux;
struct cch_handle *handle;
- struct aki_buffer buffer;
+ struct nn_buffer buffer;
bool eof;
};
diff --git a/src/codec/wuffs/impl.c b/src/codec/wuffs/impl.c
index 4d9ea7e..378ac00 100644
--- a/src/codec/wuffs/impl.c
+++ b/src/codec/wuffs/impl.c
@@ -1,4 +1,4 @@
-#include <aki/common.h>
+#include <nnwt/common.h>
#define WUFFS_IMPLEMENTATION
#define WUFFS_CONFIG__STATIC_FUNCTIONS
#define WUFFS_CONFIG__MODULES
@@ -22,13 +22,13 @@ static bool wuffs_demuxer_init(struct camu_demuxer *demux, struct cch_handle *ha
struct camu_wuffs_demuxer *wfs = (struct camu_wuffs_demuxer *)demux;
wfs->handle = handle;
- aki_buffer_init(&wfs->buffer);
+ nn_buffer_init(&wfs->buffer);
wfs->eof = false;
cch_handle_seek(wfs->handle, 0, SEEK_SET);
off_t size = cch_entry_get_size(wfs->handle->entry);
- aki_buffer_ensure_space(&wfs->buffer, size);
- cch_handle_read(wfs->handle, aki_buffer_get_ptr(&wfs->buffer, 0), size);
+ nn_buffer_ensure_space(&wfs->buffer, size);
+ cch_handle_read(wfs->handle, nn_buffer_get_ptr(&wfs->buffer, 0), size);
wfs->buffer.size = size;
wuffs_png__decoder wf_dec = { 0 };
@@ -38,7 +38,7 @@ static bool wuffs_demuxer_init(struct camu_demuxer *demux, struct cch_handle *ha
wuffs_png__decoder__set_quirk(&wf_dec, WUFFS_BASE__QUIRK_IGNORE_CHECKSUM, true);
wuffs_base__io_buffer src = { 0 };
- src.data.ptr = aki_buffer_get_ptr(&wfs->buffer, 0);
+ src.data.ptr = nn_buffer_get_ptr(&wfs->buffer, 0);
src.data.len = wfs->buffer.size;
src.meta.wi = wfs->buffer.size;
src.meta.closed = true;
@@ -90,7 +90,7 @@ static bool wuffs_demuxer_seek(struct camu_demuxer *demux, u64 pos)
static void wuffs_demuxer_free(struct camu_demuxer **demux)
{
struct camu_wuffs_demuxer *wfs = (struct camu_wuffs_demuxer *)*demux;
- aki_buffer_free(&wfs->buffer);
+ nn_buffer_free(&wfs->buffer);
al_array_free(wfs->demux.streams);
al_free(wfs);
*demux = NULL;
@@ -127,7 +127,7 @@ static s32 wuffs_decoder_push(struct camu_decoder *dec, struct camu_codec_packet
wuffs_png__decoder__set_quirk(&wf_dec, WUFFS_BASE__QUIRK_IGNORE_CHECKSUM, true);
wuffs_base__io_buffer src = { 0 };
- src.data.ptr = aki_buffer_get_ptr(packet->buffer, 0);
+ src.data.ptr = nn_buffer_get_ptr(packet->buffer, 0);
src.data.len = packet->buffer->size;
src.meta.wi = packet->buffer->size;
src.meta.closed = true;