Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
3e10d0e6
Commit
3e10d0e6
authored
Jun 18, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rewording of the debug messages.
parent
6165ab0d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
10 deletions
+21
-10
modules/audio_filter/spatializer/spatializer.cpp
modules/audio_filter/spatializer/spatializer.cpp
+21
-10
No files found.
modules/audio_filter/spatializer/spatializer.cpp
View file @
3e10d0e6
...
@@ -36,9 +36,11 @@
...
@@ -36,9 +36,11 @@
#include <vlc_common.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_plugin.h>
#include "vlc_aout.h"
#include <vlc_aout.h>
#include "revmodel.hpp"
#include "revmodel.hpp"
#define SPAT_AMP 0.3
#define SPAT_AMP 0.3
/*****************************************************************************
/*****************************************************************************
* Module descriptor
* Module descriptor
*****************************************************************************/
*****************************************************************************/
...
@@ -91,10 +93,12 @@ struct aout_filter_sys_t
...
@@ -91,10 +93,12 @@ struct aout_filter_sys_t
class
CLocker
class
CLocker
{
{
public:
public:
CLocker
(
vlc_mutex_t
*
p_lock
)
:
p_lock
(
p_lock
)
{
CLocker
(
vlc_mutex_t
*
p_lock_to_manage
)
:
p_lock
(
p_lock_to_manage
)
{
vlc_mutex_lock
(
p_lock
);
vlc_mutex_lock
(
p_lock
);
}
}
virtual
~
CLocker
()
{
virtual
~
CLocker
()
{
vlc_mutex_unlock
(
p_lock
);
vlc_mutex_unlock
(
p_lock
);
}
}
private:
private:
...
@@ -106,6 +110,8 @@ static const char *psz_control_names[] =
...
@@ -106,6 +110,8 @@ static const char *psz_control_names[] =
"spatializer-roomsize"
,
"spatializer-width"
,
"spatializer-roomsize"
,
"spatializer-width"
,
"spatializer-wet"
,
"spatializer-dry"
,
"spatializer-damp"
"spatializer-wet"
,
"spatializer-dry"
,
"spatializer-damp"
};
};
static
void
DoWork
(
aout_instance_t
*
,
aout_filter_t
*
,
static
void
DoWork
(
aout_instance_t
*
,
aout_filter_t
*
,
aout_buffer_t
*
,
aout_buffer_t
*
);
aout_buffer_t
*
,
aout_buffer_t
*
);
...
@@ -131,7 +137,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -131,7 +137,7 @@ static int Open( vlc_object_t *p_this )
aout_filter_sys_t
*
p_sys
;
aout_filter_sys_t
*
p_sys
;
aout_instance_t
*
p_aout
=
(
aout_instance_t
*
)
p_filter
->
p_parent
;
aout_instance_t
*
p_aout
=
(
aout_instance_t
*
)
p_filter
->
p_parent
;
bool
b_fit
=
true
;
bool
b_fit
=
true
;
msg_Dbg
(
p_this
,
"Opening filter spatializer %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"Opening filter spatializer"
);
if
(
p_filter
->
input
.
i_format
!=
VLC_CODEC_FL32
||
if
(
p_filter
->
input
.
i_format
!=
VLC_CODEC_FL32
||
p_filter
->
output
.
i_format
!=
VLC_CODEC_FL32
)
p_filter
->
output
.
i_format
!=
VLC_CODEC_FL32
)
...
@@ -201,7 +207,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -201,7 +207,7 @@ static void Close( vlc_object_t *p_this )
delete
p_sys
->
p_reverbm
;
delete
p_sys
->
p_reverbm
;
vlc_mutex_destroy
(
&
p_sys
->
lock
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
free
(
p_sys
);
free
(
p_sys
);
msg_Dbg
(
p_this
,
"Closing filter spatializer %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"Closing filter spatializer"
);
}
}
/*****************************************************************************
/*****************************************************************************
...
@@ -246,52 +252,57 @@ static void SpatFilter( aout_instance_t *p_aout,
...
@@ -246,52 +252,57 @@ static void SpatFilter( aout_instance_t *p_aout,
static
int
RoomCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
RoomCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
{
{
(
void
)
psz_cmd
;
(
void
)
oldval
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setroomsize
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setroomsize
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"room callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"room size is now %3.1f"
,
newval
.
f_float
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
static
int
WidthCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
WidthCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
{
{
(
void
)
psz_cmd
;
(
void
)
oldval
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setwidth
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setwidth
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"width callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"width is now %3.1f"
,
newval
.
f_float
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
static
int
WetCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
WetCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
{
{
(
void
)
psz_cmd
;
(
void
)
oldval
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setwet
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setwet
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"wet callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"'wet' value is now %3.1f"
,
newval
.
f_float
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
static
int
DryCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
DryCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
{
{
(
void
)
psz_cmd
;
(
void
)
oldval
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setdry
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setdry
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"dry callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"'dry' value is now %3.1f"
,
newval
.
f_float
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
static
int
DampCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
DampCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
{
{
(
void
)
psz_cmd
;
(
void
)
oldval
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
aout_filter_sys_t
*
p_sys
=
(
aout_filter_sys_t
*
)
p_data
;
CLocker
locker
(
&
p_sys
->
lock
);
CLocker
locker
(
&
p_sys
->
lock
);
p_sys
->
p_reverbm
->
setdamp
(
newval
.
f_float
);
p_sys
->
p_reverbm
->
setdamp
(
newval
.
f_float
);
msg_Dbg
(
p_this
,
"damp callback %3.1f %s %s %d"
,
newval
.
f_float
,
__FILE__
,
__func__
,
__LINE__
);
msg_Dbg
(
p_this
,
"'damp' value is now %3.1f"
,
newval
.
f_float
);
return
VLC_SUCCESS
;
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