Commit 741f1682 authored by Cyril Deguet's avatar Cyril Deguet

* jack.c: better handling of buffer underruns

parent 40749893
...@@ -90,7 +90,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -90,7 +90,7 @@ static int Open( vlc_object_t *p_this )
p_aout->output.p_sys = p_sys; p_aout->output.p_sys = p_sys;
/* Connect to the JACK server */ /* Connect to the JACK server */
p_sys->p_jack_client = jack_client_new( "VLC Media Player" ); p_sys->p_jack_client = jack_client_new( "vlc" );
if( p_sys->p_jack_client == NULL ) if( p_sys->p_jack_client == NULL )
{ {
msg_Err( p_aout, "Failed to connect to JACK server" ); msg_Err( p_aout, "Failed to connect to JACK server" );
...@@ -116,7 +116,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -116,7 +116,7 @@ static int Open( vlc_object_t *p_this )
for( i = 0; i < p_sys->i_channels; i++ ) for( i = 0; i < p_sys->i_channels; i++ )
{ {
char p_name[32]; char p_name[32];
snprintf( p_name, 32, "channel %d", i ); snprintf( p_name, 32, "channel_%d", i + 1);
p_sys->p_jack_port[i] = jack_port_register( p_sys->p_jack_client, p_sys->p_jack_port[i] = jack_port_register( p_sys->p_jack_client,
p_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 ); p_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 );
...@@ -187,14 +187,17 @@ int Process( jack_nframes_t i_frames, void *p_arg ) ...@@ -187,14 +187,17 @@ int Process( jack_nframes_t i_frames, void *p_arg )
{ {
aout_buffer_t *p_buffer; aout_buffer_t *p_buffer;
jack_default_audio_sample_t *p_jack_buffer; jack_default_audio_sample_t *p_jack_buffer;
unsigned int i, j; unsigned int i, j, i_nb_samples = 0;
aout_instance_t *p_aout = (aout_instance_t*) p_arg; aout_instance_t *p_aout = (aout_instance_t*) p_arg;
/* Get the next audio data buffer */ /* Get the next audio data buffer */
p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo ); p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
if( p_buffer != NULL ) if( p_buffer )
{ {
i_nb_samples = p_buffer->i_nb_samples;
}
for( i = 0; i < p_aout->output.p_sys->i_channels; i++ ) for( i = 0; i < p_aout->output.p_sys->i_channels; i++ )
{ {
/* Get an output buffer from JACK */ /* Get an output buffer from JACK */
...@@ -202,19 +205,23 @@ int Process( jack_nframes_t i_frames, void *p_arg ) ...@@ -202,19 +205,23 @@ int Process( jack_nframes_t i_frames, void *p_arg )
p_aout->output.p_sys->p_jack_port[i], i_frames ); p_aout->output.p_sys->p_jack_port[i], i_frames );
/* Fill the buffer with audio data */ /* Fill the buffer with audio data */
for (j = 0; j < p_buffer->i_nb_samples; j++) for( j = 0; j < i_nb_samples; j++ )
{ {
p_jack_buffer[j] = ((float*)p_buffer->p_buffer)[2*j+i]; p_jack_buffer[j] = ((float*)p_buffer->p_buffer)[2*j+i];
} }
if (p_buffer->i_nb_samples < i_frames) if (i_nb_samples < i_frames)
{ {
msg_Warn( p_aout, "Buffer underrun (%d)", memset( p_jack_buffer + i_nb_samples, 0,
i_frames-p_buffer->i_nb_samples ); sizeof( jack_default_audio_sample_t ) *
memset( p_jack_buffer+j, 0, i_frames-p_buffer->i_nb_samples ); (i_frames - i_nb_samples) );
} }
} }
if( p_buffer )
{
aout_BufferFree( p_buffer ); aout_BufferFree( p_buffer );
} }
return 0; return 0;
} }
......
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