From 2191dfd228dc76edeac1bcd1bb15b0186ad35cf0 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 16 Oct 2023 10:06:07 +0200 Subject: [PATCH] Revert "audio decompress: pass packet list (iterator)" This reverts commit 29421cd1fe9df6a41acebbfbb9f0ce65d607e82e. --- src/audio/codec.cpp | 8 ++------ src/audio/codec.h | 8 ++------ src/audio/codec/dummy_pcm.c | 6 ++---- src/audio/codec/libavcodec.c | 6 ++---- src/rtp/audio_decoders.cpp | 5 +---- src/utils/packet_counter.h | 6 ------ 6 files changed, 9 insertions(+), 30 deletions(-) diff --git a/src/audio/codec.cpp b/src/audio/codec.cpp index 883643749..c6f28005f 100644 --- a/src/audio/codec.cpp +++ b/src/audio/codec.cpp @@ -46,7 +46,6 @@ #include "debug.h" #include "lib_common.h" #include "utils/misc.h" -#include "utils/packet_counter.h" #include #include @@ -276,9 +275,7 @@ audio_frame2 audio_codec_compress(struct audio_codec_state *s, const audio_frame return res; } -audio_frame2 -audio_codec_decompress(struct audio_codec_state *s, audio_frame2 *frame, - packet_counter *counter) +audio_frame2 audio_codec_decompress(struct audio_codec_state *s, audio_frame2 *frame) { if (s->state_count < frame->get_channel_count()) { s->state = (void **) realloc(s->state, sizeof(void *) * frame->get_channel_count()); @@ -309,8 +306,7 @@ audio_codec_decompress(struct audio_codec_state *s, audio_frame2 *frame, if (channel.data_len == 0) { continue; } - struct packet_iterator it = { counter, i, 0 }; - audio_channel *out = s->funcs->decompress(s->state[i], &channel, &it); + audio_channel *out = s->funcs->decompress(s->state[i], &channel); if (out) { if (!out_frame_initialized) { ret.init(frame->get_channel_count(), AC_PCM, out->bps, out->sample_rate); diff --git a/src/audio/codec.h b/src/audio/codec.h index 6228e7d6b..5ad4b573b 100644 --- a/src/audio/codec.h +++ b/src/audio/codec.h @@ -47,14 +47,11 @@ typedef enum { AUDIO_DECODER } audio_codec_direction_t; -struct packet_counter; -struct packet_iterator; - struct audio_compress_info { const audio_codec_t *supported_codecs; void *(*init)(audio_codec_t, audio_codec_direction_t, bool, int bitrate); audio_channel *(*compress)(void *, audio_channel *); - audio_channel *(*decompress)(void *, audio_channel *, struct packet_iterator *); + audio_channel *(*decompress)(void *, audio_channel *); const int *(*get_samplerates)(void *); void (*done)(void *); }; @@ -80,8 +77,7 @@ struct audio_codec_state *audio_codec_init_cfg(const char *audio_codec_cfg, audi struct audio_codec_state *audio_codec_reconfigure(struct audio_codec_state *old, audio_codec_t audio_codec, audio_codec_direction_t); audio_frame2 audio_codec_compress(struct audio_codec_state *, const audio_frame2 *); -audio_frame2 audio_codec_decompress(struct audio_codec_state *, audio_frame2 *, - packet_counter *); +audio_frame2 audio_codec_decompress(struct audio_codec_state *, audio_frame2 *); const int *audio_codec_get_supported_samplerates(struct audio_codec_state *); void audio_codec_done(struct audio_codec_state *); diff --git a/src/audio/codec/dummy_pcm.c b/src/audio/codec/dummy_pcm.c index 4707792f8..2000e3226 100644 --- a/src/audio/codec/dummy_pcm.c +++ b/src/audio/codec/dummy_pcm.c @@ -52,6 +52,7 @@ static void *dummy_pcm_init(audio_codec_t audio_codec, audio_codec_direction_t direction, bool try_init, int bitrate); static audio_channel *dummy_pcm_compress(void *, audio_channel *); +static audio_channel *dummy_pcm_decompress(void *, audio_channel *); static void dummy_pcm_done(void *); struct dummy_pcm_codec_state { @@ -78,11 +79,8 @@ static audio_channel *dummy_pcm_compress(void *state, audio_channel * channel) return channel; } -static audio_channel * -dummy_pcm_decompress(void *state, audio_channel *channel, - struct packet_iterator *it) +static audio_channel *dummy_pcm_decompress(void *state, audio_channel * channel) { - UNUSED(it); struct dummy_pcm_codec_state *s = (struct dummy_pcm_codec_state *) state; assert(s->magic == MAGIC); diff --git a/src/audio/codec/libavcodec.c b/src/audio/codec/libavcodec.c index 9b7b85577..73300ae36 100644 --- a/src/audio/codec/libavcodec.c +++ b/src/audio/codec/libavcodec.c @@ -70,6 +70,7 @@ struct libavcodec_codec_state; static void *libavcodec_init(audio_codec_t audio_codec, audio_codec_direction_t direction, bool silent, int bitrate); static audio_channel *libavcodec_compress(void *, audio_channel *); +static audio_channel *libavcodec_decompress(void *, audio_channel *); static void libavcodec_done(void *); static void cleanup_common(struct libavcodec_codec_state *s); @@ -557,11 +558,8 @@ static audio_channel *libavcodec_compress(void *state, audio_channel * channel) } } -static audio_channel * -libavcodec_decompress(void *state, audio_channel *channel, - struct packet_iterator *it) +static audio_channel *libavcodec_decompress(void *state, audio_channel * channel) { - UNUSED(it); struct libavcodec_codec_state *s = (struct libavcodec_codec_state *) state; assert(channel->data_len > 0); assert(s->magic == MAGIC); diff --git a/src/rtp/audio_decoders.cpp b/src/rtp/audio_decoders.cpp index dd63bbd2e..4a6dc47c5 100644 --- a/src/rtp/audio_decoders.cpp +++ b/src/rtp/audio_decoders.cpp @@ -75,7 +75,6 @@ #include #include #include -#include #include #include #include @@ -775,9 +774,7 @@ int decode_audio_frame(struct coded_data *cdata, void *pbuf_data, struct pbuf_st } s->frame_size = received_frame.get_data_len(); - audio_frame2 decompressed = - audio_codec_decompress(decoder->audio_decompress, &received_frame, - decoder->packet_counter); + audio_frame2 decompressed = audio_codec_decompress(decoder->audio_decompress, &received_frame); if (!decompressed) { return FALSE; } diff --git a/src/utils/packet_counter.h b/src/utils/packet_counter.h index 1e563ed11..88ecc5658 100644 --- a/src/utils/packet_counter.h +++ b/src/utils/packet_counter.h @@ -44,12 +44,6 @@ struct packet_counter; extern "C" { #endif /* __cplusplus */ -struct packet_iterator { - struct packet_counter *counter; - int channel; - int first_packet; -}; - struct packet_counter *packet_counter_init(int num_substreams); void packet_counter_destroy(struct packet_counter *state); void packet_counter_register_packet(struct packet_counter *state, unsigned int substream_id,