* AudioOutput.cpp: BeOS audio output
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: AudioOutput.cpp,v 1.17 2002/11/27 05:36:41 titer Exp $
+ * $Id: AudioOutput.cpp,v 1.27 2003/01/14 15:31:12 titer Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#include <SoundPlayer.h>
#include <media/MediaDefs.h>
+
#include <vlc/vlc.h>
#include <vlc/aout.h>
-#include <aout_internal.h>
-
-#define FRAME_SIZE 2048
-#define BUFFER_SIZE 16384
+extern "C"
+{
+ #include <aout_internal.h>
+}
/*****************************************************************************
* aout_sys_t: BeOS audio output method descriptor
typedef struct aout_sys_t
{
BSoundPlayer *p_player;
+ vlc_mutex_t lock;
+ mtime_t latency;
} aout_sys_t;
static void Play ( void *p_aout, void *p_buffer, size_t size,
const media_raw_audio_format &format );
static void DoNothing ( aout_instance_t *p_aout );
+static int CheckLatency ( aout_instance_t *p_aout );
/*****************************************************************************
* OpenAudio
*****************************************************************************/
int E_(OpenAudio) ( vlc_object_t * p_this )
{
- int i_nb_channels;
aout_instance_t *p_aout = (aout_instance_t*) p_this;
p_aout->output.p_sys = (aout_sys_t *) malloc( sizeof( aout_sys_t ) );
-
+ if( p_aout->output.p_sys == NULL )
+ {
+ msg_Err( p_aout, "Not enough memory" );
+ return -1;
+ }
aout_sys_t *p_sys = p_aout->output.p_sys;
aout_VolumeSoftInit( p_aout );
-
- media_raw_audio_format *p_format;
- p_format = (media_raw_audio_format*)
- malloc( sizeof( media_raw_audio_format ) );
-
- p_format->frame_rate = p_aout->output.output.i_rate;
- i_nb_channels = aout_FormatNbChannels( &p_aout->output.output );
+ int i_nb_channels = aout_FormatNbChannels( &p_aout->output.output );
+ /* BSoundPlayer does not support more than 2 channels AFAIK */
if ( i_nb_channels > 2 )
{
- /* BSoundPlayer does not support more than 2 channels AFAIK */
i_nb_channels = 2;
p_aout->output.output.i_physical_channels
= AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
}
+
+ media_raw_audio_format *p_format;
+ p_format = (media_raw_audio_format*)
+ malloc( sizeof( media_raw_audio_format ) );
+
p_format->channel_count = i_nb_channels;
-
+ p_format->frame_rate = p_aout->output.output.i_rate;
p_format->format = media_raw_audio_format::B_AUDIO_FLOAT;
#ifdef WORDS_BIGENDIAN
p_format->byte_order = B_MEDIA_BIG_ENDIAN;
#else
p_format->byte_order = B_MEDIA_LITTLE_ENDIAN;
#endif
- p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
+ p_format->buffer_size = 8192;
- p_format->buffer_size = BUFFER_SIZE;
- p_aout->output.i_nb_samples = FRAME_SIZE;
+ p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
+ p_aout->output.i_nb_samples = 2048 / i_nb_channels;
p_aout->output.pf_play = DoNothing;
-
- p_sys->p_player = new BSoundPlayer( p_format, "player",
- Play, NULL, p_aout );
+
+ p_sys->p_player = new BSoundPlayer( p_format, "player", Play, NULL, p_aout );
+ if( p_sys->p_player->InitCheck() != B_OK )
+ {
+ msg_Err( p_aout, "BSoundPlayer InitCheck failed" );
+ delete p_sys->p_player;
+ free( p_sys );
+ return -1;
+ }
+
+ /* FIXME FIXME FIXME
+ * We should check BSoundPlayer Latency() everytime we call
+ * aout_OutputNextBuffer(). Unfortunatly, it does not seem to work
+ * correctly: on my computer, it hangs for about 5 seconds at the
+ * beginning of the file. This is not acceptable, so we will start
+ * playing the file with a default latency (my computer's one ;p )
+ * and we create a thread who's going to update it ASAP. According
+ * to what I've seen, the latency is almost constant most of the
+ * time anyway -- titer */
+ p_sys->latency = 16209;
+ vlc_mutex_init( p_aout, &p_sys->lock );
+ if( vlc_thread_create( p_aout, "latency", CheckLatency,
+ VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+ {
+ msg_Err( p_aout, "cannot create Latency thread" );
+ }
+
p_sys->p_player->Start();
p_sys->p_player->SetHasData( true );
-
+
return 0;
}
aout_instance_t * p_aout = (aout_instance_t *) p_this;
aout_sys_t * p_sys = (aout_sys_t *) p_aout->output.p_sys;
+ p_aout->b_die = VLC_TRUE;
+ vlc_thread_join( p_aout );
+ p_aout->b_die = VLC_FALSE;
+ vlc_mutex_destroy( &p_sys->lock );
+
p_sys->p_player->Stop();
delete p_sys->p_player;
free( p_sys );
static void Play( void *aout, void *p_buffer, size_t i_size,
const media_raw_audio_format &format )
{
+ aout_instance_t *p_aout = (aout_instance_t*)aout;
+ aout_sys_t *p_sys = (aout_sys_t*)p_aout->output.p_sys;
aout_buffer_t * p_aout_buffer;
- aout_instance_t *p_aout = (aout_instance_t*) aout;
-
- p_aout_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
+ mtime_t play_time = 0;
+
+ /* FIXME (see above) */
+ vlc_mutex_lock( &p_sys->lock );
+ play_time = mdate() + p_sys->latency;
+ vlc_mutex_unlock( &p_sys->lock );
+
+ p_aout_buffer = aout_OutputNextBuffer( p_aout, play_time, VLC_FALSE );
if( p_aout_buffer != NULL )
{
- /* sometimes p_aout_buffer is not NULL but still isn't valid.
- we check i_nb_bytes so we are sure it is */
- if( p_aout_buffer->i_nb_bytes == BUFFER_SIZE )
- {
- memcpy( (float*)p_buffer,
- p_aout_buffer->p_buffer,
- BUFFER_SIZE );
- aout_BufferFree( p_aout_buffer );
- }
+ p_aout->p_vlc->pf_memcpy( (float*)p_buffer,
+ p_aout_buffer->p_buffer, i_size );
+ aout_BufferFree( p_aout_buffer );
+ }
+ else
+ {
+ p_aout->p_vlc->pf_memset( (float*)p_buffer, 0, i_size );
}
}
/*****************************************************************************
* DoNothing
*****************************************************************************/
-static void DoNothing( aout_instance_t *p_aout)
+static void DoNothing( aout_instance_t *p_aout )
{
return;
}
+
+/*****************************************************************************
+ * CheckLatency
+ *****************************************************************************/
+static int CheckLatency( aout_instance_t *p_aout )
+{
+ aout_sys_t *p_sys = (aout_sys_t*)p_aout->output.p_sys;
+ mtime_t last_check = 0;
+ mtime_t latency;
+
+ while( !p_aout->b_die )
+ {
+ /* check every 0.1 second */
+ if( mdate() > last_check + 100000 )
+ {
+ latency = p_sys->p_player->Latency();
+ if( latency > 0 )
+ {
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->latency = latency;
+ vlc_mutex_unlock( &p_sys->lock );
+ }
+ last_check = mdate();
+ }
+ snooze( 5000 );
+ }
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff