Commit 211b2031 authored by Sam Hocevar's avatar Sam Hocevar

* ./modules/audio_output/esd.c: compilation fix (aout_FormatTo is obsolete).

  * ./src/audio_output/audio_output.c, ./src/audio_output/mixer.c: fixed a
    horrible sound issue by making sure internal buffers have a size multiple
    of 4 bytes. Waiting for a real fix made in Meuuh, of course.
parent d24f1af6
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2128,13 +2128,12 @@ debug mode : ${DEBUG}
release : ${RELEASE}
profiling : ${PROFILING}
need builtin getopt : ${NEED_GETOPT}
built-in modules :${BUILTINS}
plug-in modules :${PLUGINS}
modules : (see Makefile.config)
mozilla plugin : ${MOZILLA}
vlc aliases :${ALIASES}
You may now tune Makefile.opts at your convenience, for instance to choose
which modules get compiled as plugins.
You may now tune Makefile.config and Makefile.opts at your convenience, for
instance to choose which modules get compiled as plugins, or tune CFLAGS.
To build vlc and its plugins, type \`${VLC_MAKE}'.
"
......
/* include/defs.h.in. Generated automatically from configure.in by autoheader. */
/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if using alloca.c. */
#undef C_ALLOCA
......
......@@ -2,7 +2,7 @@
* esd.c : EsounD module
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: esd.c,v 1.5 2002/08/14 00:43:52 massiot Exp $
* $Id: esd.c,v 1.6 2002/08/14 13:10:44 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -146,9 +146,9 @@ static int SetFormat( aout_instance_t *p_aout )
/* ESD latency is calculated for 44100 Hz. We don't have any way to get the
* number of buffered samples, so I assume ESD_BUF_SIZE/2 */
p_sys->latency =
(mtime_t)( esd_get_latency( esd_open_sound(NULL) ) + ESD_BUF_SIZE / 2
* p_aout->output.output.i_rate / ESD_DEFAULT_RATE
* aout_FormatTo( &p_aout->output.output, 1 ) )
(mtime_t)( esd_get_latency( esd_open_sound(NULL) ) + ESD_BUF_SIZE/2
* aout_FormatToByterate( &p_aout->output.output )
/ ESD_DEFAULT_RATE )
* (mtime_t)1000000
/ (mtime_t)aout_FormatToByterate( &p_aout->output.output );
......
......@@ -2,7 +2,7 @@
* audio_output.c : audio output instance
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: audio_output.c,v 1.95 2002/08/14 00:23:59 massiot Exp $
* $Id: audio_output.c,v 1.96 2002/08/14 13:10:44 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -97,6 +97,7 @@ aout_buffer_t * aout_BufferNew( aout_instance_t * p_aout,
p_buffer->i_nb_bytes = duration
* aout_FormatToByterate( &p_input->input )
/ 1000000;
p_buffer->i_nb_bytes &= ~0x3;
if ( p_buffer == NULL )
{
......
......@@ -2,7 +2,7 @@
* mixer.c : audio output mixing operations
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: mixer.c,v 1.4 2002/08/14 00:23:59 massiot Exp $
* $Id: mixer.c,v 1.5 2002/08/14 13:10:44 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -125,6 +125,7 @@ void aout_MixerRun( aout_instance_t * p_aout )
p_output_buffer->i_nb_bytes = (wanted_date - first_date)
* aout_FormatToByterate( &p_aout->mixer.output )
/ 1000000;
p_output_buffer->i_nb_bytes &= ~0x3;
p_output_buffer->start_date = first_date;
p_output_buffer->end_date = wanted_date;
p_aout->output.last_date = wanted_date;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment