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
76376c3f
Commit
76376c3f
authored
Feb 03, 2019
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a comment about zita-resampler Resampler vs. VResampler.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
96c934cd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
audiowmark.cc
src/audiowmark.cc
+14
-4
No files found.
src/audiowmark.cc
View file @
76376c3f
...
@@ -532,22 +532,32 @@ resample (const WavData& wav_data, int rate)
...
@@ -532,22 +532,32 @@ resample (const WavData& wav_data, int rate)
*/
*/
assert
(
rate
!=
wav_data
.
sample_rate
());
assert
(
rate
!=
wav_data
.
sample_rate
());
const
int
n_channels
=
wav_data
.
n_channels
();
const
int
hlen
=
16
;
const
int
hlen
=
16
;
const
double
ratio
=
double
(
rate
)
/
wav_data
.
sample_rate
();
const
double
ratio
=
double
(
rate
)
/
wav_data
.
sample_rate
();
const
vector
<
float
>&
in
=
wav_data
.
samples
();
const
vector
<
float
>&
in
=
wav_data
.
samples
();
vector
<
float
>
out
(
lrint
(
in
.
size
()
/
n_channels
*
ratio
)
*
n_channels
);
vector
<
float
>
out
(
lrint
(
in
.
size
()
/
wav_data
.
n_channels
()
*
ratio
)
*
wav_data
.
n_channels
()
);
/* zita-resampler provides two resampling algorithms
*
* a fast optimized version: Resampler
* this is an optimized version, which works for many common cases,
* like resampling between 22050, 32000, 44100, 48000, 96000 Hz
*
* a slower version: VResampler
* this works for arbitary rates (like 33333 -> 44100 resampling)
*
* so we try using Resampler, and if that fails fall back to VResampler
*/
Resampler
resampler
;
Resampler
resampler
;
if
(
resampler
.
setup
(
wav_data
.
sample_rate
(),
rate
,
n_channels
,
hlen
)
==
0
)
if
(
resampler
.
setup
(
wav_data
.
sample_rate
(),
rate
,
wav_data
.
n_channels
()
,
hlen
)
==
0
)
{
{
process_resampler
(
resampler
,
in
,
out
);
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
;
VResampler
vresampler
;
if
(
vresampler
.
setup
(
ratio
,
n_channels
,
hlen
)
==
0
)
if
(
vresampler
.
setup
(
ratio
,
wav_data
.
n_channels
()
,
hlen
)
==
0
)
{
{
process_resampler
(
vresampler
,
in
,
out
);
process_resampler
(
vresampler
,
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
());
...
...
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