scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 06:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Audio: some fixes

Browse Source
This commit is contained in:
Martin Pulec
2014-04-17 09:51:56 +02:00
parent d4e4ba0645
commit bf95c3289a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/audio/utils.c
View File

@@ -80,15 +80,11 @@ void audio_frame2_allocate(audio_frame2 *frame, int nr_channels, int max_size)
{
assert(nr_channels <= MAX_AUDIO_CHANNELS);
audio_frame2_reset(frame);
frame->max_size = max_size;
frame->ch_count = nr_channels;
for(int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
free(frame->data[i]);
frame->data[i] = NULL;
frame->data_len[i] = 0;
}
for(int i = 0; i < nr_channels; ++i) {
frame->data[i] = malloc(max_size);
}
@@ -96,6 +92,7 @@ void audio_frame2_allocate(audio_frame2 *frame, int nr_channels, int max_size)
void audio_frame2_append(audio_frame2 *dest, audio_frame2 *src)
{
assert(src->ch_count == dest->ch_count || dest->ch_count == 0);
dest->bps = src->bps;
int new_max_size = dest->max_size;
for (int i = 0; i < src->ch_count; ++i) {
@@ -126,9 +123,13 @@ int audio_frame2_get_sample_count(audio_frame2 *frame)
void audio_frame2_reset(audio_frame2 *frame)
{
for (int i = 0; i < frame->ch_count; ++i) {
for(int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
frame->data_len[i] = 0;
free(frame->data[i]);
frame->data[i] = NULL;
}
frame->max_size = 0;
frame->ch_count = 0;
}
static double get_normalized(char *in, int bps) {

1
src/rtp/audio_decoders.c
View File

@@ -434,6 +434,7 @@ int decode_audio_frame(struct coded_data *cdata, void *data)
sample_rate, input_channels, input_channels == 1 ? "": "s", bps * 8,
get_name_to_audio_codec(get_audio_codec_to_tag(audio_tag)));
audio_frame2_reset(decoder->decoded);
s->buffer.bps = device_bps;
s->buffer.ch_count = output_channels;