vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Nov 6 19:36:35 2012 +0200| [c1ab8edd92bc501e88d778373a2a1e05c2f1862f] | committer: Rémi Denis-Courmont
equalizer: setup filter_t only when successful > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1ab8edd92bc501e88d778373a2a1e05c2f1862f --- modules/audio_filter/equalizer.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index 41a89eb..e1cb296 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -153,28 +153,9 @@ static int TwoPassCallback( vlc_object_t *, char const *, vlc_value_t, static int Open( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; - filter_sys_t *p_sys; - - if( p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 || - p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 ) - { - p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32; - p_filter->fmt_out.audio.i_format = VLC_CODEC_FL32; - msg_Warn( p_filter, "bad input or output format" ); - return VLC_EGENERIC; - } - if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) ) - { - memcpy( &p_filter->fmt_out.audio, &p_filter->fmt_in.audio, - sizeof(audio_sample_format_t) ); - msg_Warn( p_filter, "input and output formats are not similar" ); - return VLC_EGENERIC; - } - - p_filter->pf_audio_filter = DoWork; /* Allocate structure */ - p_sys = p_filter->p_sys = malloc( sizeof( *p_sys ) ); + filter_sys_t *p_sys = p_filter->p_sys = malloc( sizeof( *p_sys ) ); if( !p_sys ) return VLC_ENOMEM; @@ -186,6 +167,10 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } + p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32; + p_filter->fmt_out.audio = p_filter->fmt_in.audio; + p_filter->pf_audio_filter = DoWork; + return VLC_SUCCESS; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
