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
09fd6a9b
Commit
09fd6a9b
authored
May 26, 2022
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor speed detection compare loop into optimized extra function.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
ad4681c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
57 additions
and
46 deletions
+57
-46
wmspeed.cc
src/wmspeed.cc
+57
-46
No files found.
src/wmspeed.cc
View file @
09fd6a9b
...
@@ -123,18 +123,27 @@ public:
...
@@ -123,18 +123,27 @@ public:
std
::
vector
<
int
>
up
;
std
::
vector
<
int
>
up
;
std
::
vector
<
int
>
down
;
std
::
vector
<
int
>
down
;
};
};
struct
BitValue
{
float
umag
=
0
;
float
dmag
=
0
;
int
count
=
0
;
};
private
:
private
:
vector
<
SyncBit
>
sync_bits
;
vector
<
SyncBit
>
sync_bits
;
MagMatrix
sync_matrix
;
MagMatrix
sync_matrix
;
void
prepare_mags
(
const
SpeedScanParams
&
scan_params
);
void
prepare_mags
(
const
SpeedScanParams
&
scan_params
);
void
compare
(
double
relative_speed
);
void
compare
(
double
relative_speed
);
template
<
bool
B2
>
void
compare_bits
(
BitValue
*
bit_values
,
double
relative_speed
,
int
offset
);
std
::
mutex
mutex
;
std
::
mutex
mutex
;
vector
<
Score
>
result_scores
;
vector
<
Score
>
result_scores
;
const
WavData
&
in_data
;
const
WavData
&
in_data
;
const
double
center
;
const
double
center
;
const
int
frames_per_block
;
const
int
frames_per_block
;
public
:
public
:
SpeedSync
(
const
WavData
&
in_data
,
double
center
)
:
SpeedSync
(
const
WavData
&
in_data
,
double
center
)
:
in_data
(
in_data
),
in_data
(
in_data
),
...
@@ -273,65 +282,67 @@ SpeedSync::prepare_mags (const SpeedScanParams& scan_params)
...
@@ -273,65 +282,67 @@ SpeedSync::prepare_mags (const SpeedScanParams& scan_params)
assert
(
row
==
n_sync_rows
);
assert
(
row
==
n_sync_rows
);
}
}
template
<
bool
B2
>
void
SpeedSync
::
compare_bits
(
BitValue
*
bit_values
,
double
relative_speed
,
int
offset
)
{
const
int
steps_per_frame
=
Params
::
frame_size
/
Params
::
sync_search_step
;
const
double
relative_speed_inv
=
1
/
relative_speed
;
/* search start */
auto
si
=
sync_bits
.
begin
();
while
(
si
!=
sync_bits
.
end
())
{
int
index
=
offset
+
si
->
frame
*
steps_per_frame
;
if
(
index
>=
0
)
break
;
si
++
;
}
int
mi
=
si
-
sync_bits
.
begin
();
while
(
si
!=
sync_bits
.
end
())
{
int
index
=
offset
+
si
->
frame
*
steps_per_frame
;
const
int
index1
=
lrint
(
index
*
relative_speed_inv
);
if
(
index1
>=
sync_matrix
.
rows
())
return
;
auto
&
bv
=
bit_values
[
si
->
bit
];
auto
mags
=
sync_matrix
(
index1
,
mi
);
if
(
B2
)
{
bv
.
umag
+=
mags
.
dmag
;
bv
.
dmag
+=
mags
.
umag
;
}
else
{
bv
.
umag
+=
mags
.
umag
;
bv
.
dmag
+=
mags
.
dmag
;
}
bv
.
count
++
;
si
++
;
mi
++
;
}
}
void
void
SpeedSync
::
compare
(
double
relative_speed
)
SpeedSync
::
compare
(
double
relative_speed
)
{
{
const
int
steps_per_frame
=
Params
::
frame_size
/
Params
::
sync_search_step
;
const
int
steps_per_frame
=
Params
::
frame_size
/
Params
::
sync_search_step
;
const
int
pad_start
=
frames_per_block
*
steps_per_frame
+
/* add a bit of overlap to handle boundaries */
steps_per_frame
;
const
int
pad_start
=
frames_per_block
*
steps_per_frame
+
/* add a bit of overlap to handle boundaries */
steps_per_frame
;
const
double
relative_speed_inv
=
1
/
relative_speed
;
Score
best_score
;
Score
best_score
;
assert
(
steps_per_frame
*
Params
::
sync_search_step
==
Params
::
frame_size
);
assert
(
steps_per_frame
*
Params
::
sync_search_step
==
Params
::
frame_size
);
for
(
int
offset
=
-
pad_start
;
offset
<
0
;
offset
++
)
for
(
int
offset
=
-
pad_start
;
offset
<
0
;
offset
++
)
{
{
int
mi
=
0
;
struct
BitValue
{
float
umag
=
0
;
float
dmag
=
0
;
int
count
=
0
;
};
BitValue
bit_values
[
Params
::
sync_bits
];
BitValue
bit_values
[
Params
::
sync_bits
];
for
(
const
auto
&
frame_bit
:
sync_bits
)
compare_bits
<
false
>
(
bit_values
,
relative_speed
,
offset
);
{
compare_bits
<
true
>
(
bit_values
,
relative_speed
,
offset
+
frames_per_block
*
steps_per_frame
);
int
index
=
offset
+
frame_bit
.
frame
*
steps_per_frame
;
const
int
index1
=
lrint
(
index
*
relative_speed_inv
);
if
(
index1
>=
0
)
{
if
(
index1
>=
sync_matrix
.
rows
())
break
;
auto
&
bv
=
bit_values
[
frame_bit
.
bit
];
auto
mags
=
sync_matrix
(
index1
,
mi
);
bv
.
umag
+=
mags
.
umag
;
bv
.
dmag
+=
mags
.
dmag
;
bv
.
count
++
;
}
mi
++
;
}
mi
=
0
;
const
int
offset2
=
offset
+
frames_per_block
*
steps_per_frame
;
for
(
const
auto
&
frame_bit
:
sync_bits
)
{
int
index
=
offset2
+
frame_bit
.
frame
*
steps_per_frame
;
const
int
index2
=
lrint
(
index
*
relative_speed_inv
);
if
(
index2
>=
0
)
{
if
(
index2
>=
sync_matrix
.
rows
())
break
;
auto
&
bv
=
bit_values
[
frame_bit
.
bit
];
auto
mags
=
sync_matrix
(
index2
,
mi
);
bv
.
umag
+=
mags
.
dmag
;
bv
.
dmag
+=
mags
.
umag
;
bv
.
count
++
;
}
mi
++
;
}
double
sync_quality
=
0
;
double
sync_quality
=
0
;
int
bit_count
=
0
;
int
bit_count
=
0
;
...
...
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