Skip to content

V
vlc-gpu
Commit fcf29754 authored by Benjamin Pracht's avatar Benjamin Pracht
Browse files
Options

Dirty hack to make devices using snd_intel8x0 drivers happy with 96k streams

parent 4d9b753a
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 68 deletions
modules/audio_output/alsa.c
View file @ fcf29754
...@@ -304,6 +304,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -304,6 +304,7 @@ static int Open( vlc_object_t *p_this )
int i_snd_rc = -1; int i_snd_rc = -1;
unsigned int i_old_rate; unsigned int i_old_rate;
vlc_bool_t b_retry = VLC_TRUE;
/* Allocate structures */ /* Allocate structures */
p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) ); p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) );
...@@ -493,113 +494,132 @@ static int Open( vlc_object_t *p_this ) ...@@ -493,113 +494,132 @@ static int Open( vlc_object_t *p_this )
snd_pcm_hw_params_alloca(&p_hw); snd_pcm_hw_params_alloca(&p_hw);
snd_pcm_sw_params_alloca(&p_sw); snd_pcm_sw_params_alloca(&p_sw);
/* Get Initial hardware parameters */ /* Due to some bugs in alsa with some drivers, we need to retry in s16l
if ( ( i_snd_rc = snd_pcm_hw_params_any( p_sys->p_snd_pcm, p_hw ) ) < 0 ) if snd_pcm_hw_params fails in fl32 */
while ( b_retry )
{ {
msg_Err( p_aout, "unable to retrieve initial hardware parameters (%s)", b_retry = VLC_FALSE;
/* Get Initial hardware parameters */
if ( ( i_snd_rc = snd_pcm_hw_params_any( p_sys->p_snd_pcm, p_hw ) ) < 0 )
{
msg_Err( p_aout, "unable to retrieve initial hardware parameters (%s)",
snd_strerror( i_snd_rc ) ); snd_strerror( i_snd_rc ) );
goto error; goto error;
} }
/* Set format. */ /* Set format. */
if ( ( i_snd_rc = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, p_hw, if ( ( i_snd_rc = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, p_hw,
i_snd_pcm_format ) ) < 0 ) i_snd_pcm_format ) ) < 0 )
{
if( i_snd_pcm_format != SND_PCM_FORMAT_S16 )
{ {
i_snd_pcm_format = SND_PCM_FORMAT_S16; if( i_snd_pcm_format != SND_PCM_FORMAT_S16 )
i_snd_rc = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, {
i_snd_pcm_format = SND_PCM_FORMAT_S16;
i_snd_rc = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm,
p_hw, i_snd_pcm_format ); p_hw, i_snd_pcm_format );
}
if ( i_snd_rc < 0 )
{
msg_Err( p_aout, "unable to set stream sample size and "
"word order (%s)", snd_strerror( i_snd_rc ) );
goto error;
}
} }
if ( i_snd_rc < 0 ) if( i_vlc_pcm_format != VLC_FOURCC('s','p','d','i') )
switch( i_snd_pcm_format )
{ {
msg_Err( p_aout, "unable to set stream sample size and " case SND_PCM_FORMAT_FLOAT:
"word order (%s)", snd_strerror( i_snd_rc ) ); i_vlc_pcm_format = VLC_FOURCC('f','l','3','2');
goto error; break;
case SND_PCM_FORMAT_S16:
i_vlc_pcm_format = AOUT_FMT_S16_NE;
break;
} }
} p_aout->output.output.i_format = i_vlc_pcm_format;
if( i_vlc_pcm_format != VLC_FOURCC('s','p','d','i') )
switch( i_snd_pcm_format )
{
case SND_PCM_FORMAT_FLOAT:
i_vlc_pcm_format = VLC_FOURCC('f','l','3','2');
break;
case SND_PCM_FORMAT_S16:
i_vlc_pcm_format = AOUT_FMT_S16_NE;
break;
}
p_aout->output.output.i_format = i_vlc_pcm_format;
if ( ( i_snd_rc = snd_pcm_hw_params_set_access( p_sys->p_snd_pcm, p_hw, if ( ( i_snd_rc = snd_pcm_hw_params_set_access( p_sys->p_snd_pcm, p_hw,
SND_PCM_ACCESS_RW_INTERLEAVED ) ) < 0 ) SND_PCM_ACCESS_RW_INTERLEAVED ) ) < 0 )
{ {
msg_Err( p_aout, "unable to set interleaved stream format (%s)", msg_Err( p_aout, "unable to set interleaved stream format (%s)",
snd_strerror( i_snd_rc ) ); snd_strerror( i_snd_rc ) );
goto error; goto error;
} }
/* Set channels. */ /* Set channels. */
if ( ( i_snd_rc = snd_pcm_hw_params_set_channels( p_sys->p_snd_pcm, p_hw, if ( ( i_snd_rc = snd_pcm_hw_params_set_channels( p_sys->p_snd_pcm, p_hw,
i_channels ) ) < 0 ) i_channels ) ) < 0 )
{ {
msg_Err( p_aout, "unable to set number of output channels (%s)", msg_Err( p_aout, "unable to set number of output channels (%s)",
snd_strerror( i_snd_rc ) ); snd_strerror( i_snd_rc ) );
goto error; goto error;
} }
/* Set rate. */ /* Set rate. */
i_old_rate = p_aout->output.output.i_rate; i_old_rate = p_aout->output.output.i_rate;
#ifdef HAVE_ALSA_NEW_API #ifdef HAVE_ALSA_NEW_API
i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw, i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw,
&p_aout->output.output.i_rate, &p_aout->output.output.i_rate,
NULL ); NULL );
#else #else
i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw, i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw,
p_aout->output.output.i_rate, p_aout->output.output.i_rate,
NULL ); NULL );
#endif #endif
if( i_snd_rc < 0 || p_aout->output.output.i_rate != i_old_rate ) if( i_snd_rc < 0 || p_aout->output.output.i_rate != i_old_rate )
{ {
msg_Warn( p_aout, "The rate %d Hz is not supported by your hardware. " msg_Warn( p_aout, "The rate %d Hz is not supported by your hardware. "
"Using %d Hz instead.\n", i_old_rate, "Using %d Hz instead.\n", i_old_rate,
p_aout->output.output.i_rate ); p_aout->output.output.i_rate );
} }
/* Set buffer size. */ /* Set buffer size. */
#ifdef HAVE_ALSA_NEW_API #ifdef HAVE_ALSA_NEW_API
if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
p_hw, &i_buffer_size ) ) < 0 ) p_hw, &i_buffer_size ) ) < 0 )
#else #else
if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
p_hw, i_buffer_size ) ) < 0 ) p_hw, i_buffer_size ) ) < 0 )
#endif #endif
{ {
msg_Err( p_aout, "unable to set buffer size (%s)", msg_Err( p_aout, "unable to set buffer size (%s)",
snd_strerror( i_snd_rc ) ); snd_strerror( i_snd_rc ) );
goto error; goto error;
} }
/* Set period size. */ /* Set period size. */
#ifdef HAVE_ALSA_NEW_API #ifdef HAVE_ALSA_NEW_API
if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm,
p_hw, &i_period_size, NULL ) ) < 0 ) p_hw, &i_period_size, NULL ) ) < 0 )
#else #else
if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm,
p_hw, i_period_size, NULL ) ) < 0 ) p_hw, i_period_size, NULL ) ) < 0 )
#endif #endif
{ {
msg_Err( p_aout, "unable to set period size (%s)", msg_Err( p_aout, "unable to set period size (%s)",
snd_strerror( i_snd_rc ) ); snd_strerror( i_snd_rc ) );
goto error; goto error;
} }
p_aout->output.i_nb_samples = i_period_size; p_aout->output.i_nb_samples = i_period_size;
/* Commit hardware parameters. */ /* Commit hardware parameters. */
if ( ( i_snd_rc = snd_pcm_hw_params( p_sys->p_snd_pcm, p_hw ) ) < 0 ) if ( ( i_snd_rc = snd_pcm_hw_params( p_sys->p_snd_pcm, p_hw ) ) < 0 )
{ {
msg_Err( p_aout, "unable to commit hardware configuration (%s)", if ( b_retry == VLC_FALSE &&
i_snd_pcm_format == SND_PCM_FORMAT_FLOAT)
{
b_retry = VLC_TRUE;
i_snd_pcm_format = SND_PCM_FORMAT_S16;
p_aout->output.output.i_format = AOUT_FMT_S16_NE;
msg_Warn( p_aout, "unable to commit hardware configuration "
"with fl32 samples. Retrying with s16l (%s)", snd_strerror( i_snd_rc ) );
}
else
{
msg_Err( p_aout, "unable to commit hardware configuration (%s)",
snd_strerror( i_snd_rc ) ); snd_strerror( i_snd_rc ) );
goto error; goto error;
}
}
} }
#ifdef HAVE_ALSA_NEW_API #ifdef HAVE_ALSA_NEW_API
......
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