From b979a9402d369e4237e2d8bf397ed0d94388fd1d Mon Sep 17 00:00:00 2001 From: Steinar Gunderson Date: Fri, 24 Sep 2010 23:40:16 +0200 Subject: [PATCH] Fix compile error in SDI module. --- modules/access/sdi.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/access/sdi.cpp b/modules/access/sdi.cpp index 0613bf8f62..7146608b8d 100644 --- a/modules/access/sdi.cpp +++ b/modules/access/sdi.cpp @@ -84,6 +84,8 @@ struct demux_sys_t int i_width, i_height, i_fps_num, i_fps_den; // FIXME: field dominance + int i_rate, i_channels; + vlc_mutex_t frame_lock; block_t *p_video_frame; // protected by block_t *p_audio_frame; // protected by @@ -347,11 +349,11 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - int i_rate = var_CreateGetInteger( p_demux, "sdi-audio-rate" ); - int i_channels = var_CreateGetInteger( p_demux, "sdi-audio-channels" ); - if( i_rate > 0 && i_channels > 0 ) + p_sys->i_rate = var_CreateGetInteger( p_demux, "sdi-audio-rate" ); + p_sys->i_channels = var_CreateGetInteger( p_demux, "sdi-audio-channels" ); + if( p_sys->i_rate > 0 && p_sys->i_channels > 0 ) { - result = p_sys->p_input->EnableAudioInput( i_rate, bmdAudioSampleType16bitInteger, i_channels ); + result = p_sys->p_input->EnableAudioInput( p_sys->i_rate, bmdAudioSampleType16bitInteger, p_sys->i_channels ); if( result != S_OK ) { msg_Err( p_demux, "Failed to enable audio input" ); @@ -386,8 +388,8 @@ static int Open( vlc_object_t *p_this ) es_format_t audio_fmt; es_format_Init( &audio_fmt, AUDIO_ES, VLC_CODEC_S16N ); - audio_fmt.audio.i_channels = i_channels; - audio_fmt.audio.i_rate = i_rate; + audio_fmt.audio.i_channels = p_sys->i_channels; + audio_fmt.audio.i_rate = p_sys->i_rate; audio_fmt.audio.i_bitspersample = 16; audio_fmt.audio.i_blockalign = audio_fmt.audio.i_channels * audio_fmt.audio.i_bitspersample / 8; audio_fmt.i_bitrate = audio_fmt.audio.i_channels * audio_fmt.audio.i_rate * audio_fmt.audio.i_bitspersample; -- 2.39.2