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

Fixes C90 issues for obsolete compilers

Browse source 
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
This commit is contained in:
Robert Meakins 2013-03-11 12:59:15 -04:00 • committed by Jean-Marc Valin
parent d865fe6187
commit 097fd4b111
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/analysis.c
View file

@ -480,6 +480,11 @@ void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info_out, con
{ {
float tau, beta; float tau, beta;
float p0, p1; float p0, p1;
float s0, m0;
float psum;
float speech0;
float music0;
/* One transition every 3 minutes */ /* One transition every 3 minutes */
tau = .00005f*frame_probs[1]; tau = .00005f*frame_probs[1];
beta = .05f; beta = .05f;
@ -497,15 +502,14 @@ void tonality_analysis(TonalityAnalysisState *tonal, AnalysisInfo *info_out, con
tonal->music_prob = p1/(p0+p1); tonal->music_prob = p1/(p0+p1);
info->music_prob = tonal->music_prob; info->music_prob = tonal->music_prob;
float psum=1e-20; psum=1e-20;
float speech0 = (float)pow(1-frame_probs[0], beta); speech0 = (float)pow(1-frame_probs[0], beta);
float music0 = (float)pow(frame_probs[0], beta); music0 = (float)pow(frame_probs[0], beta);
if (tonal->count==1) if (tonal->count==1)
{ {
tonal->pspeech[0]=.5; tonal->pspeech[0]=.5;
tonal->pmusic [0]=.5; tonal->pmusic [0]=.5;
} }
float s0, m0;
s0 = tonal->pspeech[0] + tonal->pspeech[1]; s0 = tonal->pspeech[0] + tonal->pspeech[1];
m0 = tonal->pmusic [0] + tonal->pmusic [1]; m0 = tonal->pmusic [0] + tonal->pmusic [1];
tonal->pspeech[0] = s0*(1-tau)*speech0; tonal->pspeech[0] = s0*(1-tau)*speech0;
@ -607,7 +611,7 @@ int run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, con
if (variable_duration == OPUS_FRAMESIZE_VARIABLE && frame_size >= Fs/200) if (variable_duration == OPUS_FRAMESIZE_VARIABLE && frame_size >= Fs/200)
{ {
int LM = 3; int LM = 3;
LM = optimize_framesize(pcm, frame_size, C, Fs, bitrate_bps, LM = optimize_framesize((const opus_val16*)pcm, frame_size, C, Fs, bitrate_bps,
analysis->prev_tonality, analysis->subframe_mem, delay_compensation, downmix); analysis->prev_tonality, analysis->subframe_mem, delay_compensation, downmix);
while ((Fs/400<<LM)>frame_size) while ((Fs/400<<LM)>frame_size)
LM--; LM--;