diff options
| author | Christian Hoene <christian.hoene@symonics.com> | 2016-05-06 19:22:44 +0200 |
|---|---|---|
| committer | Christian Hoene <christian.hoene@symonics.com> | 2016-05-06 19:22:44 +0200 |
| commit | b26f3306625fe3f97d730c256cbb9b0722242a5b (patch) | |
| tree | 4972eb1a322c7e14458c7870aea87f4fd0a064ea /modules/mpa | |
| parent | 1081461b418ef49943be1adae8752ad41052ef87 (diff) | |
Some minor issues
Diffstat (limited to 'modules/mpa')
| -rw-r--r-- | modules/mpa/decode.c | 6 | ||||
| -rw-r--r-- | modules/mpa/mpa.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/modules/mpa/decode.c b/modules/mpa/decode.c index d62bd60..5554d25 100644 --- a/modules/mpa/decode.c +++ b/modules/mpa/decode.c @@ -108,7 +108,7 @@ int mpa_decode_update(struct audec_state **adsp, const struct aucodec *ac, int mpa_decode_frm(struct audec_state *ads, int16_t *sampv, size_t *sampc, const uint8_t *buf, size_t len) { - int result, channels, encoding, i; + int result, channels, encoding, i, result2; long samplerate; size_t n; spx_uint32_t intermediate_len; @@ -131,10 +131,10 @@ int mpa_decode_frm(struct audec_state *ads, int16_t *sampv, size_t *sampc, intermediate_len = n / 2 / ads->channels; /* intermediate_len counts samples per channel */ out_len = *sampc; - result=speex_resampler_process_interleaved_int( + result2=speex_resampler_process_interleaved_int( ads->resampler, ads->intermediate_buffer, &intermediate_len, sampv, &out_len); - if (result!=RESAMPLER_ERR_SUCCESS) { + if (result2!=RESAMPLER_ERR_SUCCESS) { error("mpa: upsample error: %s %d %d\n", strerror(result), out_len, *sampc/2); return EPROTO; diff --git a/modules/mpa/mpa.c b/modules/mpa/mpa.c index 88ebfbe..6276bf2 100644 --- a/modules/mpa/mpa.c +++ b/modules/mpa/mpa.c @@ -79,8 +79,7 @@ static struct aucodec mpa = { - .pt = NULL, /* for the time being, to cope -with AVT AC1 interop problems, we do not use "14" here */ + .pt = "14", .name = "MPA", .srate = 90000, .ch = 1, |