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
88dccbbd
Commit
88dccbbd
authored
Feb 01, 2019
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
If Resampler doesn't support desired ratio, fallback to VResampler.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
479e441a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
18 deletions
+35
-18
audiowmark.cc
src/audiowmark.cc
+35
-18
No files found.
src/audiowmark.cc
View file @
88dccbbd
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
#include "random.hh"
#include "random.hh"
#include <zita-resampler/resampler.h>
#include <zita-resampler/resampler.h>
#include <zita-resampler/vresampler.h>
#include <assert.h>
#include <assert.h>
...
@@ -501,23 +502,11 @@ mark_pad (const WavData& wav_data, size_t frame, const vector<vector<complex<flo
...
@@ -501,23 +502,11 @@ mark_pad (const WavData& wav_data, size_t frame, const vector<vector<complex<flo
}
}
}
}
WavData
template
<
class
R
>
resample
(
const
WavData
&
wav_data
,
int
rate
)
static
void
process_resampler
(
R
&
resampler
,
const
vector
<
float
>&
in
,
vector
<
float
>&
out
)
{
{
if
(
rate
==
wav_data
.
sample_rate
())
resampler
.
out_count
=
out
.
size
()
/
resampler
.
nchan
();
return
wav_data
;
Resampler
resampler
;
const
int
n_channels
=
wav_data
.
n_channels
();
const
int
hlen
=
16
;
const
double
ratio
=
double
(
rate
)
/
wav_data
.
sample_rate
();
const
vector
<
float
>&
in
=
wav_data
.
samples
();
vector
<
float
>
out
(
lrint
(
in
.
size
()
/
n_channels
*
ratio
)
*
n_channels
);
resampler
.
setup
(
wav_data
.
sample_rate
(),
rate
,
n_channels
,
hlen
);
resampler
.
out_count
=
out
.
size
()
/
n_channels
;
resampler
.
out_data
=
&
out
[
0
];
resampler
.
out_data
=
&
out
[
0
];
/* avoid timeshift: zita needs k/2 - 1 samples before the actual input */
/* avoid timeshift: zita needs k/2 - 1 samples before the actual input */
...
@@ -525,7 +514,7 @@ resample (const WavData& wav_data, int rate)
...
@@ -525,7 +514,7 @@ resample (const WavData& wav_data, int rate)
resampler
.
inp_data
=
nullptr
;
resampler
.
inp_data
=
nullptr
;
resampler
.
process
();
resampler
.
process
();
resampler
.
inp_count
=
in
.
size
()
/
n_channels
;
resampler
.
inp_count
=
in
.
size
()
/
resampler
.
nchan
()
;
resampler
.
inp_data
=
(
float
*
)
&
in
[
0
];
resampler
.
inp_data
=
(
float
*
)
&
in
[
0
];
resampler
.
process
();
resampler
.
process
();
...
@@ -533,8 +522,36 @@ resample (const WavData& wav_data, int rate)
...
@@ -533,8 +522,36 @@ resample (const WavData& wav_data, int rate)
resampler
.
inp_count
=
resampler
.
inpsize
()
/
2
;
resampler
.
inp_count
=
resampler
.
inpsize
()
/
2
;
resampler
.
inp_data
=
nullptr
;
resampler
.
inp_data
=
nullptr
;
resampler
.
process
();
resampler
.
process
();
}
WavData
resample
(
const
WavData
&
wav_data
,
int
rate
)
{
if
(
rate
==
wav_data
.
sample_rate
())
return
wav_data
;
const
int
n_channels
=
wav_data
.
n_channels
();
const
int
hlen
=
16
;
const
double
ratio
=
double
(
rate
)
/
wav_data
.
sample_rate
();
const
vector
<
float
>&
in
=
wav_data
.
samples
();
vector
<
float
>
out
(
lrint
(
in
.
size
()
/
n_channels
*
ratio
)
*
n_channels
);
Resampler
resampler
;
if
(
resampler
.
setup
(
wav_data
.
sample_rate
(),
rate
,
n_channels
,
hlen
)
==
0
)
{
process_resampler
(
resampler
,
in
,
out
);
return
WavData
(
out
,
wav_data
.
n_channels
(),
rate
,
wav_data
.
bit_depth
());
return
WavData
(
out
,
wav_data
.
n_channels
(),
rate
,
wav_data
.
bit_depth
());
}
VResampler
vresampler
;
if
(
vresampler
.
setup
(
ratio
,
n_channels
,
hlen
)
==
0
)
{
process_resampler
(
vresampler
,
in
,
out
);
return
WavData
(
out
,
wav_data
.
n_channels
(),
rate
,
wav_data
.
bit_depth
());
}
fprintf
(
stderr
,
"audiowmark: resampling from rate %d to rate %d not supported.
\n
"
,
wav_data
.
sample_rate
(),
rate
);
exit
(
1
);
}
}
int
int
...
...
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