diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-20 17:03:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-20 20:05:26 +0100 |
| commit | 068f8fe319aad390788bdea24ad21ef758d6dd03 (patch) | |
| tree | a029685c2aff69c9cbce8839f2cdcf42d4b08748 /src/lib/j2k_wav_encoder.cc | |
| parent | b996eb8276dc4645745540190c9a2f5e2c875c0c (diff) | |
Don't cache sample format, fix up various things.
Diffstat (limited to 'src/lib/j2k_wav_encoder.cc')
| -rw-r--r-- | src/lib/j2k_wav_encoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/j2k_wav_encoder.cc b/src/lib/j2k_wav_encoder.cc index 58f8a101f..7697a5e78 100644 --- a/src/lib/j2k_wav_encoder.cc +++ b/src/lib/j2k_wav_encoder.cc @@ -351,16 +351,16 @@ J2KWAVEncoder::process_audio (float** data, int frames) if (_swr_context) { /* Compute the resampled frames count and add 32 for luck */ - int const resampled_frames = ceil (frames * _fs->target_sample_rate() / _fs->audio_sample_rate()) + 32; + int const max_resampled_frames = ceil (frames * _fs->target_sample_rate() / _fs->audio_sample_rate()) + 32; /* Make a buffer to put the result in */ for (int i = 0; i < _fs->audio_channels(); ++i) { - resampled[i] = new float[resampled_frames]; + resampled[i] = new float[max_resampled_frames]; } /* Resample audio */ - int out_frames = swr_convert (_swr_context, (uint8_t **) resampled, resampled_frames, (uint8_t const **) data, frames); - if (out_frames < 0) { + int const resampled_frames = swr_convert (_swr_context, (uint8_t **) resampled, max_resampled_frames, (uint8_t const **) data, frames); + if (resampled_frames < 0) { throw EncodeError ("could not run sample-rate converter"); } |