mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle when ALSA tweaks our sample spec so much that the frame size changes.

Browse source 
(closes #57).


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1431 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2007-03-01 17:13:26 +00:00
parent 6ba21d4a0b
commit bb812433a8
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -17,8 +17,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA. # USA.
EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo EXTRA_DIST = config.rpath m4/ChangeLog bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
SUBDIRS=libltdl src doxygen SUBDIRS= libltdl src doxygen
MAINTAINERCLEANFILES = MAINTAINERCLEANFILES =
noinst_DATA = noinst_DATA =
@ -46,3 +46,5 @@ doxygen:
$(MAKE) -C doxygen doxygen $(MAKE) -C doxygen doxygen
.PHONY: homepage distcleancheck doxygen .PHONY: homepage distcleancheck doxygen
ACLOCAL_AMFLAGS = -I m4

1
configure.ac
View file

@ -772,6 +772,7 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "x1"])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
src/Makefile src/Makefile
po/Makefile.in
libpulse.pc libpulse.pc
libpulse-simple.pc libpulse-simple.pc
libpulse-browse.pc libpulse-browse.pc

9
src/modules/module-alsa-sink.c
View file

@ -159,7 +159,11 @@ static void do_write(struct userdata *u) {
memchunk = &u->memchunk; memchunk = &u->memchunk;
} }
assert(memchunk->memblock && memchunk->memblock->data && memchunk->length && memchunk->memblock->length && (memchunk->length % u->frame_size) == 0); assert(memchunk->memblock);
assert(memchunk->memblock->data);
assert(memchunk->length);
assert(memchunk->memblock->length);
assert((memchunk->length % u->frame_size) == 0);
if ((frames = snd_pcm_writei(u->pcm_handle, (uint8_t*) memchunk->memblock->data + memchunk->index, memchunk->length / u->frame_size)) < 0) { if ((frames = snd_pcm_writei(u->pcm_handle, (uint8_t*) memchunk->memblock->data + memchunk->index, memchunk->length / u->frame_size)) < 0) {
if (frames == -EAGAIN) if (frames == -EAGAIN)
@ -415,6 +419,9 @@ int pa__init(pa_core *c, pa_module*m) {
goto fail; goto fail;
} }
/* ALSA might tweak the sample spec, so recalculate the frame size */
frame_size = pa_frame_size(&ss);
if (ss.channels != map.channels) if (ss.channels != map.channels)
/* Seems ALSA didn't like the channel number, so let's fix the channel map */ /* Seems ALSA didn't like the channel number, so let's fix the channel map */
pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA); pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA);