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/liana/handlers/cdio.h | 2 +- src/liana/handlers/cdio_client.c | 12 +++++------ src/liana/handlers/cdio_server.c | 42 ++++++++++++++++++------------------- src/liana/handlers/codec_client.c | 12 +++++------ src/liana/handlers/codec_server.c | 44 +++++++++++++++++++-------------------- 5 files changed, 56 insertions(+), 56 deletions(-) (limited to 'src/liana/handlers') diff --git a/src/liana/handlers/cdio.h b/src/liana/handlers/cdio.h index 2727616..4c40986 100644 --- a/src/liana/handlers/cdio.h +++ b/src/liana/handlers/cdio.h @@ -6,8 +6,8 @@ struct lia_cdio_server { struct lia_server_handler handler; struct cch_handle *handle; struct camu_audio_format fmt; + struct nn_buffer buffer; f64 pts; - struct aki_buffer buffer; }; struct lia_cdio_client { diff --git a/src/liana/handlers/cdio_client.c b/src/liana/handlers/cdio_client.c index 93b1a27..665858f 100644 --- a/src/liana/handlers/cdio_client.c +++ b/src/liana/handlers/cdio_client.c @@ -9,7 +9,7 @@ static bool cdio_client_init(struct lia_client_handler *handler, struct camu_ren return true; } -static bool cdio_client_handle_packet(struct lia_client_handler *handler, struct aki_packet *packet) +static bool cdio_client_handle_packet(struct lia_client_handler *handler, struct nn_packet *packet) { struct lia_cdio_client *cdio = (struct lia_cdio_client *)handler; if (!packet) { @@ -18,12 +18,12 @@ static bool cdio_client_handle_packet(struct lia_client_handler *handler, struct } struct camu_codec_frame *frame = al_alloc_object(struct camu_codec_frame); frame->mode = CAMU_NORMAL; - frame->pts = aki_packet_read_f64(packet); - frame->audio.sample_count = aki_packet_read_s32(packet); - struct aki_buffer buffer; - aki_packet_read_buffer(packet, &buffer); + frame->pts = nn_packet_read_f64(packet); + frame->audio.sample_count = nn_packet_read_s32(packet); + struct nn_buffer buffer; + nn_packet_read_buffer(packet, &buffer); frame->data = al_malloc(buffer.size); - al_memcpy(frame->data, aki_buffer_get_ptr(&buffer, 0), buffer.size); + al_memcpy(frame->data, nn_buffer_get_ptr(&buffer, 0), buffer.size); cdio->handler.callback(cdio->handler.userdata, LIANA_CLIENT_DATA, cdio->handler.stream, frame); return true; } diff --git a/src/liana/handlers/cdio_server.c b/src/liana/handlers/cdio_server.c index 641ed92..01a9265 100644 --- a/src/liana/handlers/cdio_server.c +++ b/src/liana/handlers/cdio_server.c @@ -15,8 +15,8 @@ static bool cdio_server_init(struct lia_server_handler *handler, struct cch_hand cdio->fmt.format = CAMU_SAMPLE_FORMAT_S16; cdio->fmt.sample_rate = 44100; cdio->fmt.channel_count = 2; + nn_buffer_init(&cdio->buffer); cdio->pts = 0.0; - aki_buffer_init(&cdio->buffer); if (handle->entry->chapter) { cch_handle_seek(handle, handle->entry->chapter->start * CDIO_CD_FRAMESIZE_RAW, SEEK_SET); @@ -25,18 +25,18 @@ static bool cdio_server_init(struct lia_server_handler *handler, struct cch_hand return true; } -static void cdio_server_write_info(struct lia_server_handler *handler, struct aki_packet *packet) +static void cdio_server_write_info(struct lia_server_handler *handler, struct nn_packet *packet) { struct lia_cdio_server *cdio = (struct lia_cdio_server *)handler; - aki_packet_write_u64(packet, 0); - aki_packet_write_u32(packet, 1); - aki_packet_write_u8(packet, CAMU_NORMAL); - aki_packet_write_u8(packet, CAMU_STREAM_AUDIO); - aki_packet_write_u64(packet, cdio->handler.get_duration(&cdio->handler)); - aki_packet_write_s32(packet, 0); - aki_packet_write_s32(packet, cdio->fmt.format); - aki_packet_write_s32(packet, cdio->fmt.sample_rate); - aki_packet_write_s32(packet, cdio->fmt.channel_count); + nn_packet_write_u64(packet, 0); + nn_packet_write_u32(packet, 1); + nn_packet_write_u8(packet, CAMU_NORMAL); + nn_packet_write_u8(packet, CAMU_STREAM_AUDIO); + nn_packet_write_u64(packet, cdio->handler.get_duration(&cdio->handler)); + nn_packet_write_s32(packet, 0); + nn_packet_write_s32(packet, cdio->fmt.format); + nn_packet_write_s32(packet, cdio->fmt.sample_rate); + nn_packet_write_s32(packet, cdio->fmt.channel_count); } static void cdio_server_subscribe(struct lia_server_handler *handler, s32 mask) @@ -69,26 +69,26 @@ static void cdio_server_step(struct lia_server_handler *handler) (void)cdio; } -static void cdio_server_write_packet(struct lia_server_handler *handler, struct aki_packet *packet) +static void cdio_server_write_packet(struct lia_server_handler *handler, struct nn_packet *packet) { struct lia_cdio_server *cdio = (struct lia_cdio_server *)handler; off_t size = CDIO_CD_FRAMESIZE_RAW * SECTORS_PER_PACKET; - aki_buffer_ensure_space(&cdio->buffer, size); - s32 ret = cch_handle_read(cdio->handle, aki_buffer_get_ptr(&cdio->buffer, 0), size); + nn_buffer_ensure_space(&cdio->buffer, size); + s32 ret = cch_handle_read(cdio->handle, nn_buffer_get_ptr(&cdio->buffer, 0), size); if (ret == CAMU_ERR_EOF) { cdio->handler.status = CAMU_ERR_EOF; - aki_packet_write_u8(packet, LIANA_PACKET_EOF); + nn_packet_write_u8(packet, LIANA_PACKET_EOF); return; } cdio->handler.status = CAMU_OK; - aki_packet_write_u8(packet, LIANA_PACKET_DATA); - aki_packet_write_s32(packet, 0); - aki_packet_write_f64(packet, cdio->pts); + nn_packet_write_u8(packet, LIANA_PACKET_DATA); + nn_packet_write_s32(packet, 0); + nn_packet_write_f64(packet, cdio->pts); s32 sample_count = ret / (camu_audio_format_bytes_per_sample(&cdio->fmt) * cdio->fmt.channel_count); + nn_packet_write_s32(packet, sample_count); + nn_buffer_set_size(&cdio->buffer, ret); + nn_packet_write_buffer(packet, &cdio->buffer); cdio->pts += camu_audio_format_samples_to_sec(&cdio->fmt, sample_count); - aki_packet_write_s32(packet, sample_count); - aki_buffer_set_size(&cdio->buffer, ret); - aki_packet_write_buffer(packet, &cdio->buffer); } static void cdio_server_free(struct lia_server_handler **handler) diff --git a/src/liana/handlers/codec_client.c b/src/liana/handlers/codec_client.c index dc53129..3722197 100644 --- a/src/liana/handlers/codec_client.c +++ b/src/liana/handlers/codec_client.c @@ -44,7 +44,7 @@ static bool push_av_packet(struct lia_codec_client *codec, AVPacket *pkt) } #endif -static bool push_packet(struct lia_codec_client *codec, struct aki_buffer *buffer) +static bool push_packet(struct lia_codec_client *codec, struct nn_buffer *buffer) { struct camu_codec_packet packet; packet.buffer = buffer; @@ -52,7 +52,7 @@ static bool push_packet(struct lia_codec_client *codec, struct aki_buffer *buffe return ret == CAMU_OK; } -static bool codec_client_handle_packet(struct lia_client_handler *handler, struct aki_packet *packet) +static bool codec_client_handle_packet(struct lia_client_handler *handler, struct nn_packet *packet) { struct lia_codec_client *codec = (struct lia_codec_client *)handler; @@ -72,12 +72,12 @@ static bool codec_client_handle_packet(struct lia_client_handler *handler, struc // Push packet. bool success; - u8 type = aki_packet_read_u8(packet); + u8 type = nn_packet_read_u8(packet); switch (type) { case CAMU_NORMAL: { if (codec->dec) { - struct aki_buffer buffer; - aki_packet_read_buffer(packet, &buffer); + struct nn_buffer buffer; + nn_packet_read_buffer(packet, &buffer); success = push_packet(codec, &buffer); } else { success = true; @@ -86,7 +86,7 @@ static bool codec_client_handle_packet(struct lia_client_handler *handler, struc } #ifdef CAMU_HAVE_FFMPEG case CAMU_FFMPEG_COMPAT: { - AVPacket *pkt = aki_packet_read_av_packet(packet); + AVPacket *pkt = nn_packet_read_av_packet(packet); if (codec->dec) { success = push_av_packet(codec, pkt); } else { diff --git a/src/liana/handlers/codec_server.c b/src/liana/handlers/codec_server.c index 94b18df..7167f97 100644 --- a/src/liana/handlers/codec_server.c +++ b/src/liana/handlers/codec_server.c @@ -33,30 +33,30 @@ static bool codec_server_init(struct lia_server_handler *handler, struct cch_han return true; } -static void codec_server_write_info(struct lia_server_handler *handler, struct aki_packet *packet) +static void codec_server_write_info(struct lia_server_handler *handler, struct nn_packet *packet) { struct lia_codec_server *codec = (struct lia_codec_server *)handler; u64 duration = codec->demux->get_duration(codec->demux); - aki_packet_write_u64(packet, duration); - aki_packet_write_u32(packet, codec->demux->streams.size); + nn_packet_write_u64(packet, duration); + nn_packet_write_u32(packet, codec->demux->streams.size); struct camu_codec_stream *stream; al_array_foreach_ptr(codec->demux->streams, i, stream) { - aki_packet_write_u8(packet, stream->mode); - aki_packet_write_u8(packet, stream->type); - aki_packet_write_u64(packet, stream->duration); - aki_packet_write_s32(packet, i); + nn_packet_write_u8(packet, stream->mode); + nn_packet_write_u8(packet, stream->type); + nn_packet_write_u64(packet, stream->duration); + nn_packet_write_s32(packet, i); switch (stream->mode) { case CAMU_NORMAL: { struct camu_video_format *fmt = &stream->video.fmt; - aki_packet_write_s32(packet, fmt->width); - aki_packet_write_s32(packet, fmt->height); - aki_packet_write_s32(packet, fmt->format); + nn_packet_write_s32(packet, fmt->width); + nn_packet_write_s32(packet, fmt->height); + nn_packet_write_s32(packet, fmt->format); break; } #ifdef CAMU_HAVE_FFMPEG case CAMU_FFMPEG_COMPAT: - aki_packet_write_av_codec_id(packet, stream->av.stream->codecpar->codec_id); - aki_packet_write_av_stream(packet, stream->av.stream); + nn_packet_write_av_codec_id(packet, stream->av.stream->codecpar->codec_id); + nn_packet_write_av_stream(packet, stream->av.stream); break; #endif } @@ -87,33 +87,33 @@ static void codec_server_step(struct lia_server_handler *handler) codec->handler.status = codec->demux->get_packet(codec->demux, &codec->packet); } -static void codec_server_write_packet(struct lia_server_handler *handler, struct aki_packet *packet) +static void codec_server_write_packet(struct lia_server_handler *handler, struct nn_packet *packet) { struct lia_codec_server *codec = (struct lia_codec_server *)handler; if (codec->handler.status == CAMU_OK) { - aki_packet_write_u8(packet, LIANA_PACKET_DATA); + nn_packet_write_u8(packet, LIANA_PACKET_DATA); switch (codec->packet.mode) { case CAMU_NORMAL: { - aki_packet_write_s32(packet, 0); - aki_packet_write_u8(packet, codec->packet.mode); - aki_packet_write_buffer(packet, codec->packet.buffer); + nn_packet_write_s32(packet, 0); + nn_packet_write_u8(packet, codec->packet.mode); + nn_packet_write_buffer(packet, codec->packet.buffer); break; } #ifdef CAMU_HAVE_FFMPEG case CAMU_FFMPEG_COMPAT: { AVPacket *pkt = codec->packet.av.pkt; - aki_packet_write_s32(packet, pkt->stream_index); - aki_packet_write_u8(packet, codec->packet.mode); - aki_packet_write_av_packet(packet, pkt); + nn_packet_write_s32(packet, pkt->stream_index); + nn_packet_write_u8(packet, codec->packet.mode); + nn_packet_write_av_packet(packet, pkt); av_packet_unref(pkt); break; } #endif } } else if (codec->handler.status == CAMU_ERR_EOF) { - aki_packet_write_u8(packet, LIANA_PACKET_EOF); + nn_packet_write_u8(packet, LIANA_PACKET_EOF); } else { - aki_packet_write_u8(packet, LIANA_PACKET_ERROR); + nn_packet_write_u8(packet, LIANA_PACKET_ERROR); } } -- cgit v1.2.3-101-g0448