Mercurial > mplayer.hg

diff libao2/ao_alsa.c @ 29706:54f54530a4d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the ao_alsa play function always process a multiple of ao_data.outburst except for the last chunk. Should fix high CPU usage reported e.g. here: http://bugs.gentoo.org/show_bug.cgi?id=286020
author reimar
date Fri, 02 Oct 2009 16:49:41 +0000
parents 2eff450157cd
children 4eae69f3f4f4
line wrap: on
line diff
--- a/libao2/ao_alsa.c	Fri Oct 02 08:58:29 2009 +0000
+++ b/libao2/ao_alsa.c	Fri Oct 02 16:49:41 2009 +0000
@@ -763,8 +763,11 @@
 
 static int play(void* data, int len, int flags)
 {
-  int num_frames = len / bytes_per_sample;
+  int num_frames;
   snd_pcm_sframes_t res = 0;
+  if (!(flags & AOPLAY_FINAL_CHUNK))
+      len = len / ao_data.outburst * ao_data.outburst;
+  num_frames = len / bytes_per_sample;
 
   //mp_msg(MSGT_AO,MSGL_ERR,"alsa-play: frames=%i, len=%i\n",num_frames,len);