qf/nuq
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/nuq synced 2024-11-21 19:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

backport the snd_* setup cvars

Browse source
This commit is contained in:
Bill Currie 2001-03-10 06:00:19 +00:00
parent 73bc23e117
commit 048a9253ea
3 changed files with 521 additions and 502 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sound.h
View file

@ -174,6 +174,10 @@ extern cvar_t *loadas8bit;
extern cvar_t *bgmvolume; extern cvar_t *bgmvolume;
extern cvar_t *volume; extern cvar_t *volume;
extern cvar_t *snd_device;
extern cvar_t *snd_rate;
extern cvar_t *snd_bits;
extern cvar_t *snd_stereo;
extern cvar_t *snd_interp; extern cvar_t *snd_interp;
extern cvar_t *snd_stereo_phase_separation; extern cvar_t *snd_stereo_phase_separation;

256
source/snd_alsa_0_9.c
View file

@ -40,190 +40,194 @@
#include "qargs.h" #include "qargs.h"
#include "console.h" #include "console.h"
static int snd_inited; static int snd_inited;
static snd_pcm_t *pcm; static snd_pcm_t *pcm;
static const snd_pcm_channel_area_t *mmap_areas; static const snd_pcm_channel_area_t *mmap_areas;
static char *pcmname = NULL; static char *pcmname = NULL;
size_t buffer_size; size_t buffer_size;
qboolean SNDDMA_Init(void) qboolean
SNDDMA_Init (void)
{ {
int err,i; int err;
int rate=-1,bps=-1,stereo=-1,frag_size; int rate = -1, bps = -1, stereo = -1, frag_size;
snd_pcm_hw_params_t *hw; snd_pcm_hw_params_t *hw;
snd_pcm_sw_params_t *sw; snd_pcm_sw_params_t *sw;
snd_pcm_hw_params_alloca(&hw);
snd_pcm_sw_params_alloca(&sw);
if ((i=COM_CheckParm("-sndpcm"))!=0) { snd_pcm_hw_params_alloca (&hw);
pcmname=com_argv[i+1]; snd_pcm_sw_params_alloca (&sw);
}
if ((i=COM_CheckParm("-sndbits")) != 0) { if (snd_device->string[0])
bps = atoi(com_argv[i+1]); pcmname = snd_device->string;
if (snd_bits->int_val) {
bps = snd_bits->int_val;
if (bps != 16 && bps != 8) { if (bps != 16 && bps != 8) {
Con_Printf("Error: invalid sample bits: %d\n", i); Con_Printf ("Error: invalid sample bits: %d\n", bps);
return 0; return 0;
} }
} }
if ((i=COM_CheckParm("-sndspeed")) != 0) { if (snd_rate->int_val) {
rate = atoi(com_argv[i+1]); rate = snd_rate->int_val;
if (rate!=44100 && rate!=22050 && rate!=11025) { if (rate != 44100 && rate != 22050 && rate != 11025) {
Con_Printf("Error: invalid sample rate: %d\n", rate); Con_Printf ("Error: invalid sample rate: %d\n", rate);
return 0; return 0;
} }
} }
if ((i=COM_CheckParm("-sndmono")) != 0) { stereo = snd_stereo->int_val;
stereo=0;
}
if ((i=COM_CheckParm("-sndstereo")) != 0) {
stereo=1;
}
if (!pcmname) if (!pcmname)
pcmname = "plug:0,0"; pcmname = "plug:0,0";
if ((err=snd_pcm_open(&pcm, pcmname, if ((err = snd_pcm_open (&pcm, pcmname,
SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK))<0) { SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) < 0) {
Con_Printf("Error: audio open error: %s\n", snd_strerror(err)); Con_Printf ("Error: audio open error: %s\n", snd_strerror (err));
return 0; return 0;
} }
Con_Printf("Using PCM %s.\n", pcmname); Con_Printf ("Using PCM %s.\n", pcmname);
snd_pcm_hw_params_any(pcm, hw); snd_pcm_hw_params_any (pcm, hw);
switch (rate) { switch (rate) {
case -1: case -1:
if (snd_pcm_hw_params_set_rate_near(pcm, hw, 44100, 0) >= 0) { if (snd_pcm_hw_params_set_rate_near (pcm, hw, 44100, 0) >= 0) {
frag_size = 256; /* assuming stereo 8 bit */ frag_size = 256; /* assuming stereo 8 bit */
rate = 44100; rate = 44100;
} else if (snd_pcm_hw_params_set_rate_near(pcm, hw, 22050, 0) >= 0) { } else if (snd_pcm_hw_params_set_rate_near (pcm, hw, 22050, 0) >= 0) {
frag_size = 128; /* assuming stereo 8 bit */ frag_size = 128; /* assuming stereo 8 bit */
rate = 22050; rate = 22050;
} else if (snd_pcm_hw_params_set_rate_near(pcm, hw, 11025, 0) >= 0) { } else if (snd_pcm_hw_params_set_rate_near (pcm, hw, 11025, 0) >= 0) {
frag_size = 64; /* assuming stereo 8 bit */ frag_size = 64; /* assuming stereo 8 bit */
rate = 11025; rate = 11025;
} else { } else {
Con_Printf("ALSA: no useable rates\n"); Con_Printf ("ALSA: no useable rates\n");
goto error; goto error;
} }
break; break;
case 11025: case 11025:
case 22050: case 22050:
case 44100: case 44100:
if (snd_pcm_hw_params_set_rate_near(pcm, hw, rate, 0) >= 0) { if (snd_pcm_hw_params_set_rate_near (pcm, hw, rate, 0) >= 0) {
frag_size = 64 * rate / 11025; /* assuming stereo 8 bit */ frag_size = 64 * rate / 11025; /* assuming stereo 8 bit */
break; break;
} }
/* Fall through */ /* Fall through */
default: default:
Con_Printf("ALSA: desired rate not supported\n"); Con_Printf ("ALSA: desired rate not supported\n");
goto error; goto error;
} }
switch (bps) { switch (bps) {
case -1: case -1:
if (snd_pcm_hw_params_set_format(pcm, hw, SND_PCM_FORMAT_S16_LE) >= 0) { if (snd_pcm_hw_params_set_format (pcm, hw, SND_PCM_FORMAT_S16_LE) >= 0) {
bps = 16; bps = 16;
} else if (snd_pcm_hw_params_set_format(pcm, hw, SND_PCM_FORMAT_U8) >= 0) { } else if (snd_pcm_hw_params_set_format (pcm, hw, SND_PCM_FORMAT_U8) >=
0) {
bps = 8; bps = 8;
} else { } else {
Con_Printf("ALSA: no useable formats\n"); Con_Printf ("ALSA: no useable formats\n");
goto error; goto error;
} }
break; break;
case 8: case 8:
case 16: case 16:
if (snd_pcm_hw_params_set_format(pcm, hw, if (snd_pcm_hw_params_set_format (pcm, hw,
bps == 8 ? SND_PCM_FORMAT_U8 : bps == 8 ? SND_PCM_FORMAT_U8 :
SND_PCM_FORMAT_S16) >= 0) { SND_PCM_FORMAT_S16) >= 0) {
break; break;
} }
/* Fall through */ /* Fall through */
default: default:
Con_Printf("ALSA: desired format not supported\n"); Con_Printf ("ALSA: desired format not supported\n");
goto error; goto error;
} }
if (snd_pcm_hw_params_set_access(pcm, hw, if (snd_pcm_hw_params_set_access (pcm, hw,
SND_PCM_ACCESS_MMAP_INTERLEAVED) < 0) { SND_PCM_ACCESS_MMAP_INTERLEAVED) < 0) {
Con_Printf("ALSA: interleaved is not supported\n"); Con_Printf ("ALSA: interleaved is not supported\n");
goto error; goto error;
} }
switch (stereo) { switch (stereo) {
case -1: case -1:
if (snd_pcm_hw_params_set_channels(pcm, hw, 2) >= 0) { if (snd_pcm_hw_params_set_channels (pcm, hw, 2) >= 0) {
stereo = 1; stereo = 1;
} else if (snd_pcm_hw_params_set_channels(pcm, hw, 1) >= 0) { } else if (snd_pcm_hw_params_set_channels (pcm, hw, 1) >= 0) {
stereo = 0; stereo = 0;
} else { } else {
Con_Printf("ALSA: no useable channels\n"); Con_Printf ("ALSA: no useable channels\n");
goto error; goto error;
} }
break; break;
case 0: case 0:
case 1: case 1:
if (snd_pcm_hw_params_set_channels(pcm, hw, stereo ? 2 : 1) >= 0) if (snd_pcm_hw_params_set_channels (pcm, hw, stereo ? 2 : 1) >= 0)
break; break;
/* Fall through */ /* Fall through */
default: default:
Con_Printf("ALSA: desired channels not supported\n"); Con_Printf ("ALSA: desired channels not supported\n");
goto error; goto error;
} }
snd_pcm_hw_params_set_period_size_near(pcm, hw, frag_size, 0); snd_pcm_hw_params_set_period_size_near (pcm, hw, frag_size, 0);
err = snd_pcm_hw_params(pcm, hw); err = snd_pcm_hw_params (pcm, hw);
if (err < 0) { if (err < 0) {
Con_Printf("ALSA: unable to install hw params\n"); Con_Printf ("ALSA: unable to install hw params\n");
goto error; goto error;
} }
snd_pcm_sw_params_current(pcm, sw); snd_pcm_sw_params_current (pcm, sw);
snd_pcm_sw_params_set_start_mode(pcm, sw, SND_PCM_START_EXPLICIT); snd_pcm_sw_params_set_start_mode (pcm, sw, SND_PCM_START_EXPLICIT);
snd_pcm_sw_params_set_xrun_mode(pcm, sw, SND_PCM_XRUN_NONE); snd_pcm_sw_params_set_xrun_mode (pcm, sw, SND_PCM_XRUN_NONE);
err = snd_pcm_sw_params(pcm, sw); err = snd_pcm_sw_params (pcm, sw);
if (err < 0) { if (err < 0) {
Con_Printf("ALSA: unable to install sw params\n"); Con_Printf ("ALSA: unable to install sw params\n");
goto error; goto error;
} }
mmap_areas = snd_pcm_mmap_running_areas(pcm); mmap_areas = snd_pcm_mmap_running_areas (pcm);
shm=&sn; shm = &sn;
memset((dma_t*)shm,0,sizeof(*shm)); memset ((dma_t *) shm, 0, sizeof (*shm));
shm->splitbuffer = 0; shm->splitbuffer = 0;
shm->channels=stereo+1; shm->channels = stereo + 1;
shm->submission_chunk=snd_pcm_hw_params_get_period_size(hw, 0); // don't mix less than this # shm->submission_chunk = snd_pcm_hw_params_get_period_size (hw, 0); // don't
shm->samplepos=0; // in mono samples //
shm->samplebits=bps; //
buffer_size = snd_pcm_hw_params_get_buffer_size(hw); // mix
shm->samples=buffer_size*shm->channels; // mono samples in buffer // less
shm->speed=rate; // than
shm->buffer=(unsigned char*)mmap_areas->addr; // this
Con_Printf("%5d stereo\n", shm->channels - 1); // #
Con_Printf("%5d samples\n", shm->samples); shm->samplepos = 0; // in mono samples
Con_Printf("%5d samplepos\n", shm->samplepos); shm->samplebits = bps;
Con_Printf("%5d samplebits\n", shm->samplebits); buffer_size = snd_pcm_hw_params_get_buffer_size (hw);
Con_Printf("%5d submission_chunk\n", shm->submission_chunk); shm->samples = buffer_size * shm->channels; // mono samples in buffer
Con_Printf("%5d speed\n", shm->speed); shm->speed = rate;
Con_Printf("0x%x dma buffer\n", (int)shm->buffer); shm->buffer = (unsigned char *) mmap_areas->addr;
Con_Printf("%5d total_channels\n", total_channels); Con_Printf ("%5d stereo\n", shm->channels - 1);
Con_Printf ("%5d samples\n", shm->samples);
Con_Printf ("%5d samplepos\n", shm->samplepos);
Con_Printf ("%5d samplebits\n", shm->samplebits);
Con_Printf ("%5d submission_chunk\n", shm->submission_chunk);
Con_Printf ("%5d speed\n", shm->speed);
Con_Printf ("0x%x dma buffer\n", (int) shm->buffer);
Con_Printf ("%5d total_channels\n", total_channels);
snd_inited=1; snd_inited = 1;
return 1; return 1;
error: error:
snd_pcm_close(pcm); snd_pcm_close (pcm);
return 0; return 0;
} }
static inline int static inline int
get_hw_ptr() get_hw_ptr ()
{ {
size_t app_ptr; size_t app_ptr;
snd_pcm_sframes_t delay; snd_pcm_sframes_t delay;
int hw_ptr; int hw_ptr;
if (snd_pcm_state (pcm) != SND_PCM_STATE_RUNNING) if (snd_pcm_state (pcm) != SND_PCM_STATE_RUNNING)
return 0; return 0;
@ -235,23 +239,25 @@ get_hw_ptr()
return hw_ptr; return hw_ptr;
} }
int SNDDMA_GetDMAPos(void) int
SNDDMA_GetDMAPos (void)
{ {
int hw_ptr; int hw_ptr;
if (!snd_inited) return 0; if (!snd_inited)
return 0;
hw_ptr = get_hw_ptr(); hw_ptr = get_hw_ptr ();
hw_ptr *= shm->channels; hw_ptr *= shm->channels;
shm->samplepos = hw_ptr; shm->samplepos = hw_ptr;
return shm->samplepos; return shm->samplepos;
} }
void SNDDMA_Shutdown(void) void
SNDDMA_Shutdown (void)
{ {
if (snd_inited) if (snd_inited) {
{ snd_pcm_close (pcm);
snd_pcm_close(pcm);
snd_inited = 0; snd_inited = 0;
} }
} }
@ -263,24 +269,25 @@ SNDDMA_Submit
Send sound to device if buffer isn't really the dma buffer Send sound to device if buffer isn't really the dma buffer
=============== ===============
*/ */
void SNDDMA_Submit(void) void
SNDDMA_Submit (void)
{ {
int count = paintedtime - soundtime; int count = paintedtime - soundtime;
int avail; int avail;
int missed; int missed;
int state; int state;
int hw_ptr; int hw_ptr;
int offset; int offset;
state = snd_pcm_state (pcm); state = snd_pcm_state (pcm);
switch (state) { switch (state) {
case SND_PCM_STATE_PREPARED: case SND_PCM_STATE_PREPARED:
snd_pcm_mmap_forward (pcm, count); snd_pcm_mmap_forward (pcm, count);
snd_pcm_start (pcm); snd_pcm_start (pcm);
break; break;
case SND_PCM_STATE_RUNNING: case SND_PCM_STATE_RUNNING:
hw_ptr = get_hw_ptr(); hw_ptr = get_hw_ptr ();
missed = hw_ptr - shm->samplepos / shm->channels; missed = hw_ptr - shm->samplepos / shm->channels;
if (missed < 0) if (missed < 0)
missed += buffer_size; missed += buffer_size;
@ -293,7 +300,7 @@ void SNDDMA_Submit(void)
if (count < 0) { if (count < 0) {
snd_pcm_rewind (pcm, -count); snd_pcm_rewind (pcm, -count);
} else { } else {
avail = snd_pcm_avail_update(pcm); avail = snd_pcm_avail_update (pcm);
if (avail < 0) if (avail < 0)
avail = buffer_size; avail = buffer_size;
if (count > avail) if (count > avail)
@ -301,8 +308,7 @@ void SNDDMA_Submit(void)
snd_pcm_mmap_forward (pcm, count); snd_pcm_mmap_forward (pcm, count);
} }
break; break;
default: default:
break; break;
} }
} }

763
source/snd_dma.c
View file

File diff suppressed because it is too large Load diff