X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=0e90a582ea86c9229d8f34629d3be45bf0caba6a;hb=c9a9a7720326d7b266ac351028a9711a0136ba73;hp=1a31557a54863b2fc65435146d0ae0bb6a00e3e3;hpb=8c373c85183bd059717b0a53ffb97dd472bd6741;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 1a31557a..0e90a582 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -32,6 +32,11 @@ static int num_sounds = 0, num_music = 0; /* ========================================================================= */ /* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ +static struct AudioFormatInfo afmt = +{ + TRUE, 0, DEFAULT_AUDIO_SAMPLE_RATE, DEFAULT_AUDIO_FRAGMENT_SIZE +}; + static int playing_sounds = 0; static struct SoundControl playlist[MAX_SOUNDS_PLAYING]; static struct SoundControl emptySoundControl = @@ -40,22 +45,22 @@ static struct SoundControl emptySoundControl = }; #if defined(PLATFORM_UNIX) -static int stereo_volume[PSND_MAX_LEFT2RIGHT+1]; +static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1]; static short premix_first_buffer[SND_BLOCKSIZE]; #if defined(AUDIO_STREAMING_DSP) static short premix_left_buffer[SND_BLOCKSIZE]; static short premix_right_buffer[SND_BLOCKSIZE]; static long premix_last_buffer[SND_BLOCKSIZE]; #endif -static short playing_buffer[SND_BLOCKSIZE]; +static byte playing_buffer[SND_BLOCKSIZE]; #endif /* forward declaration of internal functions */ #if defined(AUDIO_STREAMING_DSP) static void SoundServer_InsertNewSound(struct SoundControl); -static boolean InitAudioDevice_DSP(int, int); +static void InitAudioDevice_DSP(struct AudioFormatInfo *); #elif defined(PLATFORM_HPUX) -static boolean InitAudioDevice_HPUX(); +static void InitAudioDevice_HPUX(struct AudioFormatInfo *); #elif defined(PLATFORM_UNIX) static unsigned char linear_to_ulaw(int); static int ulaw_to_linear(unsigned char); @@ -204,7 +209,7 @@ void SoundServer(void) (int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i)); #if defined(PLATFORM_HPUX) - InitAudioDevice_HPUX(); + InitAudioDevice_HPUX(&afmt); #endif FD_ZERO(&sound_fdset); @@ -341,12 +346,9 @@ void SoundServer(void) (audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) { struct timeval delay = { 0, 0 }; - static int fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; - int sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; - static boolean stereo = TRUE; if (!playing_sounds) /* we just opened the audio device */ - stereo = InitAudioDevice_DSP(fragment_size, sample_rate); + InitAudioDevice_DSP(&afmt); if (snd_ctrl.active) /* new sound has arrived */ SoundServer_InsertNewSound(snd_ctrl); @@ -355,13 +357,14 @@ void SoundServer(void) select(audio.soundserver_pipe[0] + 1, &sound_fdset, NULL, NULL, &delay) < 1) { - short *sample_ptr; - int sample_size; int max_sample_size; + int fragment_size = afmt.fragment_size; + int sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2); + boolean stereo = afmt.stereo; FD_SET(audio.soundserver_pipe[0], &sound_fdset); - max_sample_size = fragment_size / ((stereo ? 2 : 1) * sizeof(short)); + max_sample_size = fragment_size / ((stereo ? 2 : 1) * sample_bytes); /* first clear the last premixing buffer */ memset(premix_last_buffer, 0, @@ -369,29 +372,52 @@ void SoundServer(void) for(i=0; i 65535) - playing_buffer[i] = 32767; - else - playing_buffer[i] = (short)(premix_last_buffer[i] >> 1); + premix_last_buffer[i] = 65535; + + /* shift to 16 bit value */ + premix_last_buffer[i] >>= 1; + + if (afmt.format & AUDIO_FORMAT_U8) + { + playing_buffer[i] = (premix_last_buffer[i] >> 8) ^ 0x80; + } + else if (afmt.format & AUDIO_FORMAT_LE) /* 16 bit */ + { + playing_buffer[2 * i + 0] = premix_last_buffer[i] & 0xff; + playing_buffer[2 * i + 1] = premix_last_buffer[i] >> 8; + } + else /* big endian */ + { + playing_buffer[2 * i + 0] = premix_last_buffer[i] >> 8; + playing_buffer[2 * i + 1] = premix_last_buffer[i] & 0xff; + } } /* finally play the sound fragment */ @@ -691,6 +734,7 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl) snd_ctrl.data_ptr = snd_info->data_ptr; snd_ctrl.data_len = snd_info->data_len; + snd_ctrl.format = snd_info->format; playlist[i] = snd_ctrl; playing_sounds++; @@ -782,17 +826,31 @@ static void SoundServer_StopAllSounds() /* ------------------------------------------------------------------------- */ #if defined(AUDIO_LINUX_IOCTL) -static boolean InitAudioDevice_Linux(int fragment_size, int sample_rate) +static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) { /* "ioctl()" expects pointer to 'int' value for stereo flag (boolean is defined as 'char', which will not work here) */ unsigned int fragment_spec = 0; - unsigned int audio_format = 0; int fragment_size_query; int stereo = TRUE; + struct + { + int format_ioctl; + int format_result; + } + formats[] = + { + /* supported audio format in preferred order */ + { AFMT_S16_LE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_LE }, + { AFMT_S16_BE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_BE }, + { AFMT_U8, AUDIO_FORMAT_U8 }, + { -1, -1 } + }; + int i; /* determine logarithm (log2) of the fragment size */ - for (fragment_spec=0; (1 << fragment_spec) < fragment_size; fragment_spec++); + while ((1 << fragment_spec) < afmt->fragment_size) + fragment_spec++; /* use two fragments (play one fragment, prepare the other); one fragment would result in interrupted audio output, more @@ -808,27 +866,28 @@ static boolean InitAudioDevice_Linux(int fragment_size, int sample_rate) Error(ERR_EXIT_SOUND_SERVER, "cannot set fragment size of /dev/dsp -- no sounds"); - audio_format = AFMT_S16_LE; - if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) < 0) + i = 0; + afmt->format = 0; + while (formats[i].format_result != -1) + { + unsigned int audio_format = formats[i].format_ioctl; + if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0) + { + afmt->format = formats[i].format_result; + break; + } + } + + if (afmt->format == 0) /* no supported audio format found */ Error(ERR_EXIT_SOUND_SERVER, "cannot set audio format of /dev/dsp -- no sounds"); /* try if we can use stereo sound */ + afmt->stereo = TRUE; if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) - { -#ifdef DEBUG - static boolean reported = FALSE; + afmt->stereo = FALSE; - if (!reported) - { - Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp"); - reported = TRUE; - } -#endif - stereo = FALSE; - } - - if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0) + if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0) Error(ERR_EXIT_SOUND_SERVER, "cannot set sample rate of /dev/dsp -- no sounds"); @@ -836,16 +895,14 @@ static boolean InitAudioDevice_Linux(int fragment_size, int sample_rate) if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0) Error(ERR_EXIT_SOUND_SERVER, "cannot get fragment size of /dev/dsp -- no sounds"); - if (fragment_size_query != fragment_size) + if (fragment_size_query != afmt->fragment_size) Error(ERR_EXIT_SOUND_SERVER, "cannot set fragment size of /dev/dsp -- no sounds"); - - return (boolean)stereo; } #endif /* AUDIO_LINUX_IOCTL */ #if defined(PLATFORM_NETBSD) -static boolean InitAudioDevice_NetBSD(int fragment_size, int sample_rate) +static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) { audio_info_t a_info; boolean stereo = TRUE; @@ -857,23 +914,25 @@ static boolean InitAudioDevice_NetBSD(int fragment_size, int sample_rate) a_info.play.sample_rate = sample_rate; a_info.blocksize = fragment_size; + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = TRUE; + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) { /* try to disable stereo */ a_info.play.channels = 1; - stereo = FALSE; + + afmt->stereo = FALSE; if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) Error(ERR_EXIT_SOUND_SERVER, "cannot set sample rate of /dev/audio -- no sounds"); } - - return stereo; } #endif /* PLATFORM_NETBSD */ #if defined(PLATFORM_HPUX) -static boolean InitAudioDevice_HPUX() +static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) { struct audio_describe ainfo; int audio_ctl; @@ -891,21 +950,23 @@ static boolean InitAudioDevice_HPUX() ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); - close(audio_ctl); + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = FALSE; + afmt->sample_rate = 8000; - return TRUE; /* to provide common interface for InitAudioDevice_...() */ + close(audio_ctl); } #endif /* PLATFORM_HPUX */ #if defined(PLATFORM_UNIX) -static boolean InitAudioDevice_DSP(int fragment_size, int sample_rate) +static void InitAudioDevice_DSP(struct AudioFormatInfo *afmt) { #if defined(AUDIO_LINUX_IOCTL) - return InitAudioDevice_Linux(fragment_size, sample_rate); + InitAudioDevice_Linux(afmt); #elif defined(PLATFORM_NETBSD) - return InitAudioDevice_NetBSD(fragment_size, sample_rate); + InitAudioDevice_NetBSD(afmt); #elif defined(PLATFORM_HPUX) - return InitAudioDevice_HPUX(); + InitAudioDevice_HPUX(afmt); #endif } #endif /* PLATFORM_UNIX */ @@ -1032,7 +1093,6 @@ static SoundInfo *Load_WAV(char *filename) byte sound_header_buffer[WAV_HEADER_SIZE]; char chunk_name[CHUNK_ID_LEN + 1]; int chunk_size; - short *data_ptr; FILE *file; int i; #endif @@ -1133,15 +1193,7 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - /* convert unsigned 8 bit sample data to signed 16 bit sample data */ - - data_ptr = checked_malloc(snd_info->data_len * sizeof(short)); - - for (i=0; idata_len; i++) - data_ptr[i] = ((short)(((byte *)snd_info->data_ptr)[i] ^ 0x80)) << 8; - - free(snd_info->data_ptr); - snd_info->data_ptr = data_ptr; + snd_info->format = AUDIO_FORMAT_U8; #endif /* PLATFORM_UNIX */ @@ -1325,6 +1377,7 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type) snd_ctrl.active = TRUE; #if 0 + /* now only used internally in sound server child process */ snd_ctrl.data_ptr = Sound[nr].data_ptr; snd_ctrl.data_len = Sound[nr].data_len; #endif