BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output/wav: track and free memory for float conversion buffer

This commit is contained in:
Stefan Brüns 2015-11-27 00:44:50 +01:00 committed by Uwe Hermann
parent c01378c95f
commit c7224164a0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/wav.c
View File

@ -36,6 +36,7 @@ struct out_context {
int chanbuf_size; int chanbuf_size;
int *chanbuf_used; int *chanbuf_used;
uint8_t **chanbuf; uint8_t **chanbuf;
float *fdata;
}; };
static int realloc_chanbufs(const struct sr_output *o, int size) static int realloc_chanbufs(const struct sr_output *o, int size)
@ -281,7 +282,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
num_samples = analog->num_samples; num_samples = analog->num_samples;
channels = analog->meaning->channels; channels = analog->meaning->channels;
num_channels = g_slist_length(analog->meaning->channels); num_channels = g_slist_length(analog->meaning->channels);
data = g_malloc(sizeof(float) * num_samples * num_channels); if (!(data = g_try_realloc(outc->fdata, sizeof(float) * num_samples * num_channels)))
return SR_ERR_MALLOC;
outc->fdata = data;
ret = sr_analog_to_float(analog, data); ret = sr_analog_to_float(analog, data);
if (ret != SR_OK) if (ret != SR_OK)
return ret; return ret;
@ -363,6 +366,7 @@ static int cleanup(struct sr_output *o)
g_free(outc->chanbuf[i]); g_free(outc->chanbuf[i]);
g_free(outc->chanbuf_used); g_free(outc->chanbuf_used);
g_free(outc->chanbuf); g_free(outc->chanbuf);
g_free(outc->fdata);
g_free(outc); g_free(outc);
o->priv = NULL; o->priv = NULL;