Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
c9fbe78a
Commit
c9fbe78a
authored
Nov 06, 2012
by
Rémi Denis-Courmont
Browse files
normvol: setup filter_t only when successful
parent
b2e76597
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/audio_filter/normvol.c
View file @
c9fbe78a
...
...
@@ -97,25 +97,6 @@ static int Open( vlc_object_t *p_this )
unsigned
i_channels
;
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
;
i_channels
=
aout_FormatNbChannels
(
&
p_filter
->
fmt_in
.
audio
);
p_sys
=
p_filter
->
p_sys
=
malloc
(
sizeof
(
*
p_sys
)
);
...
...
@@ -134,6 +115,10 @@ static int Open( vlc_object_t *p_this )
return
VLC_ENOMEM
;
}
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
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment