diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-02 16:56:54 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-02 16:56:54 +0000 |
| commit | d65409434ce48abb6218d2f49352a453947af240 (patch) | |
| tree | 391546f8bc97aa500120c8193174b016149f4af7 /libmpdemux/audio_in.c | |
| parent | a83dd2b15c60dd6a7b4b83af5637dd9ab704a324 (diff) | |
| download | mpv-d65409434ce48abb6218d2f49352a453947af240.tar.bz2 mpv-d65409434ce48abb6218d2f49352a453947af240.tar.xz | |
this patch adds an ability to recover from audio buffer cross-run by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7587 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/audio_in.c')
| -rw-r--r-- | libmpdemux/audio_in.c | 9 |
1 files changed, 8 insertions, 1 deletions
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"); } |