Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
audiowmark
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
audiowmark
Commits
0ae708f9
Commit
0ae708f9
authored
Feb 07, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add multi channel support to Limiter.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
37028227
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
15 deletions
+26
-15
TODO
src/TODO
+0
-1
limiter.cc
src/limiter.cc
+20
-9
limiter.hh
src/limiter.hh
+2
-1
testlimiter.cc
src/testlimiter.cc
+3
-3
wmadd.cc
src/wmadd.cc
+1
-1
No files found.
src/TODO
View file @
0ae708f9
...
...
@@ -3,4 +3,3 @@ possible improvements:
limiter:
- flush
- multi-channel support
src/limiter.cc
View file @
0ae708f9
...
...
@@ -7,7 +7,8 @@
using
std
::
vector
;
using
std
::
max
;
Limiter
::
Limiter
(
int
sample_rate
)
:
Limiter
::
Limiter
(
int
n_channels
,
int
sample_rate
)
:
n_channels
(
n_channels
),
sample_rate
(
sample_rate
)
{
}
...
...
@@ -39,37 +40,47 @@ Limiter::process (const vector<float>& samples)
assert
(
look_ahead
>=
1
);
assert
(
release_factor
>
0
&&
release_factor
<
1
);
for
(
size_t
i
=
0
;
i
<
samples
.
size
();
i
++
)
const
size_t
n_frames
=
samples
.
size
()
/
n_channels
;
assert
(
n_frames
*
n_channels
==
samples
.
size
());
// need all channels of each frame
for
(
size_t
i
=
0
;
i
<
n_frames
;
i
++
)
{
buffer
.
push_back
(
samples
[
i
]);
for
(
uint
c
=
0
;
c
<
n_channels
;
c
++
)
buffer
.
push_back
(
samples
[
i
*
n_channels
+
c
]);
max_buffer
.
push_back
(
ceiling
);
}
for
(
size_t
i
=
0
;
i
<
buffer
.
size
()
;
i
++
)
for
(
size_t
i
=
0
;
i
<
n_frames
;
i
++
)
{
if
(
fabs
(
buffer
[
i
])
>
ceiling
)
float
channel_max
=
0
;
for
(
uint
c
=
0
;
c
<
n_channels
;
c
++
)
channel_max
=
max
(
channel_max
,
fabs
(
samples
[
i
*
n_channels
+
c
]));
if
(
channel_max
>
ceiling
)
{
for
(
uint
j
=
0
;
j
<
look_ahead
;
j
++
)
{
if
(
int
(
i
)
-
int
(
j
)
>=
0
)
{
double
alpha
=
double
(
j
)
/
look_ahead
;
max_buffer
[
i
-
j
]
=
max
<
float
>
(
max_buffer
[
i
-
j
],
fabs
(
buffer
[
i
])
*
(
1
-
alpha
)
+
ceiling
*
alpha
);
max_buffer
[
i
-
j
]
=
max
<
float
>
(
max_buffer
[
i
-
j
],
channel_max
*
(
1
-
alpha
)
+
ceiling
*
alpha
);
}
}
}
}
vector
<
float
>
out
;
if
(
buffer
.
size
()
>
look_ahead
)
if
(
max_
buffer
.
size
()
>
look_ahead
)
{
size_t
todo
=
buffer
.
size
()
-
look_ahead
;
size_t
todo
=
max_
buffer
.
size
()
-
look_ahead
;
for
(
size_t
i
=
0
;
i
<
todo
;
i
++
)
{
maximum
=
maximum
*
release_factor
+
max_buffer
[
i
]
*
(
1
-
release_factor
);
if
(
maximum
<
max_buffer
[
i
])
maximum
=
max_buffer
[
i
];
out
.
push_back
(
buffer
[
i
]
/
maximum
*
ceiling
);
for
(
uint
c
=
0
;
c
<
n_channels
;
c
++
)
out
.
push_back
(
buffer
[
i
*
n_channels
+
c
]
/
maximum
*
ceiling
);
//printf ("%f %f\n", buffer[i], out.back());
}
...
...
src/limiter.hh
View file @
0ae708f9
...
...
@@ -10,12 +10,13 @@ class Limiter
double
maximum
=
1
;
double
release_factor
=
0
;
uint
look_ahead
=
0
;
uint
n_channels
=
0
;
uint
sample_rate
=
0
;
std
::
vector
<
float
>
max_buffer
;
std
::
vector
<
float
>
buffer
;
public
:
Limiter
(
int
sample_rate
);
Limiter
(
int
n_channels
,
int
sample_rate
);
void
set_release
(
double
value_ms
);
void
set_attack
(
double
value_ms
);
...
...
src/testlimiter.cc
View file @
0ae708f9
...
...
@@ -24,16 +24,16 @@ main (int argc, char **argv)
Error
err
=
in
.
open
(
argv
[
1
]);
if
(
err
)
{
fprintf
(
stderr
,
"test
stream
: open input failed: %s
\n
"
,
err
.
message
());
fprintf
(
stderr
,
"test
limiter
: open input failed: %s
\n
"
,
err
.
message
());
return
1
;
}
err
=
out
.
open
(
argv
[
2
],
in
.
n_channels
(),
in
.
sample_rate
(),
16
,
in
.
n_frames
());
if
(
err
)
{
fprintf
(
stderr
,
"test
stream
: open output failed: %s
\n
"
,
err
.
message
());
fprintf
(
stderr
,
"test
limiter
: open output failed: %s
\n
"
,
err
.
message
());
return
1
;
}
Limiter
limiter
(
in
.
sample_rate
());
Limiter
limiter
(
in
.
n_channels
(),
in
.
sample_rate
());
limiter
.
set_attack
(
5
);
limiter
.
set_release
(
50
);
limiter
.
set_ceiling
(
0.9
);
...
...
src/wmadd.cc
View file @
0ae708f9
...
...
@@ -644,7 +644,7 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
if
(
!
wm_resampler
.
init_ok
())
return
1
;
Limiter
limiter
(
in_stream
->
sample_rate
());
Limiter
limiter
(
n_channels
,
in_stream
->
sample_rate
());
limiter
.
set_attack
(
Params
::
limiter_attack_ms
);
limiter
.
set_release
(
Params
::
limiter_release_ms
);
limiter
.
set_ceiling
(
Params
::
limiter_ceiling
);
...
...
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