#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
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;
qboolean simsound = false;
+static qboolean recording_sound = false;
+
int snd_blocked = 0;
static int current_swapstereo = false;
static int current_channellayout = SND_CHANNELLAYOUT_AUTO;
}
-// 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;
}
extrasoundtime = 0;
snd_renderbuffer->startframe = soundtime;
snd_renderbuffer->endframe = soundtime;
+ recording_sound = false;
}
void S_Shutdown(void)
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;