Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
e9d2eb5c
Commit
e9d2eb5c
authored
Dec 19, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
visualization: fix output formats
parent
b6c7c010
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
30 deletions
+12
-30
modules/visualization/goom.c
modules/visualization/goom.c
+5
-12
modules/visualization/projectm.cpp
modules/visualization/projectm.cpp
+4
-10
modules/visualization/vsxu.cpp
modules/visualization/vsxu.cpp
+3
-8
No files found.
modules/visualization/goom.c
View file @
e9d2eb5c
...
...
@@ -119,21 +119,12 @@ static int Open( vlc_object_t *p_this )
goom_thread_t
*
p_thread
;
video_format_t
fmt
;
if
(
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
)
)
if
(
p_filter
->
fmt_in
.
audio
.
i_format
!=
VLC_CODEC_FL32
)
{
msg_Warn
(
p_filter
,
"
input and output formats are not similar
"
);
msg_Warn
(
p_filter
,
"
bad input format
"
);
return
VLC_EGENERIC
;
}
p_filter
->
pf_audio_filter
=
DoWork
;
/* Allocate structure */
p_sys
=
p_filter
->
p_sys
=
malloc
(
sizeof
(
filter_sys_t
)
);
...
...
@@ -167,7 +158,7 @@ static int Open( vlc_object_t *p_this )
vlc_cond_init
(
&
p_thread
->
wait
);
p_thread
->
i_blocks
=
0
;
date_Init
(
&
p_thread
->
date
,
p_filter
->
fmt_
out
.
audio
.
i_rate
,
1
);
date_Init
(
&
p_thread
->
date
,
p_filter
->
fmt_
in
.
audio
.
i_rate
,
1
);
date_Set
(
&
p_thread
->
date
,
0
);
p_thread
->
i_channels
=
aout_FormatNbChannels
(
&
p_filter
->
fmt_in
.
audio
);
...
...
@@ -183,6 +174,8 @@ static int Open( vlc_object_t *p_this )
return
VLC_EGENERIC
;
}
p_filter
->
fmt_out
.
audio
=
p_filter
->
fmt_in
.
audio
;
p_filter
->
pf_audio_filter
=
DoWork
;
return
VLC_SUCCESS
;
}
...
...
modules/visualization/projectm.cpp
View file @
e9d2eb5c
...
...
@@ -160,20 +160,12 @@ static int Open( vlc_object_t * p_this )
filter_sys_t
*
p_sys
;
/* Test the audio format */
if
(
p_filter
->
fmt_in
.
audio
.
i_format
!=
VLC_CODEC_FL32
||
p_filter
->
fmt_out
.
audio
.
i_format
!=
VLC_CODEC_FL32
)
if
(
p_filter
->
fmt_in
.
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
)
)
{
msg_Warn
(
p_filter
,
"input and outut are not similar"
);
msg_Warn
(
p_filter
,
"bad input format"
);
return
VLC_EGENERIC
;
}
p_filter
->
pf_audio_filter
=
DoWork
;
p_sys
=
p_filter
->
p_sys
=
(
filter_sys_t
*
)
malloc
(
sizeof
(
*
p_sys
)
);
if
(
!
p_sys
)
return
VLC_ENOMEM
;
...
...
@@ -201,6 +193,8 @@ static int Open( vlc_object_t * p_this )
goto
error
;
}
p_filter
->
fmt_out
.
audio
=
p_filter
->
fmt_in
.
audio
;
p_filter
->
pf_audio_filter
=
DoWork
;
return
VLC_SUCCESS
;
error:
...
...
modules/visualization/vsxu.cpp
View file @
e9d2eb5c
...
...
@@ -113,15 +113,9 @@ static int Open( vlc_object_t * p_this )
filter_sys_t
*
p_sys
;
/* Test the audio format */
if
(
p_filter
->
fmt_in
.
audio
.
i_format
!=
VLC_CODEC_FL32
||
p_filter
->
fmt_out
.
audio
.
i_format
!=
VLC_CODEC_FL32
)
if
(
p_filter
->
fmt_in
.
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
)
)
{
msg_Warn
(
p_filter
,
"input and outut are not similar"
);
msg_Warn
(
p_filter
,
"bad input format"
);
return
VLC_EGENERIC
;
}
...
...
@@ -155,6 +149,7 @@ static int Open( vlc_object_t * p_this )
goto
error
;
}
p_filter
->
fmt_out
.
audio
=
p_filter
->
fmt_in
.
audio
;
p_filter
->
pf_audio_filter
=
DoWork
;
return
VLC_SUCCESS
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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