X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_main.c;h=85874f25139dfba5db325613df7f1bc77876a32c;hb=ead7152d060fb655bfdff20606e0c0ff8e685c76;hp=cd9700cedd616385e98a2dac3e5bc2c7ec6f592e;hpb=89bf9ac7f13b2308dd89291f15efc8a299c3e783;p=xonotic%2Fdarkplaces.git diff --git a/snd_main.c b/snd_main.c index cd9700ce..85874f25 100644 --- a/snd_main.c +++ b/snd_main.c @@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "snd_main.h" #include "snd_ogg.h" +#include "snd_modplug.h" #define SND_MIN_SPEED 8000 @@ -139,10 +140,12 @@ channel_t channels[MAX_CHANNELS]; unsigned int total_channels; snd_ringbuffer_t *snd_renderbuffer = NULL; -unsigned int soundtime = 0; +static unsigned int soundtime = 0; static unsigned int oldpaintedtime = 0; static unsigned int extrasoundtime = 0; static double snd_starttime = 0.0; +qboolean snd_threaded = false; +qboolean snd_usethreadedmixing = false; vec3_t listener_origin; matrix4x4_t listener_matrix[SND_LISTENERS]; @@ -592,7 +595,7 @@ void S_Startup (void) accepted = false; do { - Con_DPrintf("S_Startup: initializing sound output format: %dHz, %d bit, %d channels...\n", + Con_Printf("S_Startup: initializing sound output format: %dHz, %d bit, %d channels...\n", chosen_fmt.speed, chosen_fmt.width * 8, chosen_fmt.channels); @@ -601,7 +604,7 @@ void S_Startup (void) if (!accepted) { - Con_DPrintf("S_Startup: sound output initialization FAILED\n"); + Con_Printf("S_Startup: sound output initialization FAILED\n"); // If the module is suggesting another one if (suggest_fmt.speed != 0) @@ -657,7 +660,7 @@ void S_Startup (void) // some modules write directly to a shared (DMA) buffer extrasoundtime = oldpaintedtime + snd_renderbuffer->maxframes - 1; extrasoundtime -= extrasoundtime % snd_renderbuffer->maxframes; - Con_DPrintf("S_Startup: extra sound time = %u\n", extrasoundtime); + Con_Printf("S_Startup: extra sound time = %u\n", extrasoundtime); soundtime = extrasoundtime; } @@ -708,8 +711,6 @@ S_Init */ void S_Init(void) { - Con_DPrint("\nSound Initialization\n"); - Cvar_RegisterVariable(&volume); Cvar_RegisterVariable(&bgmvolume); Cvar_RegisterVariable(&snd_staticvolume); @@ -721,7 +722,12 @@ void S_Init(void) // COMMANDLINEOPTION: Sound: -nosound disables sound (including CD audio) if (COM_CheckParm("-nosound")) + { + // dummy out Play and Play2 because mods stuffcmd that + Cmd_AddCommand("play", Host_NoOperation_f, "does nothing because -nosound was specified"); + Cmd_AddCommand("play2", Host_NoOperation_f, "does nothing because -nosound was specified"); return; + } snd_mempool = Mem_AllocPool("sound", 0, NULL); @@ -864,7 +870,8 @@ void S_FreeSfx (sfx_t *sfx, qboolean force) if (!force && (sfx->locks > 0 || (sfx->flags & SFXFLAG_PERMANENTLOCK))) return; - Con_DPrintf ("S_FreeSfx: freeing %s\n", sfx->name); + if (developer_loading.integer) + Con_Printf ("unloading sound %s\n", sfx->name); // Remove it from the list of known sfx if (sfx == known_sfx) @@ -889,7 +896,7 @@ void S_FreeSfx (sfx_t *sfx, qboolean force) // Stop all channels using this sfx for (i = 0; i < total_channels; i++) if (channels[i].sfx == sfx) - S_StopChannel (i); + S_StopChannel (i, true); // Free it if (sfx->fetcher != NULL && sfx->fetcher->free != NULL) @@ -1075,7 +1082,7 @@ channel_t *SND_PickChannel(int entnum, int entchannel) if (ch->entnum == entnum && (ch->entchannel == entchannel || entchannel == -1) ) { // always override sound from same entity - S_StopChannel (ch_idx); + S_StopChannel (ch_idx, true); return &channels[ch_idx]; } } @@ -1189,9 +1196,10 @@ void SND_Spatialize(channel_t *ch, qboolean isstatic) void S_PlaySfxOnChannel (sfx_t *sfx, channel_t *target_chan, unsigned int flags, vec3_t origin, float fvol, float attenuation, qboolean isstatic) { // Initialize the channel + // We MUST set sfx LAST because otherwise we could crash a threaded mixer + // (otherwise we'd have to call SndSys_LockRenderBuffer here) memset (target_chan, 0, sizeof (*target_chan)); VectorCopy (origin, target_chan->origin); - target_chan->sfx = sfx; target_chan->flags = flags; target_chan->pos = 0; // start of the sound @@ -1208,7 +1216,12 @@ void S_PlaySfxOnChannel (sfx_t *sfx, channel_t *target_chan, unsigned int flags, // Lock the SFX during play S_LockSfx (sfx); - // and finally, apply the volume + // finally, set the sfx pointer, so the channel becomes valid for playback + // and will be noticed by the mixer + target_chan->sfx = sfx; + + // we have to set the channel volume AFTER the sfx because the function + // needs it for replaygain support S_SetChannelVolume(target_chan - channels, fvol); } @@ -1253,7 +1266,7 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f return (target_chan - channels); } -void S_StopChannel (unsigned int channel_ind) +void S_StopChannel (unsigned int channel_ind, qboolean lockmutex) { channel_t *ch; @@ -1265,6 +1278,12 @@ void S_StopChannel (unsigned int channel_ind) { sfx_t *sfx = ch->sfx; + // we have to lock an audio mutex to prevent crashes if an audio mixer + // thread is currently mixing this channel + // the SndSys_LockRenderBuffer function uses such a mutex in + // threaded sound backends + if (lockmutex) + SndSys_LockRenderBuffer(); if (sfx->fetcher != NULL) { snd_fetcher_endsb_t fetcher_endsb = sfx->fetcher->endsb; @@ -1277,6 +1296,8 @@ void S_StopChannel (unsigned int channel_ind) ch->fetcher_data = NULL; ch->sfx = NULL; + if (lockmutex) + SndSys_UnlockRenderBuffer(); } } @@ -1306,7 +1327,7 @@ void S_StopSound(int entnum, int entchannel) for (i = 0; i < MAX_DYNAMIC_CHANNELS; i++) if (channels[i].entnum == entnum && channels[i].entchannel == entchannel) { - S_StopChannel (i); + S_StopChannel (i, true); return; } } @@ -1324,7 +1345,7 @@ void S_StopAllSounds (void) CDAudio_Stop(); for (i = 0; i < total_channels; i++) - S_StopChannel (i); + S_StopChannel (i, true); total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; // no statics memset(channels, 0, MAX_CHANNELS * sizeof(channel_t)); @@ -1387,7 +1408,7 @@ void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation) return; if (!sfx->fetcher) { - Con_DPrintf ("S_StaticSound: \"%s\" hasn't been precached\n", sfx->name); + Con_Printf ("S_StaticSound: \"%s\" hasn't been precached\n", sfx->name); return; } @@ -1458,24 +1479,36 @@ void S_UpdateAmbientSounds (void) static void S_PaintAndSubmit (void) { unsigned int newsoundtime, paintedtime, endtime, maxtime, usedframes; - qboolean usesoundtimehack; - static qboolean soundtimehack = true; + int usesoundtimehack; + static int soundtimehack = -1; + static int oldsoundtime = 0; if (snd_renderbuffer == NULL || nosound.integer) return; // Update sound time + snd_usethreadedmixing = false; usesoundtimehack = true; if (cls.timedemo) // SUPER NASTY HACK to mix non-realtime sound for more reliable benchmarking + { + usesoundtimehack = 1; newsoundtime = (unsigned int)((double)cl.mtime[0] * (double)snd_renderbuffer->format.speed); + } else if (cls.capturevideo.soundrate && !cls.capturevideo.realtime) // SUPER NASTY HACK to record non-realtime sound + { + usesoundtimehack = 2; newsoundtime = (unsigned int)((double)cls.capturevideo.frame * (double)snd_renderbuffer->format.speed / (double)cls.capturevideo.framerate); + } else if (simsound) + { + usesoundtimehack = 3; newsoundtime = (unsigned int)((realtime - snd_starttime) * (double)snd_renderbuffer->format.speed); + } else { + snd_usethreadedmixing = snd_threaded && !cls.capturevideo.soundrate; + usesoundtimehack = 0; newsoundtime = SndSys_GetSoundTime(); - usesoundtimehack = false; } // if the soundtimehack state changes we need to reset the soundtime if (soundtimehack != usesoundtimehack) @@ -1501,6 +1534,9 @@ static void S_PaintAndSubmit (void) if (!soundtimehack && snd_blocked > 0) return; + if (snd_usethreadedmixing) + return; // the audio thread will mix its own data + newsoundtime += extrasoundtime; if (newsoundtime < soundtime) { @@ -1528,23 +1564,60 @@ static void S_PaintAndSubmit (void) soundtime = newsoundtime; recording_sound = (cls.capturevideo.soundrate != 0); + // Lock submitbuffer + if (!simsound && !SndSys_LockRenderBuffer()) + { + // If the lock failed, stop here + Con_DPrint(">> S_PaintAndSubmit: SndSys_LockRenderBuffer() failed\n"); + return; + } + // Check to make sure that we haven't overshot paintedtime = snd_renderbuffer->endframe; if (paintedtime < soundtime) paintedtime = soundtime; // mix ahead of current position - endtime = soundtime + (unsigned int)(_snd_mixahead.value * (float)snd_renderbuffer->format.speed); + if (soundtimehack) + endtime = soundtime + (unsigned int)(_snd_mixahead.value * (float)snd_renderbuffer->format.speed); + else + endtime = soundtime + (unsigned int)(max(_snd_mixahead.value * (float)snd_renderbuffer->format.speed, min(3 * (soundtime - oldsoundtime), 0.3 * (float)snd_renderbuffer->format.speed))); usedframes = snd_renderbuffer->endframe - snd_renderbuffer->startframe; maxtime = paintedtime + snd_renderbuffer->maxframes - usedframes; endtime = min(endtime, maxtime); - S_PaintChannels(snd_renderbuffer, paintedtime, endtime); + while (paintedtime < endtime) + { + unsigned int startoffset; + unsigned int nbframes; + + // see how much we can fit in the paint buffer + nbframes = endtime - paintedtime; + // limit to the end of the ring buffer (in case of wrapping) + startoffset = paintedtime % snd_renderbuffer->maxframes; + nbframes = min(nbframes, snd_renderbuffer->maxframes - startoffset); + + // mix into the buffer + S_MixToBuffer(&snd_renderbuffer->ring[startoffset * snd_renderbuffer->format.width * snd_renderbuffer->format.channels], nbframes); + + paintedtime += nbframes; + snd_renderbuffer->endframe = paintedtime; + } + if (!simsound) + SndSys_UnlockRenderBuffer(); + + // Remove outdated samples from the ring buffer, if any + if (snd_renderbuffer->startframe < soundtime) + snd_renderbuffer->startframe = soundtime; if (simsound) snd_renderbuffer->startframe = snd_renderbuffer->endframe; else SndSys_Submit(); + + oldsoundtime = soundtime; + + cls.soundstats.latency_milliseconds = (snd_renderbuffer->endframe - snd_renderbuffer->startframe) * 1000 / snd_renderbuffer->format.speed; } /* @@ -1556,7 +1629,7 @@ Called once each time through the main loop */ void S_Update(const matrix4x4_t *listenermatrix) { - unsigned int i, j, total; + unsigned int i, j, k; channel_t *ch, *combine; matrix4x4_t basematrix, rotatematrix; @@ -1594,11 +1667,14 @@ void S_Update(const matrix4x4_t *listenermatrix) combine = NULL; // update spatialization for static and dynamic sounds + cls.soundstats.totalsounds = 0; + cls.soundstats.mixedsounds = 0; ch = channels+NUM_AMBIENTS; for (i=NUM_AMBIENTS ; isfx) continue; + cls.soundstats.totalsounds++; // respatialize channel SND_Spatialize(ch, i >= MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS); @@ -1636,29 +1712,18 @@ void S_Update(const matrix4x4_t *listenermatrix) } } } + for (k = 0;k < SND_LISTENERS;k++) + if (ch->listener_volume[k]) + break; + if (k < SND_LISTENERS) + cls.soundstats.mixedsounds++; } sound_spatialized = true; // debugging output if (snd_show.integer) - { - total = 0; - ch = channels; - for (i=0 ; isfx) - { - for (j = 0;j < SND_LISTENERS;j++) - if (ch->listener_volume[j]) - break; - if (j < SND_LISTENERS) - total++; - } - } - - Con_Printf("----(%u)----\n", total); - } + Con_Printf("----(%u)----\n", cls.soundstats.mixedsounds); S_PaintAndSubmit(); }