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

Fixed crash from commit 54befa49

Browse Source 
Fixed incorrect number of channels allocated when there is channel
remapping, eg.:

    uv -s testcard -r dummy --audio-channel-map 0:1

The problem occurs in code introduced by commit 54befa49 but the array
is also used elsewhere, namely read by decode_audio_frame().
This commit is contained in:
Martin Pulec
2022-03-02 09:58:09 +01:00
parent 91d5054677
commit 43a8f49bbd
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rtp/audio_decoders.cpp
View File

@@ -197,6 +197,7 @@ struct state_audio_decoder {
struct channel_map channel_map;
struct scale_data *scale; ///< contains scaling metadata if we want to perform audio scaling
int scale_count; ///< count of @ref state_audio_decoder::scale
bool fixed_scale;
struct audio_codec_state *audio_decompress;
@@ -378,8 +379,8 @@ void *audio_decoder_init(char *audio_channel_map, const char *audio_scale, const
}
s->fixed_scale = scale_auto ? false : true;
s->scale = (struct scale_data *) malloc(sizeof(struct scale_data));
s->scale->samples = 0;
s->scale_count = 1;
s->scale = (struct scale_data *) calloc(s->scale_count, sizeof(struct scale_data));
s->scale->vol_avg = 1.0;
s->scale->scale = scale_factor;
@@ -487,10 +488,10 @@ static bool audio_decoder_reconfigure(struct state_audio_decoder *decoder, struc
if(!decoder->fixed_scale) {
free(decoder->scale);
decoder->scale = (struct scale_data *) malloc(output_channels * sizeof(struct scale_data));
decoder->scale_count = decoder->channel_remapping ? decoder->channel_map.max_output + 1: decoder->saved_desc.ch_count;
decoder->scale = (struct scale_data *) calloc(decoder->scale_count, sizeof(struct scale_data));
for(int i = 0; i < output_channels; ++i) {
decoder->scale[i].samples = 0;
for(int i = 0; i < decoder->scale_count; ++i) {
decoder->scale[i].vol_avg = 1.0;
decoder->scale[i].scale = 1.0;
}
@@ -905,9 +906,7 @@ int decode_audio_frame_mulaw(struct coded_data *cdata, void *data, struct pbuf_s
void audio_decoder_set_volume(void *state, double val)
{
auto s = (struct state_audio_decoder *) state;
int output_channels = s->channel_remapping ?
s->channel_map.max_output + 1: s->saved_desc.ch_count;
for (int i = 0; i < output_channels; ++i) {
for (int i = 0; i < s->scale_count; ++i) {
s->scale[i].scale = val;
}
s->muted = val == 0.0;