#define SND_MIN_SPEED 8000
-#define SND_MAX_SPEED 96000
+#define SND_MAX_SPEED 48000
#define SND_MIN_WIDTH 1
#define SND_MAX_WIDTH 2
#define SND_MIN_CHANNELS 1
static speakerlayout_t snd_speakerlayout;
// Our speaker layouts are based on ALSA. They differ from those
-// Win32 APIs and Mac OS X use when there's more than 4 channels.
+// Win32 and Mac OS X APIs use when there's more than 4 channels.
// (rear left + rear right, and front center + LFE are swapped).
#define SND_SPEAKERLAYOUTS (sizeof(snd_speakerlayouts) / sizeof(snd_speakerlayouts[0]))
static const speakerlayout_t snd_speakerlayouts[] =
snd_ringbuffer_t *snd_renderbuffer = NULL;
unsigned int soundtime = 0;
static unsigned int oldpaintedtime = 0;
-unsigned int extrasoundtime = 0;
+static unsigned int extrasoundtime = 0;
static double snd_starttime = 0.0;
vec3_t listener_origin;
static qboolean sound_spatialized = false;
qboolean simsound = false;
-qboolean alsaspeakerlayout = false;
+
+static qboolean recording_sound = false;
int snd_blocked = 0;
-static int current_swapstereo = 0;
+static int current_swapstereo = false;
+static int current_channellayout = SND_CHANNELLAYOUT_AUTO;
+static int current_channellayout_used = SND_CHANNELLAYOUT_AUTO;
// Cvars declared in sound.h (part of the sound API)
cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1", "volume of background music (such as CD music or replacement files such as sound/cdtracks/track002.ogg)"};
cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.1", "how much sound to mix ahead of time"};
cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1", "enables keeping compressed ogg sound files compressed, decompressing them only as needed, otherwise they will be decompressed completely at load (may use a lot of memory)"};
cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0", "swaps left/right speakers for old ISA soundblaster cards"};
+cvar_t snd_channellayout = {0, "snd_channellayout", "0", "channel layout. Can be 0 (auto - snd_restart needed), 1 (standard layout), or 2 (ALSA layout)"};
// Local cvars
static cvar_t nosound = {0, "nosound", "0", "disables sound"};
}
-// TODO: make this function smarter...
static qboolean S_ChooseCheaperFormat (snd_format_t* format, qboolean fixed_speed, qboolean fixed_width, qboolean fixed_channels)
{
- // Can we decrease the number of channels?
- if (!fixed_channels && format->channels > 1)
+ static const snd_format_t thresholds [] =
{
- unsigned short channels = format->channels;
-
- // If it has an odd number of channels(?!), make it even
- if (channels & 1)
- channels--;
- else
- {
- // Remove 2 speakers, unless it's a stereo format
- if (channels != 2)
- channels -= 2;
- else
- channels = 1;
- }
+ // speed width channels
+ { SND_MIN_SPEED, SND_MIN_WIDTH, SND_MIN_CHANNELS },
+ { 11025, 1, 2 },
+ { 22050, 2, 2 },
+ { 44100, 2, 2 },
+ { 48000, 2, 6 },
+ { SND_MAX_SPEED, SND_MAX_WIDTH, SND_MAX_CHANNELS },
+ };
+ const unsigned int nb_thresholds = sizeof(thresholds) / sizeof(thresholds[0]);
+ unsigned int speed_level, width_level, channels_level;
+
+ // If we have reached the minimum values, there's nothing more we can do
+ if ((format->speed == thresholds[0].speed || fixed_speed) &&
+ (format->width == thresholds[0].width || fixed_width) &&
+ (format->channels == thresholds[0].channels || fixed_channels))
+ return false;
- format->channels = channels;
- return true;
+ // Check the min and max values
+ #define CHECK_BOUNDARIES(param) \
+ if (format->param < thresholds[0].param) \
+ { \
+ format->param = thresholds[0].param; \
+ return true; \
+ } \
+ if (format->param > thresholds[nb_thresholds - 1].param) \
+ { \
+ format->param = thresholds[nb_thresholds - 1].param; \
+ return true; \
}
+ CHECK_BOUNDARIES(speed);
+ CHECK_BOUNDARIES(width);
+ CHECK_BOUNDARIES(channels);
+ #undef CHECK_BOUNDARIES
+
+ // Find the level of each parameter
+ #define FIND_LEVEL(param) \
+ param##_level = 0; \
+ while (param##_level < nb_thresholds - 1) \
+ { \
+ if (format->param <= thresholds[param##_level].param) \
+ break; \
+ \
+ param##_level++; \
+ }
+ FIND_LEVEL(speed);
+ FIND_LEVEL(width);
+ FIND_LEVEL(channels);
+ #undef FIND_LEVEL
- // Can we decrease the speed?
- if (!fixed_speed)
+ // Decrease the parameter with the highest level to the previous level
+ if (channels_level >= speed_level && channels_level >= width_level && !fixed_channels)
{
- unsigned int suggest_speeds [] = { 44100, 22050, 11025 };
- unsigned int i;
-
- for (i = 0; i < sizeof(suggest_speeds) / sizeof(suggest_speeds[0]); i++)
- if (format->speed > suggest_speeds[i])
- {
- format->speed = suggest_speeds[i];
- return true;
- }
-
- // the speed is already low
+ format->channels = thresholds[channels_level - 1].channels;
+ return true;
}
-
- // Can we decrease the number of bits per sample?
- if (!fixed_width && format->width > 1)
+ if (speed_level >= width_level && !fixed_speed)
{
- format->width = 1;
+ format->speed = thresholds[speed_level - 1].speed;
return true;
}
- return false;
+ format->width = thresholds[width_level - 1].width;
+ return true;
}
#define SWAP_LISTENERS(l1, l2, tmpl) { tmpl = (l1); (l1) = (l2); (l2) = tmpl; }
-void S_SetSpeakerLayout (void)
+static void S_SetChannelLayout (void)
{
unsigned int i;
listener_t swaplistener;
listener_t *listeners;
+ int layout;
for (i = 0; i < SND_SPEAKERLAYOUTS; i++)
if (snd_speakerlayouts[i].channels == snd_renderbuffer->format.channels)
break;
if (i >= SND_SPEAKERLAYOUTS)
{
- Con_Printf("S_SetSpeakerLayout: Can't find the speaker layout for %hu channels. Defaulting to mono output\n",
+ Con_Printf("S_SetChannelLayout: can't find the speaker layout for %hu channels. Defaulting to mono output\n",
snd_renderbuffer->format.channels);
i = SND_SPEAKERLAYOUTS - 1;
}
}
}
- // Convert our layout (= ALSA) to Win32/CoreAudio layout if necessary
- if (!alsaspeakerlayout &&
- (snd_speakerlayout.channels == 6 || snd_speakerlayout.channels == 8))
+ // Sanity check
+ if (snd_channellayout.integer < SND_CHANNELLAYOUT_AUTO ||
+ snd_channellayout.integer > SND_CHANNELLAYOUT_ALSA)
+ Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD);
+
+ if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
{
- SWAP_LISTENERS(listeners[2], listeners[4], swaplistener);
- SWAP_LISTENERS(listeners[3], listeners[5], swaplistener);
+ // If we're in the sound engine initialization
+ if (current_channellayout_used == SND_CHANNELLAYOUT_AUTO)
+ {
+ layout = SND_CHANNELLAYOUT_STANDARD;
+ Cvar_SetValueQuick (&snd_channellayout, layout);
+ }
+ else
+ layout = current_channellayout_used;
}
+ else
+ layout = snd_channellayout.integer;
+
+ // Convert our layout (= ALSA) to the standard layout if necessary
+ if (snd_speakerlayout.channels == 6 || snd_speakerlayout.channels == 8)
+ {
+ if (layout == SND_CHANNELLAYOUT_STANDARD)
+ {
+ SWAP_LISTENERS(listeners[2], listeners[4], swaplistener);
+ SWAP_LISTENERS(listeners[3], listeners[5], swaplistener);
+ }
+
+ Con_Printf("S_SetChannelLayout: using %s speaker layout for 3D sound\n",
+ (layout == SND_CHANNELLAYOUT_ALSA) ? "ALSA" : "standard");
+ }
+
+ current_swapstereo = snd_swapstereo.integer;
+ current_channellayout = snd_channellayout.integer;
+ current_channellayout_used = layout;
}
chosen_fmt.speed, chosen_fmt.width * 8,
chosen_fmt.channels);
- alsaspeakerlayout = false;
memset(&suggest_fmt, 0, sizeof(suggest_fmt));
accepted = SndSys_Init(&chosen_fmt, &suggest_fmt);
Con_Printf("Sound format: %dHz, %d channels, %d bits per sample\n",
chosen_fmt.speed, chosen_fmt.channels, chosen_fmt.width * 8);
- if (chosen_fmt.channels > 4)
- Con_Printf("Using %s speaker layout for 3D sound\n",
- alsaspeakerlayout ? "ALSA" : "standard");
-
// Update the cvars
snd_speed.integer = chosen_fmt.speed;
snd_width.integer = chosen_fmt.width;
snd_channels.integer = chosen_fmt.channels;
+ current_channellayout_used = SND_CHANNELLAYOUT_AUTO;
+ S_SetChannelLayout();
+
snd_starttime = realtime;
// If the sound module has already run, add an extra time to make sure
extrasoundtime = 0;
snd_renderbuffer->startframe = soundtime;
snd_renderbuffer->endframe = soundtime;
-
- S_SetSpeakerLayout();
- current_swapstereo = snd_swapstereo.integer;
+ recording_sound = false;
}
void S_Shutdown(void)
Cvar_RegisterVariable(&snd_show);
Cvar_RegisterVariable(&_snd_mixahead);
Cvar_RegisterVariable(&snd_swapstereo); // for people with backwards sound wiring
+ Cvar_RegisterVariable(&snd_channellayout);
Cvar_SetValueQuick(&snd_initialized, true);
newsoundtime += extrasoundtime;
if (newsoundtime < soundtime)
- Con_Printf("S_PaintAndSubmit: WARNING: newsoundtime < soundtime (%u < %u)\n",
- newsoundtime, soundtime);
+ {
+ if ((cls.capturevideo_soundfile != NULL) != recording_sound)
+ {
+ unsigned int additionaltime;
+
+ // add some time to extrasoundtime make newsoundtime higher
+
+ // The extra time must be a multiple of the render buffer size
+ // to avoid modifying the current position in the buffer,
+ // some modules write directly to a shared (DMA) buffer
+ additionaltime = (soundtime - newsoundtime) + snd_renderbuffer->maxframes - 1;
+ additionaltime -= additionaltime % snd_renderbuffer->maxframes;
+
+ extrasoundtime += additionaltime;
+ newsoundtime += additionaltime;
+ Con_DPrintf("S_PaintAndSubmit: new extra sound time = %u\n",
+ extrasoundtime);
+ }
+ else
+ Con_Printf("S_PaintAndSubmit: WARNING: newsoundtime < soundtime (%u < %u)\n",
+ newsoundtime, soundtime);
+ }
soundtime = newsoundtime;
+ recording_sound = (cls.capturevideo_soundfile != NULL);
// Check to make sure that we haven't overshot
paintedtime = snd_renderbuffer->endframe;
if (snd_blocked > 0 && !cls.capturevideo_soundfile)
return;
- // If snd_swapstereo has changed, recompute the speaker layout
- if (current_swapstereo != snd_swapstereo.integer)
- {
- current_swapstereo = snd_swapstereo.integer;
- S_SetSpeakerLayout();
- }
+ // If snd_swapstereo or snd_channellayout has changed, recompute the channel layout
+ if (current_swapstereo != snd_swapstereo.integer ||
+ current_channellayout != snd_channellayout.integer)
+ S_SetChannelLayout();
Matrix4x4_Invert_Simple(&basematrix, listenermatrix);
Matrix4x4_OriginFromMatrix(listenermatrix, listener_origin);
projects / xonotic / darkplaces.git / blobdiff