Skip to content

V
vlc-1.1
Commit cf75b314 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

Fixed a bug in the OSS output I introduced yesterday.

parent 2aac17a6
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
modules/audio_output/oss.c
View file @ cf75b314
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* oss.c : OSS /dev/dsp module for vlc * oss.c : OSS /dev/dsp module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2002 VideoLAN * Copyright (C) 2000-2002 VideoLAN
* $Id: oss.c,v 1.27 2002/09/30 21:32:32 massiot Exp $ * $Id: oss.c,v 1.28 2002/10/01 22:34:43 massiot Exp $
* *
* Authors: Michel Kaempf <maxx@via.ecp.fr> * Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -160,7 +160,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -160,7 +160,7 @@ static int Open( vlc_object_t *p_this )
/* Set the output format */ /* Set the output format */
if ( p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i') ) if ( p_aout->output.output.i_format == VLC_FOURCC('s','p','d','i') )
{ {
i_format = VLC_FOURCC('s','p','d','i'); i_format = AFMT_AC3;
p_aout->output.i_nb_samples = A52_FRAME_NB; p_aout->output.i_nb_samples = A52_FRAME_NB;
p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE; p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE;
p_aout->output.output.i_frame_length = A52_FRAME_NB; p_aout->output.output.i_frame_length = A52_FRAME_NB;
...@@ -169,7 +169,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -169,7 +169,8 @@ static int Open( vlc_object_t *p_this )
} }
else else
{ {
p_aout->output.output.i_format = i_format = AOUT_FMT_S16_NE; p_aout->output.output.i_format = AOUT_FMT_S16_NE;
i_format = AFMT_S16_NE;
p_aout->output.i_nb_samples = FRAME_SIZE; p_aout->output.i_nb_samples = FRAME_SIZE;
aout_VolumeSoftInit( p_aout ); aout_VolumeSoftInit( p_aout );
...@@ -178,11 +179,12 @@ static int Open( vlc_object_t *p_this ) ...@@ -178,11 +179,12 @@ static int Open( vlc_object_t *p_this )
if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
|| i_format != p_aout->output.output.i_format ) || i_format != p_aout->output.output.i_format )
{ {
if ( i_format == VLC_FOURCC('s','p','d','i') ) if ( i_format == AFMT_AC3 )
{ {
/* Retry with S16 */ /* Retry with S16 */
msg_Warn( p_aout, "cannot set audio output format (%i)", i_format ); msg_Warn( p_aout, "cannot set audio output format (%i)", i_format );
p_aout->output.output.i_format = i_format = AOUT_FMT_S16_NE; p_aout->output.output.i_format = AOUT_FMT_S16_NE;
i_format = AFMT_S16_NE;
p_aout->output.i_nb_samples = FRAME_SIZE; p_aout->output.i_nb_samples = FRAME_SIZE;
if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
|| i_format != p_aout->output.output.i_format ) || i_format != p_aout->output.output.i_format )
......
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