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
5c040ae0
Commit
5c040ae0
authored
Jan 27, 2024
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SyncFinder: merge init_up_down and get_sync_bits
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
24ed0456
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
14 deletions
+4
-14
syncfinder.cc
src/syncfinder.cc
+2
-8
syncfinder.hh
src/syncfinder.hh
+1
-3
wmspeed.cc
src/wmspeed.cc
+1
-3
No files found.
src/syncfinder.cc
View file @
5c040ae0
...
...
@@ -28,7 +28,7 @@ using std::string;
using
std
::
min
;
vector
<
vector
<
SyncFinder
::
FrameBit
>>
SyncFinder
::
init_up_down
(
const
Key
&
key
,
const
WavData
&
wav_data
,
Mode
mode
)
SyncFinder
::
get_sync_bits
(
const
Key
&
key
,
const
WavData
&
wav_data
,
Mode
mode
)
{
vector
<
vector
<
SyncFinder
::
FrameBit
>>
sync_bits
;
...
...
@@ -395,7 +395,7 @@ SyncFinder::search (const vector<Key>& key_list, const WavData& wav_data, Mode m
KeyResult
key_result
;
key_result
.
key
=
key
;
key_results
.
push_back
(
key_result
);
sync_bits
.
push_back
(
init_up_down
(
key
,
wav_data
,
mode
));
sync_bits
.
push_back
(
get_sync_bits
(
key
,
wav_data
,
mode
));
}
search_approx
(
key_results
,
sync_bits
,
wav_data
,
mode
);
...
...
@@ -412,12 +412,6 @@ SyncFinder::search (const vector<Key>& key_list, const WavData& wav_data, Mode m
return
key_results
;
}
vector
<
vector
<
SyncFinder
::
FrameBit
>>
SyncFinder
::
get_sync_bits
(
const
Key
&
key
,
const
WavData
&
wav_data
,
Mode
mode
)
{
return
init_up_down
(
key
,
wav_data
,
mode
);
}
void
SyncFinder
::
sync_fft
(
const
WavData
&
wav_data
,
size_t
index
,
size_t
frame_count
,
vector
<
float
>&
fft_out_db
,
vector
<
char
>&
have_frames
,
const
vector
<
char
>&
want_frames
)
{
...
...
src/syncfinder.hh
View file @
5c040ae0
...
...
@@ -85,8 +85,6 @@ public:
std
::
vector
<
Score
>
sync_scores
;
};
private
:
std
::
vector
<
std
::
vector
<
FrameBit
>>
init_up_down
(
const
Key
&
key
,
const
WavData
&
wav_data
,
Mode
mode
);
double
sync_decode
(
const
std
::
vector
<
std
::
vector
<
FrameBit
>>&
sync_bits
,
const
WavData
&
wav_data
,
const
size_t
start_frame
,
const
std
::
vector
<
float
>&
fft_out_db
,
...
...
@@ -104,7 +102,7 @@ private:
size_t
wav_data_last
=
0
;
public
:
std
::
vector
<
KeyResult
>
search
(
const
std
::
vector
<
Key
>&
key_list
,
const
WavData
&
wav_data
,
Mode
mode
);
std
::
vector
<
std
::
vector
<
FrameBit
>>
get_sync_bits
(
const
Key
&
key
,
const
WavData
&
wav_data
,
Mode
mode
);
st
atic
st
d
::
vector
<
std
::
vector
<
FrameBit
>>
get_sync_bits
(
const
Key
&
key
,
const
WavData
&
wav_data
,
Mode
mode
);
static
double
bit_quality
(
float
umag
,
float
dmag
,
int
bit
);
static
double
normalize_sync_quality
(
double
raw_quality
);
...
...
src/wmspeed.cc
View file @
5c040ae0
...
...
@@ -158,9 +158,7 @@ public:
frames_per_block
(
mark_sync_frame_count
()
+
mark_data_frame_count
())
{
// constructor is run in the main thread; everything that is not thread-safe must happen here
SyncFinder
sync_finder
;
auto
sync_finder_bits
=
sync_finder
.
get_sync_bits
(
key
,
in_data
,
SyncFinder
::
Mode
::
BLOCK
);
auto
sync_finder_bits
=
SyncFinder
::
get_sync_bits
(
key
,
in_data
,
SyncFinder
::
Mode
::
BLOCK
);
for
(
size_t
bit
=
0
;
bit
<
sync_finder_bits
.
size
();
bit
++
)
{
for
(
const
auto
&
frame_bit
:
sync_finder_bits
[
bit
])
...
...
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