X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Faudio_mixer.cpp;h=9b588d704d63303dccd354a40bafcbc7431f6d69;hb=9ffd4f03f314cc6e0254449593def95c9bc203d6;hp=f63fe242460fcfbc1fa51f3b5f23809d627e68ab;hpb=eeda8995329601f9f4e35047358400833eeae68e;p=nageru

diff --git a/nageru/audio_mixer.cpp b/nageru/audio_mixer.cpp
index f63fe24..9b588d7 100644
--- a/nageru/audio_mixer.cpp
+++ b/nageru/audio_mixer.cpp
@@ -65,8 +65,8 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channel, size_t out_num_chan
 		uint32_t s1 = src[0];
 		uint32_t s2 = src[1];
 		uint32_t s3 = src[2];
-		uint32_t s = s1 | (s1 << 8) | (s2 << 16) | (s3 << 24);
-		*dst = int(s) * (1.0f / 2147483648.0f);
+		uint32_t s = (s1 << 8) | (s2 << 16) | (s3 << 24);  // Note: The bottom eight bits are zero; s3 includes the sign bit.
+		*dst = int(s) * (1.0f / (256.0f * 8388608.0f));  // 256 for signed down-shift by 8, then 2^23 for the actual conversion.
 
 		src += 3 * in_num_channels;
 		dst += out_num_channels;
@@ -206,7 +206,7 @@ AudioMixer::AudioMixer(unsigned num_capture_cards, unsigned num_ffmpeg_inputs)
 		                                  &new_input_mapping)) {
 			fprintf(stderr, "Failed to load input mapping from '%s', exiting.\n",
 				global_flags.input_mapping_filename.c_str());
-			exit(1);
+			abort();
 		}
 		set_input_mapping(new_input_mapping);
 	} else {
@@ -244,7 +244,7 @@ void AudioMixer::reset_resampler_mutex_held(DeviceSpec device_spec)
 	}
 }
 
-bool AudioMixer::add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, AudioFormat audio_format, int64_t frame_length, steady_clock::time_point frame_time)
+bool AudioMixer::add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, AudioFormat audio_format, steady_clock::time_point frame_time)
 {
 	AudioDevice *device = find_audio_device(device_spec);
 
@@ -294,7 +294,7 @@ bool AudioMixer::add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned
 	return true;
 }
 
-bool 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)
 {
 	AudioDevice *device = find_audio_device(device_spec);