scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 06:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "audio decompress: pass packet list (iterator)"

Browse Source 
This reverts commit 29421cd1fe.
This commit is contained in:
Martin Pulec
2023-10-16 10:06:07 +02:00
parent 175844d63a
commit 2191dfd228
6 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio/codec.cpp
View File

@@ -46,7 +46,6 @@
#include "debug.h"
#include "lib_common.h"
#include "utils/misc.h"
#include "utils/packet_counter.h"
#include <algorithm>
#include <climits>
@@ -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);