eden-emu/opus
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimizes encoder NaN detection and clipping by only running them when needed

Browse source 
NaN detection should now be able to catch values that would create NaNs
further down.
This commit is contained in:
Jean-Marc Valin 2013-12-08 03:31:50 -05:00
parent 5626908ec3
commit c94e4bb103
4 changed files with 39 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/opus_multistream_encoder.c
View file

@ -674,7 +674,8 @@ static int opus_multistream_encode_native
unsigned char *data,
opus_int32 max_data_bytes,
int lsb_depth,
downmix_func downmix
downmix_func downmix,
int float_api
)
{
opus_int32 Fs;
@ -849,7 +850,7 @@ static int opus_multistream_encode_native
if (!vbr && s == st->layout.nb_streams-1)
opus_encoder_ctl(enc, OPUS_SET_BITRATE(curr_max*(8*Fs/frame_size)));
len = opus_encode_native(enc, buf, frame_size, tmp_data, curr_max, lsb_depth,
pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, downmix);
pcm, analysis_frame_size, c1, c2, st->layout.nb_channels, downmix, float_api);
if (len<0)
{
RESTORE_STACK;
@ -922,7 +923,7 @@ int opus_multistream_encode(
)
{
return opus_multistream_encode_native(st, opus_copy_channel_in_short,
pcm, frame_size, data, max_data_bytes, 16, downmix_int);
pcm, frame_size, data, max_data_bytes, 16, downmix_int, 0);
}
#ifndef DISABLE_FLOAT_API
@ -935,7 +936,7 @@ int opus_multistream_encode_float(
)
{
return opus_multistream_encode_native(st, opus_copy_channel_in_float,
pcm, frame_size, data, max_data_bytes, 16, downmix_float);
pcm, frame_size, data, max_data_bytes, 16, downmix_float, 1);
}
#endif
@ -951,7 +952,7 @@ int opus_multistream_encode_float
)
{
return opus_multistream_encode_native(st, opus_copy_channel_in_float,
pcm, frame_size, data, max_data_bytes, 24, downmix_float);
pcm, frame_size, data, max_data_bytes, 24, downmix_float, 1);
}
int opus_multistream_encode(
@ -963,7 +964,7 @@ int opus_multistream_encode(
)
{
return opus_multistream_encode_native(st, opus_copy_channel_in_short,
pcm, frame_size, data, max_data_bytes, 16, downmix_int);
pcm, frame_size, data, max_data_bytes, 16, downmix_int, 0);
}
#endif