locut_cutoff_hz = cutoff_hz;
}
- void set_locut_enabled(bool enabled)
+ void set_locut_enabled(unsigned bus, bool enabled)
{
- locut_enabled = enabled;
+ locut_enabled[bus] = enabled;
}
- bool get_locut_enabled() const
+ bool get_locut_enabled(unsigned bus)
{
- return locut_enabled;
+ return locut_enabled[bus];
}
float get_limiter_threshold_dbfs() const
return limiter_threshold_dbfs;
}
- float get_compressor_threshold_dbfs() const
+ float get_compressor_threshold_dbfs(unsigned bus_index) const
{
- return compressor_threshold_dbfs;
+ return compressor_threshold_dbfs[bus_index];
}
void set_limiter_threshold_dbfs(float threshold_dbfs)
limiter_threshold_dbfs = threshold_dbfs;
}
- void set_compressor_threshold_dbfs(float threshold_dbfs)
+ void set_compressor_threshold_dbfs(unsigned bus_index, float threshold_dbfs)
{
- compressor_threshold_dbfs = threshold_dbfs;
+ compressor_threshold_dbfs[bus_index] = threshold_dbfs;
}
void set_limiter_enabled(bool enabled)
return limiter_enabled;
}
- void set_compressor_enabled(bool enabled)
+ void set_compressor_enabled(unsigned bus_index, bool enabled)
{
- compressor_enabled = enabled;
+ compressor_enabled[bus_index] = enabled;
}
- bool get_compressor_enabled() const
+ bool get_compressor_enabled(unsigned bus_index) const
{
- return compressor_enabled;
+ return compressor_enabled[bus_index];
}
- void set_gain_staging_db(float gain_db)
+ void set_gain_staging_db(unsigned bus_index, float gain_db)
{
std::unique_lock<std::mutex> lock(compressor_mutex);
- level_compressor_enabled = false;
- gain_staging_db = gain_db;
+ level_compressor_enabled[bus_index] = false;
+ gain_staging_db[bus_index] = gain_db;
}
- float get_gain_staging_db() const
+ float get_gain_staging_db(unsigned bus_index) const
{
std::unique_lock<std::mutex> lock(compressor_mutex);
- return gain_staging_db;
+ return gain_staging_db[bus_index];
}
- void set_gain_staging_auto(bool enabled)
+ void set_gain_staging_auto(unsigned bus_index, bool enabled)
{
std::unique_lock<std::mutex> lock(compressor_mutex);
- level_compressor_enabled = enabled;
+ level_compressor_enabled[bus_index] = enabled;
}
- bool get_gain_staging_auto() const
+ bool get_gain_staging_auto(unsigned bus_index) const
{
std::unique_lock<std::mutex> lock(compressor_mutex);
- return level_compressor_enabled;
+ return level_compressor_enabled[bus_index];
}
void set_final_makeup_gain_db(float gain_db)
return final_makeup_gain_auto;
}
+ struct BusLevel {
+ float current_level_dbfs[2]; // Digital peak of last frame, left and right.
+ float peak_level_dbfs[2]; // Digital peak with hold, left and right.
+ float gain_staging_db;
+ float compressor_attenuation_db; // A positive number; 0.0 for no attenuation.
+ };
+
typedef std::function<void(float level_lufs, float peak_db,
- std::vector<float> bus_level_lufs,
+ std::vector<BusLevel> bus_levels,
float global_level_lufs, float range_low_lufs, float range_high_lufs,
- float gain_staging_db, float final_makeup_gain_db,
+ float final_makeup_gain_db,
float correlation)> audio_level_callback_t;
void set_audio_level_callback(audio_level_callback_t callback)
{
void reset_alsa_mutex_held(DeviceSpec device_spec);
std::map<DeviceSpec, DeviceInfo> get_devices_mutex_held() const;
void update_meters(const std::vector<float> &samples);
- void measure_bus_levels(unsigned bus_index, const std::vector<float> &left, const std::vector<float> &right);
+ void measure_bus_levels(unsigned bus_index, const std::vector<float> &left, const std::vector<float> &right, float volume);
void send_audio_level_callback();
unsigned num_cards;
AudioDevice alsa_inputs[MAX_ALSA_CARDS]; // Under audio_mutex.
std::vector<ALSAInput::Device> available_alsa_cards;
- StereoFilter locut; // Default cutoff 120 Hz, 24 dB/oct.
std::atomic<float> locut_cutoff_hz;
- std::atomic<bool> locut_enabled{true};
+ StereoFilter locut[MAX_BUSES]; // Default cutoff 120 Hz, 24 dB/oct.
+ std::atomic<bool> locut_enabled[MAX_BUSES];
// First compressor; takes us up to about -12 dBFS.
mutable std::mutex compressor_mutex;
- StereoCompressor level_compressor; // Under compressor_mutex. Used to set/override gain_staging_db if <level_compressor_enabled>.
- float gain_staging_db = 0.0f; // Under compressor_mutex.
- bool level_compressor_enabled = true; // Under compressor_mutex.
+ std::unique_ptr<StereoCompressor> level_compressor[MAX_BUSES]; // Under compressor_mutex. Used to set/override gain_staging_db if <level_compressor_enabled>.
+ float gain_staging_db[MAX_BUSES]; // Under compressor_mutex.
+ bool level_compressor_enabled[MAX_BUSES]; // Under compressor_mutex.
static constexpr float ref_level_dbfs = -14.0f; // Chosen so that we end up around 0 LU in practice.
static constexpr float ref_level_lufs = -23.0f; // 0 LU, more or less by definition.
StereoCompressor limiter;
std::atomic<float> limiter_threshold_dbfs{ref_level_dbfs + 4.0f}; // 4 dB.
std::atomic<bool> limiter_enabled{true};
- StereoCompressor compressor;
- std::atomic<float> compressor_threshold_dbfs{ref_level_dbfs - 12.0f}; // -12 dB.
- std::atomic<bool> compressor_enabled{true};
+ std::unique_ptr<StereoCompressor> compressor[MAX_BUSES];
+ std::atomic<float> compressor_threshold_dbfs[MAX_BUSES];
+ std::atomic<bool> compressor_enabled[MAX_BUSES];
+
+ struct PeakHistory {
+ float current_level = 0.0f; // Peak of the last frame (not in dB).
+ float current_peak = 0.0f; // Current peak of the peak meter (not in dB).
+ float last_peak = 0.0f;
+ float age_seconds = 0.0f; // Time since "last_peak" was set.
+ };
+ PeakHistory peak_history[MAX_BUSES][2]; // Separate for each channel.
double final_makeup_gain = 1.0; // Under compressor_mutex. Read/write by the user. Note: Not in dB, we want the numeric precision so that we can change it slowly.
bool final_makeup_gain_auto = true; // Under compressor_mutex.
CorrelationMeasurer correlation; // Under audio_measure_mutex.
Resampler peak_resampler; // Under audio_measure_mutex.
std::atomic<float> peak{0.0f};
-
- // Under audio_measure_mutex. Note that Ebu_r128_proc has a broken
- // copy constructor (it uses the default, but holds arrays),
- // so we can't just use raw Ebu_r128_proc elements, but need to use
- // unique_ptrs.
- std::vector<std::unique_ptr<Ebu_r128_proc>> bus_r128;
};
#endif // !defined(_AUDIO_MIXER_H)
projects / nageru / blobdiff