diff options
-rw-r--r-- | libmpdemux/ai_alsa.c | 48 | ||||
-rw-r--r-- | libmpdemux/ai_alsa1x.c | 48 | ||||
-rw-r--r-- | libmpdemux/audio_in.c | 9 |
3 files changed, 98 insertions, 7 deletions
diff --git a/libmpdemux/ai_alsa.c b/libmpdemux/ai_alsa.c index a7a8a5815d..45abb14bc9 100644 --- a/libmpdemux/ai_alsa.c +++ b/libmpdemux/ai_alsa.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <stdlib.h> +#include <sys/time.h> #include "config.h" @@ -13,11 +14,9 @@ int ai_alsa_setup(audio_in_t *ai) { snd_pcm_hw_params_t *params; snd_pcm_sw_params_t *swparams; - size_t buffer_size; + int buffer_size; int err; - size_t n; unsigned int rate; - snd_pcm_uframes_t start_threshold, stop_threshold; snd_pcm_hw_params_alloca(¶ms); snd_pcm_sw_params_alloca(&swparams); @@ -124,4 +123,47 @@ int ai_alsa_init(audio_in_t *ai) return err; } +#ifndef timersub +#define timersub(a, b, result) \ +do { \ + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + if ((result)->tv_usec < 0) { \ + --(result)->tv_sec; \ + (result)->tv_usec += 1000000; \ + } \ +} while (0) +#endif + +int ai_alsa_xrun(audio_in_t *ai) +{ + snd_pcm_status_t *status; + int res; + + snd_pcm_status_alloca(&status); + if ((res = snd_pcm_status(ai->alsa.handle, status))<0) { + mp_msg(MSGT_TV, MSGL_ERR, "ALSA status error: %s", snd_strerror(res)); + return -1; + } + if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) { + struct timeval now, diff, tstamp; + gettimeofday(&now, 0); + snd_pcm_status_get_trigger_tstamp(status, &tstamp); + timersub(&now, &tstamp, &diff); + mp_msg(MSGT_TV, MSGL_ERR, "ALSA xrun!!! (at least %.3f ms long)\n", + diff.tv_sec * 1000 + diff.tv_usec / 1000.0); + if (mp_msg_test(MSGT_TV, MSGL_V)) { + mp_msg(MSGT_TV, MSGL_ERR, "ALSA Status:\n"); + snd_pcm_status_dump(status, ai->alsa.log); + } + if ((res = snd_pcm_prepare(ai->alsa.handle))<0) { + mp_msg(MSGT_TV, MSGL_ERR, "ALSA xrun: prepare error: %s", snd_strerror(res)); + return -1; + } + return 0; /* ok, data should be accepted again */ + } + mp_msg(MSGT_TV, MSGL_ERR, "ALSA read/write error"); + return -1; +} + #endif /* HAVE_ALSA9 */ diff --git a/libmpdemux/ai_alsa1x.c b/libmpdemux/ai_alsa1x.c index a7a8a5815d..45abb14bc9 100644 --- a/libmpdemux/ai_alsa1x.c +++ b/libmpdemux/ai_alsa1x.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <stdlib.h> +#include <sys/time.h> #include "config.h" @@ -13,11 +14,9 @@ int ai_alsa_setup(audio_in_t *ai) { snd_pcm_hw_params_t *params; snd_pcm_sw_params_t *swparams; - size_t buffer_size; + int buffer_size; int err; - size_t n; unsigned int rate; - snd_pcm_uframes_t start_threshold, stop_threshold; snd_pcm_hw_params_alloca(¶ms); snd_pcm_sw_params_alloca(&swparams); @@ -124,4 +123,47 @@ int ai_alsa_init(audio_in_t *ai) return err; } +#ifndef timersub +#define timersub(a, b, result) \ +do { \ + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + if ((result)->tv_usec < 0) { \ + --(result)->tv_sec; \ + (result)->tv_usec += 1000000; \ + } \ +} while (0) +#endif + +int ai_alsa_xrun(audio_in_t *ai) +{ + snd_pcm_status_t *status; + int res; + + snd_pcm_status_alloca(&status); + if ((res = snd_pcm_status(ai->alsa.handle, status))<0) { + mp_msg(MSGT_TV, MSGL_ERR, "ALSA status error: %s", snd_strerror(res)); + return -1; + } + if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) { + struct timeval now, diff, tstamp; + gettimeofday(&now, 0); + snd_pcm_status_get_trigger_tstamp(status, &tstamp); + timersub(&now, &tstamp, &diff); + mp_msg(MSGT_TV, MSGL_ERR, "ALSA xrun!!! (at least %.3f ms long)\n", + diff.tv_sec * 1000 + diff.tv_usec / 1000.0); + if (mp_msg_test(MSGT_TV, MSGL_V)) { + mp_msg(MSGT_TV, MSGL_ERR, "ALSA Status:\n"); + snd_pcm_status_dump(status, ai->alsa.log); + } + if ((res = snd_pcm_prepare(ai->alsa.handle))<0) { + mp_msg(MSGT_TV, MSGL_ERR, "ALSA xrun: prepare error: %s", snd_strerror(res)); + return -1; + } + return 0; /* ok, data should be accepted again */ + } + mp_msg(MSGT_TV, MSGL_ERR, "ALSA read/write error"); + return -1; +} + #endif /* HAVE_ALSA9 */ diff --git a/libmpdemux/audio_in.c b/libmpdemux/audio_in.c index 635239aee0..fbcb12c202 100644 --- a/libmpdemux/audio_in.c +++ b/libmpdemux/audio_in.c @@ -109,7 +109,7 @@ int audio_in_set_device(audio_in_t *ai, char *device) if (ai->alsa.device) free(ai->alsa.device); ai->alsa.device = strdup(device); /* mplayer cannot handle colons in arguments */ - for (i = 0; i < strlen(ai->alsa.device); i++) { + for (i = 0; i < (int)strlen(ai->alsa.device); i++) { if (ai->alsa.device[i] == '.') ai->alsa.device[i] = ':'; } return 0; @@ -171,6 +171,13 @@ int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer) if (ret != ai->alsa.chunk_size) { if (ret < 0) { mp_msg(MSGT_TV, MSGL_ERR, "\nerror reading audio: %s\n", snd_strerror(ret)); + if (ret == -EPIPE) { + if (ai_alsa_xrun(ai) == 0) { + mp_msg(MSGT_TV, MSGL_ERR, "Recovered from cross-run, some frames may be left out!\n"); + } else { + mp_msg(MSGT_TV, MSGL_ERR, "Fatal error, cannot recover!\n"); + } + } } else { mp_msg(MSGT_TV, MSGL_ERR, "\nnot enough audio samples!\n"); } |