RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-05 22:52:18 +00:00
Code Issues Releases Wiki Activity

ao_alsa: If pause loses samples replace them with silence

Browse Source 
If the ALSA pause functionality is not available the driver has to
drop buffered samples when MPlayer calls pause(). Replace them by
playing a corresponding amount of silence in resume() instead of
shortening the overall audio duration.
This commit is contained in:
Uoti Urpala 2008-12-08 22:21:23 +02:00
parent bc4c570ab1
commit 66cefd5f71
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libao2/ao_alsa.c
View File

@ -70,6 +70,7 @@ static int ao_noblock = 0;
static int open_mode;
static int alsa_can_pause = 0;
static snd_pcm_sframes_t prepause_frames;
#define ALSA_DEVICE_SIZE 256
@ -334,6 +335,8 @@ static int init(int rate_hz, int channels, int format, int flags)
mp_msg(MSGT_AO,MSGL_V,"alsa-init: compiled for ALSA-%s\n", SND_LIB_VERSION_STR);
#endif
prepause_frames = 0;
snd_lib_error_set_handler(alsa_error_handler);
ao_data.samplerate = rate_hz;
@ -753,6 +756,10 @@ static void audio_pause(void)
}
mp_msg(MSGT_AO,MSGL_V,"alsa-pause: pause supported by hardware\n");
} else {
if (snd_pcm_delay(alsa_handler, &prepause_frames) < 0
|| prepause_frames < 0)
prepause_frames = 0;
if ((err = snd_pcm_drop(alsa_handler)) < 0)
{
mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_PcmDropError, snd_strerror(err));
@ -782,6 +789,11 @@ static void audio_resume(void)
mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_PcmPrepareError, snd_strerror(err));
return;
}
if (prepause_frames) {
void *silence = calloc(prepause_frames, bytes_per_sample);
play(silence, prepause_frames * bytes_per_sample, 0);
free(silence);
}
}
}
@ -790,6 +802,7 @@ static void reset(void)
{
int err;
prepause_frames = 0;
if ((err = snd_pcm_drop(alsa_handler)) < 0)
{
mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_PcmPrepareError, snd_strerror(err));