using namespace bmusb;
using namespace std;
+using namespace std::placeholders;
namespace {
// TODO: If these prove to be a bottleneck, they can be SSSE3-optimized
// (usually including multiple channels at a time).
+void convert_fixed16_to_fp32(float *dst, size_t out_channel, size_t out_num_channels,
+ const uint8_t *src, size_t in_channel, size_t in_num_channels,
+ size_t num_samples)
+{
+ assert(in_channel < in_num_channels);
+ assert(out_channel < out_num_channels);
+ src += in_channel * 2;
+ dst += out_channel;
+
+ for (size_t i = 0; i < num_samples; ++i) {
+ int16_t s = le16toh(*(int16_t *)src);
+ *dst = s * (1.0f / 32768.0f);
+
+ src += 2 * in_num_channels;
+ dst += out_num_channels;
+ }
+}
+
void convert_fixed24_to_fp32(float *dst, size_t out_channel, size_t out_num_channels,
const uint8_t *src, size_t in_channel, size_t in_num_channels,
size_t num_samples)
InputMapping new_input_mapping;
new_input_mapping.buses.push_back(input);
set_input_mapping(new_input_mapping);
+
+ // Look for ALSA cards.
+ available_alsa_cards = ALSAInput::enumerate_devices();
+}
+
+AudioMixer::~AudioMixer()
+{
+ for (unsigned card_index = 0; card_index < available_alsa_cards.size(); ++card_index) {
+ const AudioDevice &device = alsa_inputs[card_index];
+ if (device.alsa_device != nullptr) {
+ device.alsa_device->stop_capture_thread();
+ }
+ }
}
-void AudioMixer::reset_device(DeviceSpec device_spec)
+
+void AudioMixer::reset_resampler(DeviceSpec device_spec)
{
- lock_guard<mutex> lock(audio_mutex);
- reset_device_mutex_held(device_spec);
+ lock_guard<timed_mutex> lock(audio_mutex);
+ reset_resampler_mutex_held(device_spec);
}
-void AudioMixer::reset_device_mutex_held(DeviceSpec device_spec)
+void AudioMixer::reset_resampler_mutex_held(DeviceSpec device_spec)
{
AudioDevice *device = find_audio_device(device_spec);
+
if (device->interesting_channels.empty()) {
device->resampling_queue.reset();
} else {
// TODO: ResamplingQueue should probably take the full device spec.
// (It's only used for console output, though.)
- device->resampling_queue.reset(new ResamplingQueue(device_spec.index, OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, device->interesting_channels.size()));
+ device->resampling_queue.reset(new ResamplingQueue(device_spec.index, device->capture_frequency, OUTPUT_FREQUENCY, device->interesting_channels.size()));
}
device->next_local_pts = 0;
}
-void AudioMixer::add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, AudioFormat audio_format, int64_t frame_length)
+void AudioMixer::reset_alsa_mutex_held(DeviceSpec device_spec)
{
+ assert(device_spec.type == InputSourceType::ALSA_INPUT);
+ unsigned card_index = device_spec.index;
AudioDevice *device = find_audio_device(device_spec);
- lock_guard<mutex> lock(audio_mutex);
+ if (device->alsa_device != nullptr) {
+ device->alsa_device->stop_capture_thread();
+ }
+ if (device->interesting_channels.empty()) {
+ device->alsa_device.reset();
+ } else {
+ device->alsa_device.reset(new ALSAInput(available_alsa_cards[card_index].address.c_str(), OUTPUT_FREQUENCY, 2, bind(&AudioMixer::add_audio, this, device_spec, _1, _2, _3, _4)));
+ device->capture_frequency = device->alsa_device->get_sample_rate();
+ device->alsa_device->start_capture_thread();
+ }
+}
+
+bool AudioMixer::add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, AudioFormat audio_format, int64_t frame_length)
+{
+ AudioDevice *device = find_audio_device(device_spec);
+
+ unique_lock<timed_mutex> lock(audio_mutex, defer_lock);
+ if (!lock.try_lock_for(chrono::milliseconds(10))) {
+ return false;
+ }
if (device->resampling_queue == nullptr) {
// No buses use this device; throw it away.
- return;
+ return true;
}
unsigned num_channels = device->interesting_channels.size();
assert(num_channels > 0);
- // Convert the audio to stereo fp32.
+ // Convert the audio to fp32.
vector<float> audio;
audio.resize(num_samples * num_channels);
unsigned channel_index = 0;
case 0:
assert(num_samples == 0);
break;
+ case 16:
+ convert_fixed16_to_fp32(&audio[0], channel_index, num_channels, data, *channel_it, audio_format.num_channels, num_samples);
+ break;
case 24:
convert_fixed24_to_fp32(&audio[0], channel_index, num_channels, data, *channel_it, audio_format.num_channels, num_samples);
break;
int64_t local_pts = device->next_local_pts;
device->resampling_queue->add_input_samples(local_pts / double(TIMEBASE), audio.data(), num_samples);
device->next_local_pts = local_pts + frame_length;
+ return true;
}
-void AudioMixer::add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames, int64_t frame_length)
+bool AudioMixer::add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames, int64_t frame_length)
{
AudioDevice *device = find_audio_device(device_spec);
- lock_guard<mutex> lock(audio_mutex);
+ unique_lock<timed_mutex> lock(audio_mutex, defer_lock);
+ if (!lock.try_lock_for(chrono::milliseconds(10))) {
+ return false;
+ }
if (device->resampling_queue == nullptr) {
// No buses use this device; throw it away.
- return;
+ return true;
}
unsigned num_channels = device->interesting_channels.size();
// is always the same.
device->next_local_pts += frame_length;
}
+ return true;
}
AudioMixer::AudioDevice *AudioMixer::find_audio_device(DeviceSpec device)
{
switch (device.type) {
case InputSourceType::CAPTURE_CARD:
- return &cards[device.index];
- break;
+ return &video_cards[device.index];
+ case InputSourceType::ALSA_INPUT:
+ return &alsa_inputs[device.index];
case InputSourceType::SILENCE:
default:
assert(false);
return nullptr;
}
-void AudioMixer::find_sample_src_from_device(const vector<float> *samples_card, DeviceSpec device_spec, int source_channel, const float **srcptr, unsigned *stride)
+// Get a pointer to the given channel from the given device.
+// The channel must be picked out earlier and resampled.
+void AudioMixer::find_sample_src_from_device(const map<DeviceSpec, vector<float>> &samples_card, DeviceSpec device_spec, int source_channel, const float **srcptr, unsigned *stride)
{
static float zero = 0.0f;
if (source_channel == -1 || device_spec.type == InputSourceType::SILENCE) {
return;
}
AudioDevice *device = find_audio_device(device_spec);
+ assert(device->interesting_channels.count(source_channel) != 0);
unsigned channel_index = 0;
for (int channel : device->interesting_channels) {
if (channel == source_channel) break;
++channel_index;
}
assert(channel_index < device->interesting_channels.size());
- *srcptr = &samples_card[device_spec.index][channel_index];
+ const auto it = samples_card.find(device_spec);
+ assert(it != samples_card.end());
+ *srcptr = &(it->second)[channel_index];
*stride = device->interesting_channels.size();
}
// TODO: Can be SSSE3-optimized if need be.
-void AudioMixer::fill_audio_bus(const vector<float> *samples_card, const InputMapping::Bus &bus, unsigned num_samples, float *output)
+void AudioMixer::fill_audio_bus(const map<DeviceSpec, vector<float>> &samples_card, const InputMapping::Bus &bus, unsigned num_samples, float *output)
{
if (bus.device.type == InputSourceType::SILENCE) {
memset(output, 0, num_samples * sizeof(*output));
} else {
- assert(bus.device.type == InputSourceType::CAPTURE_CARD);
+ assert(bus.device.type == InputSourceType::CAPTURE_CARD ||
+ bus.device.type == InputSourceType::ALSA_INPUT);
const float *lsrc, *rsrc;
unsigned lstride, rstride;
float *dptr = output;
vector<float> AudioMixer::get_output(double pts, unsigned num_samples, ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy)
{
- vector<float> samples_card[MAX_CARDS]; // TODO: Needs room for other kinds of capture cards.
+ map<DeviceSpec, vector<float>> samples_card;
vector<float> samples_bus;
- lock_guard<mutex> lock(audio_mutex);
+ lock_guard<timed_mutex> lock(audio_mutex);
// Pick out all the interesting channels from all the cards.
- for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
- AudioDevice *device = &cards[card_index];
+ // TODO: If the card has been hotswapped, the number of channels
+ // might have changed; if so, we need to do some sort of remapping
+ // to silence.
+ for (const auto &spec_and_info : get_devices_mutex_held()) {
+ const DeviceSpec &device_spec = spec_and_info.first;
+ AudioDevice *device = find_audio_device(device_spec);
if (!device->interesting_channels.empty()) {
- samples_card[card_index].resize(num_samples * device->interesting_channels.size());
+ samples_card[device_spec].resize(num_samples * device->interesting_channels.size());
device->resampling_queue->get_output_samples(
pts,
- &samples_card[card_index][0],
+ &samples_card[device_spec][0],
num_samples,
rate_adjustment_policy);
}
return samples_out;
}
-vector<string> AudioMixer::get_names() const
+map<DeviceSpec, DeviceInfo> AudioMixer::get_devices() const
+{
+ lock_guard<timed_mutex> lock(audio_mutex);
+ return get_devices_mutex_held();
+}
+
+map<DeviceSpec, DeviceInfo> AudioMixer::get_devices_mutex_held() const
{
- lock_guard<mutex> lock(audio_mutex);
- vector<string> names;
+ map<DeviceSpec, DeviceInfo> devices;
for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
- const AudioDevice *device = &cards[card_index];
- names.push_back(device->name);
+ const DeviceSpec spec{ InputSourceType::CAPTURE_CARD, card_index };
+ const AudioDevice *device = &video_cards[card_index];
+ DeviceInfo info;
+ info.name = device->name;
+ info.num_channels = 8; // FIXME: This is wrong for fake cards.
+ devices.insert(make_pair(spec, info));
+ }
+ for (unsigned card_index = 0; card_index < available_alsa_cards.size(); ++card_index) {
+ const DeviceSpec spec{ InputSourceType::ALSA_INPUT, card_index };
+ const ALSAInput::Device &device = available_alsa_cards[card_index];
+ DeviceInfo info;
+ info.name = device.name + " (" + device.info + ")";
+ info.num_channels = device.num_channels;
+ devices.insert(make_pair(spec, info));
}
- return names;
+ return devices;
}
void AudioMixer::set_name(DeviceSpec device_spec, const string &name)
{
AudioDevice *device = find_audio_device(device_spec);
- lock_guard<mutex> lock(audio_mutex);
+ lock_guard<timed_mutex> lock(audio_mutex);
device->name = name;
}
void AudioMixer::set_input_mapping(const InputMapping &new_input_mapping)
{
- lock_guard<mutex> lock(audio_mutex);
+ lock_guard<timed_mutex> lock(audio_mutex);
- // FIXME: This needs to be keyed on DeviceSpec.
- map<unsigned, set<unsigned>> interesting_channels;
+ map<DeviceSpec, set<unsigned>> interesting_channels;
for (const InputMapping::Bus &bus : new_input_mapping.buses) {
- if (bus.device.type == InputSourceType::CAPTURE_CARD) {
+ if (bus.device.type == InputSourceType::CAPTURE_CARD ||
+ bus.device.type == InputSourceType::ALSA_INPUT) {
for (unsigned channel = 0; channel < 2; ++channel) {
if (bus.source_channel[channel] != -1) {
- interesting_channels[bus.device.index].insert(bus.source_channel[channel]);
+ interesting_channels[bus.device].insert(bus.source_channel[channel]);
}
}
}
}
// Reset resamplers for all cards that don't have the exact same state as before.
- for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
- AudioDevice *device = &cards[card_index];
- if (device->interesting_channels != interesting_channels[card_index]) {
- device->interesting_channels = interesting_channels[card_index];
- reset_device_mutex_held(DeviceSpec{InputSourceType::CAPTURE_CARD, card_index});
+ for (const auto &spec_and_info : get_devices_mutex_held()) {
+ const DeviceSpec &device_spec = spec_and_info.first;
+ AudioDevice *device = find_audio_device(device_spec);
+ if (device->interesting_channels != interesting_channels[device_spec]) {
+ device->interesting_channels = interesting_channels[device_spec];
+ if (device_spec.type == InputSourceType::ALSA_INPUT) {
+ reset_alsa_mutex_held(device_spec);
+ }
+ reset_resampler_mutex_held(device_spec);
}
}
InputMapping AudioMixer::get_input_mapping() const
{
- lock_guard<mutex> lock(audio_mutex);
+ lock_guard<timed_mutex> lock(audio_mutex);
return input_mapping;
}
projects / nageru / blobdiff