shithub: opus

Info  •  Files  •  Log  •  Branches

Address static analysis reports from scan-build

--- a/src/analysis.c

+++ b/src/analysis.c

@@ -540,17 +540,14 @@

        /* Instantaneous probability of speech and music, with beta pre-applied. */

        float speech0;

        float music0;

+       float p, q;

        /* One transition every 3 minutes of active audio */

        tau = .00005f*frame_probs[1];

-       beta = .05f;

-       if (1) {

-          /* Adapt beta based on how "unexpected" the new prob is */

-          float p, q;

-          p = MAX16(.05f,MIN16(.95f,frame_probs[0]));

-          q = MAX16(.05f,MIN16(.95f,tonal->music_prob));

-          beta = .01f+.05f*ABS16(p-q)/(p*(1-q)+q*(1-p));

-       }

+       /* Adapt beta based on how "unexpected" the new prob is */

+       p = MAX16(.05f,MIN16(.95f,frame_probs[0]));

+       q = MAX16(.05f,MIN16(.95f,tonal->music_prob));

+       beta = .01f+.05f*ABS16(p-q)/(p*(1-q)+q*(1-p));

        /* p0 and p1 are the probabilities of speech and music at this frame

           using only information from previous frame and applying the

           state transition model */

--- a/src/opus_encoder.c

+++ b/src/opus_encoder.c

@@ -860,9 +860,6 @@

 opus_val16 compute_stereo_width(const opus_val16 *pcm, int frame_size, opus_int32 Fs, StereoWidthState *mem)

 {

-   opus_val16 corr;

-   opus_val16 ldiff;

-   opus_val16 width;

    opus_val32 xx, xy, yy;

    opus_val16 sqrt_xx, sqrt_yy;

    opus_val16 qrrt_xx, qrrt_yy;

@@ -915,6 +912,9 @@

    mem->YY = MAX32(0, mem->YY);

    if (MAX32(mem->XX, mem->YY)>QCONST16(8e-4f, 18))

    {

+      opus_val16 corr;

+      opus_val16 ldiff;

+      opus_val16 width;

       sqrt_xx = celt_sqrt(mem->XX);

       sqrt_yy = celt_sqrt(mem->YY);

       qrrt_xx = celt_sqrt(sqrt_xx);

@@ -929,10 +929,6 @@

       mem->smoothed_width += (width-mem->smoothed_width)/frame_rate;

       /* Peak follower */

       mem->max_follower = MAX16(mem->max_follower-QCONST16(.02f,15)/frame_rate, mem->smoothed_width);

-   } else {

-      width = 0;

-      corr=Q15ONE;

-      ldiff=0;

    }

    /*printf("%f %f %f %f %f ", corr/(float)Q15ONE, ldiff/(float)Q15ONE, width/(float)Q15ONE, mem->smoothed_width/(float)Q15ONE, mem->max_follower/(float)Q15ONE);*/

    return EXTRACT16(MIN32(Q15ONE, MULT16_16(20, mem->max_follower)));