/*****************************************************************************
- * aout.c : QNX audio output
+ * aout.c : QNX audio output
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
*
* Authors: Henri Fallon <henri@videolan.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
- *
+ * Pascal Levesque <pascal.levesque@mindready.com>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <vlc/vlc.h>
+
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
#include <vlc/aout.h>
+#include "aout_internal.h"
#include <sys/asoundlib.h>
snd_pcm_t * p_pcm_handle;
int i_card;
int i_device;
+
+ byte_t * p_silent_buffer;
+ vlc_bool_t b_initialized;
};
+#define DEFAULT_FRAME_SIZE 2048
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int SetFormat ( aout_thread_t * );
-static int GetBufInfo ( aout_thread_t *, int );
-static void Play ( aout_thread_t *, byte_t *, int );
+int E_(OpenAudio) ( vlc_object_t *p_this );
+void E_(CloseAudio) ( vlc_object_t *p_this );
+static int GetBufInfo ( aout_instance_t * );
+static int SetFormat ( aout_instance_t * );
+static void Play ( aout_instance_t * );
+static int QNXaoutThread ( aout_instance_t * );
/*****************************************************************************
* Open : creates a handle and opens an alsa device
*****************************************************************************/
int E_(OpenAudio)( vlc_object_t *p_this )
{
- aout_thread_t *p_aout = (aout_thread_t *)p_this;
+ aout_instance_t *p_aout = (aout_instance_t *)p_this;
int i_ret;
/* allocate structure */
- p_aout->p_sys = malloc( sizeof( aout_sys_t ) );
- if( p_aout->p_sys == NULL )
+ p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) );
+ if( p_aout->output.p_sys == NULL )
{
msg_Err( p_aout, "out of memory" );
- return( 1 );
+ return -1;
}
/* open audio device */
- if( ( i_ret = snd_pcm_open_preferred( &p_aout->p_sys->p_pcm_handle,
- &p_aout->p_sys->i_card,
- &p_aout->p_sys->i_device,
+ if( ( i_ret = snd_pcm_open_preferred( &p_aout->output.p_sys->p_pcm_handle,
+ &p_aout->output.p_sys->i_card,
+ &p_aout->output.p_sys->i_device,
SND_PCM_OPEN_PLAYBACK ) ) < 0 )
{
msg_Err( p_aout, "unable to open audio device (%s)",
snd_strerror( i_ret ) );
- free( p_aout->p_sys );
- return( 1 );
+ free( p_aout->output.p_sys );
+ return -1;
}
/* disable mmap */
- if( ( i_ret = snd_pcm_plugin_set_disable( p_aout->p_sys->p_pcm_handle,
+ if( ( i_ret = snd_pcm_plugin_set_disable( p_aout->output.p_sys->p_pcm_handle,
PLUGIN_DISABLE_MMAP ) ) < 0 )
{
msg_Err( p_aout, "unable to disable mmap (%s)", snd_strerror(i_ret) );
- Close( p_this );
- free( p_aout->p_sys );
- return( 1 );
+ E_(CloseAudio)( p_this );
+ free( p_aout->output.p_sys );
+ return -1;
}
- p_aout->pf_setformat = SetFormat;
- p_aout->pf_getbufinfo = GetBufInfo;
- p_aout->pf_play = Play;
+ /* Create audio thread and wait for its readiness. */
+ p_aout->output.p_sys->b_initialized = VLC_FALSE;
+ if( vlc_thread_create( p_aout, "aout", QNXaoutThread, VLC_FALSE ) )
+ {
+ msg_Err( p_aout, "cannot create QNX audio thread (%s)", strerror(errno) );
+ E_(CloseAudio)( p_this );
+ free( p_aout->output.p_sys );
+ return -1;
+ }
+
+ p_aout->output.p_sys->p_silent_buffer = malloc( DEFAULT_FRAME_SIZE * 4 );
+
+ p_aout->output.pf_setformat = SetFormat;
+ p_aout->output.pf_play = Play;
return( 0 );
}
/*****************************************************************************
- * SetFormat : set the audio output format
+ * SetFormat : set the audio output format
*****************************************************************************
* This function prepares the device, sets the rate, format, the mode
* ("play as soon as you have data"), and buffer information.
*****************************************************************************/
-static int SetFormat( aout_thread_t *p_aout )
+static int SetFormat( aout_instance_t *p_this )
{
int i_ret;
int i_bytes_per_sample;
snd_pcm_channel_info_t pi;
snd_pcm_channel_params_t pp;
+ aout_instance_t *p_aout = (aout_instance_t *)p_this;
+
+ p_aout->output.p_sys->b_initialized = VLC_FALSE;
memset( &pi, 0, sizeof(pi) );
memset( &pp, 0, sizeof(pp) );
pi.channel = SND_PCM_CHANNEL_PLAYBACK;
- if( ( i_ret = snd_pcm_plugin_info( p_aout->p_sys->p_pcm_handle,
+ if( ( i_ret = snd_pcm_plugin_info( p_aout->output.p_sys->p_pcm_handle,
&pi ) ) < 0 )
{
msg_Err( p_aout, "unable to get plugin info (%s)",
snd_strerror( i_ret ) );
- return( 1 );
+ return -1;
}
pp.mode = SND_PCM_MODE_BLOCK;
pp.start_mode = SND_PCM_START_FULL;
pp.stop_mode = SND_PCM_STOP_STOP;
- pp.buf.block.frags_max = 1;
+ pp.buf.block.frags_max = 3;
pp.buf.block.frags_min = 1;
-
+
pp.format.interleave = 1;
- pp.format.rate = p_aout->i_rate;
- pp.format.voices = p_aout->i_channels;
+ pp.format.rate = p_aout->output.output.i_rate;
+ pp.format.voices = p_aout->output.output.i_channels;
+
+ p_aout->output.output.i_format = AOUT_FMT_S16_NE;
+ p_aout->output.i_nb_samples = DEFAULT_FRAME_SIZE;
- switch( p_aout->i_format )
+ switch( p_aout->output.output.i_format )
{
case AOUT_FMT_S16_LE:
pp.format.format = SND_PCM_SFMT_S16_LE;
break;
}
- pp.buf.block.frag_size =
- (((s64)p_aout->i_rate * AOUT_BUFFER_DURATION) / 1000000) *
- p_aout->i_channels * i_bytes_per_sample;
+ pp.buf.block.frag_size = p_aout->output.i_nb_samples *
+ p_aout->output.output.i_channels *
+ i_bytes_per_sample;
/* set parameters */
- if( ( i_ret = snd_pcm_plugin_params( p_aout->p_sys->p_pcm_handle,
+ if( ( i_ret = snd_pcm_plugin_params( p_aout->output.p_sys->p_pcm_handle,
&pp ) ) < 0 )
{
msg_Err( p_aout, "unable to set parameters (%s)", snd_strerror(i_ret) );
- return( 1 );
+ return -1;
}
/* prepare channel */
- if( ( i_ret = snd_pcm_plugin_prepare( p_aout->p_sys->p_pcm_handle,
+ if( ( i_ret = snd_pcm_plugin_prepare( p_aout->output.p_sys->p_pcm_handle,
SND_PCM_CHANNEL_PLAYBACK ) ) < 0 )
{
msg_Err( p_aout, "unable to prepare channel (%s)",
snd_strerror( i_ret ) );
- return( 1 );
+ return -1;
}
+ p_aout->output.p_sys->b_initialized = VLC_TRUE;
+
return( 0 );
}
* of data to play, it switches to the "underrun" status. It has to
* be flushed and re-prepared
*****************************************************************************/
-static int GetBufInfo( aout_thread_t *p_aout, int i_buffer_limit )
+static int GetBufInfo( aout_instance_t *p_aout )
{
int i_ret;
snd_pcm_channel_status_t status;
/* get current pcm status */
memset( &status, 0, sizeof(status) );
- if( ( i_ret = snd_pcm_plugin_status( p_aout->p_sys->p_pcm_handle,
+ if( ( i_ret = snd_pcm_plugin_status( p_aout->output.p_sys->p_pcm_handle,
&status ) ) < 0 )
{
msg_Err( p_aout, "unable to get device status (%s)",
{
case SND_PCM_STATUS_READY:
case SND_PCM_STATUS_UNDERRUN:
- if( ( i_ret = snd_pcm_plugin_prepare( p_aout->p_sys->p_pcm_handle,
+ if( ( i_ret = snd_pcm_plugin_prepare( p_aout->output.p_sys->p_pcm_handle,
SND_PCM_CHANNEL_PLAYBACK ) ) < 0 )
{
msg_Err( p_aout, "unable to prepare channel (%s)",
*****************************************************************************
* Plays a sample using the snd_pcm_write function from the alsa API
*****************************************************************************/
-static void Play( aout_thread_t *p_aout, byte_t *buffer, int i_size )
+static void Play( aout_instance_t *p_aout )
{
- int i_ret;
-
- if( ( i_ret = snd_pcm_plugin_write( p_aout->p_sys->p_pcm_handle,
- (void *) buffer,
- (size_t) i_size ) ) <= 0 )
- {
- msg_Err( p_aout, "unable to write data (%s)", snd_strerror(i_ret) );
- }
}
/*****************************************************************************
* CloseAudio: close the audio device
*****************************************************************************/
-static void E_(CloseAudio) ( vlc_object_t *p_this )
+void E_(CloseAudio) ( vlc_object_t *p_this )
{
- aout_thread_t *p_aout = (aout_thread_t *)p_this;
+ aout_instance_t *p_aout = (aout_instance_t *)p_this;
int i_ret;
- if( ( i_ret = snd_pcm_close( p_aout->p_sys->p_pcm_handle ) ) < 0 )
+ p_aout->b_die = 1;
+ vlc_thread_join( p_aout );
+
+ if( ( i_ret = snd_pcm_close( p_aout->output.p_sys->p_pcm_handle ) ) < 0 )
{
msg_Err( p_aout, "unable to close audio device (%s)",
snd_strerror( i_ret ) );
}
- free( p_aout->p_sys );
+ free( p_aout->output.p_sys->p_silent_buffer );
+ free( p_aout->output.p_sys );
}
+
+
+/*****************************************************************************
+ * QNXaoutThread: asynchronous thread used to DMA the data to the device
+ *****************************************************************************/
+static int QNXaoutThread( aout_instance_t * p_aout )
+{
+ struct aout_sys_t * p_sys = p_aout->output.p_sys;
+
+ while ( !p_aout->b_die )
+ {
+ aout_buffer_t * p_buffer;
+ int i_tmp, i_size;
+ byte_t * p_bytes;
+
+ if( !p_sys->b_initialized )
+ {
+ msleep( THREAD_SLEEP );
+ continue;
+ }
+
+ if ( p_aout->output.output.i_format != AOUT_FMT_SPDIF )
+ {
+ mtime_t next_date = 0;
+
+ /* Get the presentation date of the next write() operation. It
+ * is equal to the current date + duration of buffered samples.
+ * Order is important here, since GetBufInfo is believed to take
+ * more time than mdate(). */
+ next_date = (mtime_t)GetBufInfo( p_aout ) * 1000000
+ / p_aout->output.output.i_bytes_per_frame
+ / p_aout->output.output.i_rate
+ * p_aout->output.output.i_frame_length;
+ next_date += mdate();
+
+ p_buffer = aout_OutputNextBuffer( p_aout, next_date, VLC_FALSE );
+ }
+ else
+ {
+ p_buffer = aout_OutputNextBuffer( p_aout, 0, VLC_TRUE );
+ }
+
+ if ( p_buffer != NULL )
+ {
+ p_bytes = p_buffer->p_buffer;
+ i_size = p_buffer->i_nb_bytes;
+ }
+ else
+ {
+ i_size = DEFAULT_FRAME_SIZE / p_aout->output.output.i_frame_length
+ * p_aout->output.output.i_bytes_per_frame;
+ p_bytes = p_aout->output.p_sys->p_silent_buffer;
+ memset( p_bytes, 0, i_size );
+ }
+
+ i_tmp = snd_pcm_plugin_write( p_aout->output.p_sys->p_pcm_handle,
+ (void *) p_bytes,
+ (size_t) i_size );
+
+ if( i_tmp < 0 )
+ {
+ msg_Err( p_aout, "write failed (%s)", strerror(errno) );
+ }
+
+ if ( p_buffer != NULL )
+ {
+ aout_BufferFree( p_buffer );
+ }
+ }
+
+ return 0;
+}
+
projects / vlc / commitdiff