Fix an instance of undefined integer behavior. Found by the Clang static analyzer.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index f3ff4c385c1d46b4f3b03dc5832a6ba816a8587a..39bae192c5bda7722f2aa527da80e62b990ba7fe 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -98,6 +98,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
          num_cards(num_cards),
          mixer_surface(create_surface(format)),
          h264_encoder_surface(create_surface(format)),
+         correlation(OUTPUT_FREQUENCY),
          level_compressor(OUTPUT_FREQUENCY),
          limiter(OUTPUT_FREQUENCY),
          compressor(OUTPUT_FREQUENCY)
@@ -184,7 +185,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
        // hlen=16 is pretty low quality, but we use quite a bit of CPU otherwise,
        // and there's a limit to how important the peak meter is.
-       peak_resampler.setup(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY * 4, /*num_channels=*/2, /*hlen=*/16);
+       peak_resampler.setup(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY * 4, /*num_channels=*/2, /*hlen=*/16, /*frel=*/1.0);
 
        alsa.reset(new ALSAOutput(OUTPUT_FREQUENCY, /*num_channels=*/2));
 }
@@ -534,7 +535,8 @@ void Mixer::thread_func()
 
                        audio_level_callback(loudness_s, 20.0 * log10(peak),
                                             loudness_i, loudness_range_low, loudness_range_high,
-                                            gain_staging_db, 20.0 * log10(final_makeup_gain));
+                                            gain_staging_db, 20.0 * log10(final_makeup_gain),
+                                            correlation.get_correlation());
                }
 
                for (unsigned card_index = 1; card_index < num_cards; ++card_index) {
@@ -822,13 +824,14 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples)
                final_makeup_gain = m;
        }
 
-       // Find R128 levels.
+       // Find R128 levels and L/R correlation.
        vector<float> left, right;
        deinterleave_samples(samples_out, &left, &right);
        float *ptrs[] = { left.data(), right.data() };
        {
                unique_lock<mutex> lock(compressor_mutex);
                r128.process(left.size(), ptrs);
+               correlation.process_samples(samples_out);
        }
 
        // Send the samples to the sound card.
@@ -933,6 +936,7 @@ void Mixer::reset_meters()
        peak = 0.0f;
        r128.reset();
        r128.integr_start();
+       correlation.reset();
 }
 
 Mixer::OutputChannel::~OutputChannel()