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
f78840d0
Commit
f78840d0
authored
May 22, 2022
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup SpeedSync API.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
72a1895c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
wmspeed.cc
src/wmspeed.cc
+4
-7
No files found.
src/wmspeed.cc
View file @
f78840d0
...
@@ -147,13 +147,13 @@ public:
...
@@ -147,13 +147,13 @@ public:
}
}
void
void
start_search_jobs
(
ThreadPool
&
thread_pool
,
const
SpeedScanParams
&
scan_params
,
double
speed
_delta
)
start_search_jobs
(
ThreadPool
&
thread_pool
,
const
SpeedScanParams
&
scan_params
,
double
speed
)
{
{
result_scores
.
clear
();
result_scores
.
clear
();
for
(
int
p
=
-
scan_params
.
n_steps
;
p
<=
scan_params
.
n_steps
;
p
++
)
for
(
int
p
=
-
scan_params
.
n_steps
;
p
<=
scan_params
.
n_steps
;
p
++
)
{
{
const
double
relative_speed
=
pow
(
scan_params
.
step
,
p
)
*
speed
_delta
;
const
double
relative_speed
=
pow
(
scan_params
.
step
,
p
)
*
speed
/
center
;
thread_pool
.
add_job
([
relative_speed
,
this
]()
{
compare
(
relative_speed
);
});
thread_pool
.
add_job
([
relative_speed
,
this
]()
{
compare
(
relative_speed
);
});
}
}
...
@@ -411,7 +411,7 @@ run_search (ThreadPool& thread_pool, vector<std::unique_ptr<SpeedSync>>& speed_s
...
@@ -411,7 +411,7 @@ run_search (ThreadPool& thread_pool, vector<std::unique_ptr<SpeedSync>>& speed_s
auto
t1
=
get_time
();
auto
t1
=
get_time
();
for
(
auto
&
s
:
speed_sync
)
for
(
auto
&
s
:
speed_sync
)
s
->
start_search_jobs
(
thread_pool
,
scan_params
,
1
);
s
->
start_search_jobs
(
thread_pool
,
scan_params
,
s
->
center_speed
()
);
thread_pool
.
wait_all
();
thread_pool
.
wait_all
();
auto
t2
=
get_time
();
auto
t2
=
get_time
();
...
@@ -515,12 +515,9 @@ speed_scan (double clip_location, const WavData& in_data, const SpeedScanParams&
...
@@ -515,12 +515,9 @@ speed_scan (double clip_location, const WavData& in_data, const SpeedScanParams&
/* refine best match */
/* refine best match */
SpeedSync
*
center_speed_sync
=
find_closest_speed_sync
(
speed_sync
,
scores
[
0
].
speed
);
SpeedSync
*
center_speed_sync
=
find_closest_speed_sync
(
speed_sync
,
scores
[
0
].
speed
);
// EXECUTE SEARCH BEST
auto
t4
=
get_time
();
auto
t4
=
get_time
();
double
speed_delta
=
scores
[
0
].
speed
/
center_speed_sync
->
center_speed
();
center_speed_sync
->
start_search_jobs
(
thread_pool
,
scan_params3
,
scores
[
0
].
speed
);
printf
(
"speed_delta = %f
\n
"
,
speed_delta
);
center_speed_sync
->
start_search_jobs
(
thread_pool
,
scan_params3
,
speed_delta
);
thread_pool
.
wait_all
();
thread_pool
.
wait_all
();
auto
t5
=
get_time
();
auto
t5
=
get_time
();
...
...
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