RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

redo OSS frag setup. Compute real pollux rate

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@896 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-09-17 22:57:14 +00:00
parent 45285368c0
commit 9f6a4e907b
6 changed files with 88 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

12
platform/linux/emu.c
View file

@ -255,19 +255,13 @@ void pemu_sound_start(void)
if (currentConfig.EmuOpt & EOPT_EN_SOUND)
{
int snd_excess_add, frame_samples;
int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
PsndRerate(Pico.m.frame_count ? 1 : 0);
frame_samples = PsndLen;
snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;
if (snd_excess_add != 0)
frame_samples++;
printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
sndout_oss_start(PsndRate, frame_samples, is_stereo);
printf("starting audio: %i len: %i stereo: %i, pal: %i\n",
PsndRate, PsndLen, is_stereo, Pico.m.pal);
sndout_oss_start(PsndRate, is_stereo, 1);
sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
PicoWriteSound = updateSound;
plat_update_volume(0, 0);

22
platform/linux/sndout_oss.c
View file

@ -12,6 +12,7 @@
static int sounddev = -1, mixerdev = -1;
static int can_write_safe;
#define FRAG_COUNT 4
int sndout_oss_init(void)
{
@ -35,14 +36,14 @@ void sndout_oss_stop(void)
sounddev = -1;
}
int sndout_oss_start(int rate, int frame_samples, int stereo)
int sndout_oss_start(int rate, int stereo, int frames_in_frag)
{
static int s_oldrate = 0, s_old_fsamples = 0, s_oldstereo = 0;
static int s_oldrate = 0, s_oldstereo = 0;
int frag, bsize, bits, ret;
// GP2X: if no settings change, we don't need to do anything,
// since audio is never stopped there
if (sounddev >= 0 && rate == s_oldrate && s_old_fsamples == frame_samples && s_oldstereo == stereo)
if (sounddev >= 0 && rate == s_oldrate && s_oldstereo == stereo)
return 0;
sndout_oss_stop();
@ -57,14 +58,15 @@ int sndout_oss_start(int rate, int frame_samples, int stereo)
}
}
// calculate buffer size. We want to fit 1 frame worth of sound data.
// Also ignore mono because both GP2X and Wiz mixes mono to stereo anyway.
bsize = frame_samples << 2;
// try to fit frames_in_frag frames worth of data in fragment
// ignore mono because it's unlikely to be used and
// both GP2X and Wiz mixes mono to stereo anyway.
bsize = (frames_in_frag * rate / 50) * 4;
for (frag = 0; bsize; bsize >>= 1, frag++)
;
frag |= 16 << 16; // fragment count
frag |= FRAG_COUNT << 16; // fragment count
ret = ioctl(sounddev, SNDCTL_DSP_SETFRAGMENT, &frag);
if (ret < 0)
perror("SNDCTL_DSP_SETFRAGMENT failed");
@ -86,7 +88,7 @@ int sndout_oss_start(int rate, int frame_samples, int stereo)
printf("sndout_oss_start: %d/%dbit/%s, %d buffers of %i bytes\n",
rate, bits, stereo ? "stereo" : "mono", frag >> 16, 1 << (frag & 0xffff));
s_oldrate = rate; s_old_fsamples = frame_samples; s_oldstereo = stereo;
s_oldrate = rate; s_oldstereo = stereo;
can_write_safe = 0;
return 0;
}
@ -111,8 +113,8 @@ int sndout_oss_can_write(int bytes)
if (ret < 0)
return 1;
// have enough bytes to write + 4 extra frags
return bi.bytes - bi.fragsize * 4 >= bytes ? 1 : 0;
// have enough bytes to write + 1 frag
return bi.bytes - bi.fragsize >= bytes ? 1 : 0;
}
void sndout_oss_sync(void)

2
platform/linux/sndout_oss.h
View file

@ -1,5 +1,5 @@
int sndout_oss_init(void);
int sndout_oss_start(int rate, int frame_samples, int stereo);
int sndout_oss_start(int rate, int stereo, int frames_in_frag);
void sndout_oss_stop(void);
int sndout_oss_write(const void *buff, int len);
int sndout_oss_can_write(int bytes);