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
d636209b
Commit
d636209b
authored
Jan 17, 2024
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include speed in json output matches.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
3c68c329
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
33 deletions
+32
-33
wmget.cc
src/wmget.cc
+32
-33
No files found.
src/wmget.cc
View file @
d636209b
...
@@ -146,21 +146,15 @@ public:
...
@@ -146,21 +146,15 @@ public:
float
decode_error
=
0
;
float
decode_error
=
0
;
SyncFinder
::
Score
sync_score
;
SyncFinder
::
Score
sync_score
;
Type
type
;
Type
type
;
bool
speed_pattern
;
double
speed
=
0
;
};
};
private
:
private
:
std
::
mutex
pattern_mutex
;
std
::
mutex
pattern_mutex
;
vector
<
Pattern
>
patterns
;
vector
<
Pattern
>
patterns
;
bool
speed_pattern
=
false
;
public
:
public
:
void
void
set_speed_pattern
(
bool
sp
)
add_pattern
(
const
Key
&
key
,
double
time
,
SyncFinder
::
Score
sync_score
,
const
vector
<
int
>&
bit_vec
,
float
decode_error
,
Type
pattern_type
,
double
speed
)
{
speed_pattern
=
sp
;
}
void
add_pattern
(
const
Key
&
key
,
double
time
,
SyncFinder
::
Score
sync_score
,
const
vector
<
int
>&
bit_vec
,
float
decode_error
,
Type
pattern_type
)
{
{
/* add_pattern can be called by any thread (safe to use from ThreadPool jobs) */
/* add_pattern can be called by any thread (safe to use from ThreadPool jobs) */
std
::
lock_guard
<
std
::
mutex
>
lg
(
pattern_mutex
);
std
::
lock_guard
<
std
::
mutex
>
lg
(
pattern_mutex
);
...
@@ -172,7 +166,7 @@ public:
...
@@ -172,7 +166,7 @@ public:
p
.
bit_vec
=
bit_vec
;
p
.
bit_vec
=
bit_vec
;
p
.
decode_error
=
decode_error
;
p
.
decode_error
=
decode_error
;
p
.
type
=
pattern_type
;
p
.
type
=
pattern_type
;
p
.
speed
_pattern
=
speed_pattern
;
p
.
speed
=
speed
;
patterns
.
push_back
(
p
);
patterns
.
push_back
(
p
);
}
}
...
@@ -201,7 +195,7 @@ public:
...
@@ -201,7 +195,7 @@ public:
});
});
}
}
void
void
print_json
(
const
WavData
&
wav_data
,
const
std
::
string
&
json_file
,
const
double
speed
)
print_json
(
const
WavData
&
wav_data
,
const
std
::
string
&
json_file
)
{
{
FILE
*
outfile
=
fopen
(
json_file
==
"-"
?
"/dev/stdout"
:
json_file
.
c_str
(),
"w"
);
FILE
*
outfile
=
fopen
(
json_file
==
"-"
?
"/dev/stdout"
:
json_file
.
c_str
(),
"w"
);
if
(
!
outfile
)
if
(
!
outfile
)
...
@@ -211,7 +205,6 @@ public:
...
@@ -211,7 +205,6 @@ public:
}
}
const
size_t
time_length
=
(
wav_data
.
samples
().
size
()
/
wav_data
.
n_channels
()
+
wav_data
.
sample_rate
()
/
2
)
/
wav_data
.
sample_rate
();
const
size_t
time_length
=
(
wav_data
.
samples
().
size
()
/
wav_data
.
n_channels
()
+
wav_data
.
sample_rate
()
/
2
)
/
wav_data
.
sample_rate
();
fprintf
(
outfile
,
"{
\"
length
\"
:
\"
%ld:%02ld
\"
,
\n
"
,
time_length
/
60
,
time_length
%
60
);
fprintf
(
outfile
,
"{
\"
length
\"
:
\"
%ld:%02ld
\"
,
\n
"
,
time_length
/
60
,
time_length
%
60
);
fprintf
(
outfile
,
"
\"
speed
\"
: %.6f,
\n
"
,
speed
);
fprintf
(
outfile
,
"
\"
matches
\"
: [
\n
"
);
fprintf
(
outfile
,
"
\"
matches
\"
: [
\n
"
);
int
nth
=
0
;
int
nth
=
0
;
for
(
const
auto
&
pattern
:
patterns
)
for
(
const
auto
&
pattern
:
patterns
)
...
@@ -230,17 +223,18 @@ public:
...
@@ -230,17 +223,18 @@ public:
btype
=
"ALL"
;
btype
=
"ALL"
;
if
(
pattern
.
type
==
Type
::
CLIP
)
if
(
pattern
.
type
==
Type
::
CLIP
)
btype
=
"CLIP-"
+
btype
;
btype
=
"CLIP-"
+
btype
;
if
(
pattern
.
speed
_pattern
)
if
(
pattern
.
speed
!=
1
)
btype
+=
"-SPEED"
;
btype
+=
"-SPEED"
;
const
int
seconds
=
pattern
.
time
;
const
int
seconds
=
pattern
.
time
;
fprintf
(
outfile
,
" {
\"
key
:
\"
:
\"
%s
\"
,
\"
pos
\"
:
\"
%d:%02d
\"
,
\"
bits
\"
:
\"
%s
\"
,
\"
quality
\"
: %.5f,
\"
error
\"
: %.6f,
\"
type
\"
:
\"
%s
\"
}"
,
fprintf
(
outfile
,
" {
\"
key
\"
:
\"
%s
\"
,
\"
pos
\"
:
\"
%d:%02d
\"
,
\"
bits
\"
:
\"
%s
\"
,
\"
quality
\"
: %.5f,
\"
error
\"
: %.6f,
\"
type
\"
:
\"
%s
\"
,
\"
speed
\"
: %.6f
}"
,
pattern
.
key
.
name
().
c_str
(),
pattern
.
key
.
name
().
c_str
(),
seconds
/
60
,
seconds
%
60
,
seconds
/
60
,
seconds
%
60
,
bit_vec_to_str
(
pattern
.
bit_vec
).
c_str
(),
bit_vec_to_str
(
pattern
.
bit_vec
).
c_str
(),
pattern
.
sync_score
.
quality
,
pattern
.
decode_error
,
pattern
.
sync_score
.
quality
,
pattern
.
decode_error
,
btype
.
c_str
());
btype
.
c_str
(),
pattern
.
speed
);
}
}
fprintf
(
outfile
,
" ]
\n
}
\n
"
);
fprintf
(
outfile
,
" ]
\n
}
\n
"
);
fclose
(
outfile
);
fclose
(
outfile
);
...
@@ -253,7 +247,7 @@ public:
...
@@ -253,7 +247,7 @@ public:
if
(
pattern
.
type
==
Type
::
ALL
)
/* this is the combined pattern "all" */
if
(
pattern
.
type
==
Type
::
ALL
)
/* this is the combined pattern "all" */
{
{
const
char
*
extra
=
""
;
const
char
*
extra
=
""
;
if
(
pattern
.
speed
_pattern
)
if
(
pattern
.
speed
!=
1
)
extra
=
" SPEED"
;
extra
=
" SPEED"
;
printf
(
"pattern all %s %.3f %.3f%s
\n
"
,
bit_vec_to_str
(
pattern
.
bit_vec
).
c_str
(),
printf
(
"pattern all %s %.3f %.3f%s
\n
"
,
bit_vec_to_str
(
pattern
.
bit_vec
).
c_str
(),
...
@@ -275,7 +269,7 @@ public:
...
@@ -275,7 +269,7 @@ public:
}
}
if
(
pattern
.
type
==
Type
::
CLIP
)
if
(
pattern
.
type
==
Type
::
CLIP
)
block_str
=
"CLIP-"
+
block_str
;
block_str
=
"CLIP-"
+
block_str
;
if
(
pattern
.
speed
_pattern
)
if
(
pattern
.
speed
!=
1
)
block_str
+=
"-SPEED"
;
block_str
+=
"-SPEED"
;
const
int
seconds
=
pattern
.
time
;
const
int
seconds
=
pattern
.
time
;
...
@@ -327,8 +321,13 @@ public:
...
@@ -327,8 +321,13 @@ public:
class
BlockDecoder
class
BlockDecoder
{
{
int
debug_sync_frame_count
=
0
;
int
debug_sync_frame_count
=
0
;
const
double
speed
=
0
;
vector
<
SyncFinder
::
KeyResult
>
key_results
;
// stored here for sync debugging
vector
<
SyncFinder
::
KeyResult
>
key_results
;
// stored here for sync debugging
public
:
public
:
BlockDecoder
(
double
speed
)
:
speed
(
speed
)
{
}
void
void
run
(
const
vector
<
Key
>&
key_list
,
const
WavData
&
wav_data
,
ResultSet
&
result_set
)
run
(
const
vector
<
Key
>&
key_list
,
const
WavData
&
wav_data
,
ResultSet
&
result_set
)
{
{
...
@@ -375,13 +374,13 @@ public:
...
@@ -375,13 +374,13 @@ public:
/* ---- deal with this pattern ---- */
/* ---- deal with this pattern ---- */
const
double
time
=
double
(
sync_score
.
index
)
/
wav_data
.
sample_rate
();
const
double
time
=
double
(
sync_score
.
index
)
/
wav_data
.
sample_rate
();
thread_pool
.
add_job
([
key
,
sync_score
,
raw_bit_vec
,
time
,
&
result_set
]()
thread_pool
.
add_job
([
this
,
key
,
sync_score
,
raw_bit_vec
,
time
,
&
result_set
]()
{
{
float
decode_error
=
0
;
float
decode_error
=
0
;
vector
<
int
>
bit_vec
=
code_decode_soft
(
sync_score
.
block_type
,
normalize_soft_bits
(
raw_bit_vec
),
&
decode_error
);
vector
<
int
>
bit_vec
=
code_decode_soft
(
sync_score
.
block_type
,
normalize_soft_bits
(
raw_bit_vec
),
&
decode_error
);
if
(
!
bit_vec
.
empty
())
if
(
!
bit_vec
.
empty
())
result_set
.
add_pattern
(
key
,
time
,
sync_score
,
bit_vec
,
decode_error
,
ResultSet
::
Type
::
BLOCK
);
result_set
.
add_pattern
(
key
,
time
,
sync_score
,
bit_vec
,
decode_error
,
ResultSet
::
Type
::
BLOCK
,
speed
);
});
});
total_count
+=
1
;
total_count
+=
1
;
...
@@ -406,7 +405,7 @@ public:
...
@@ -406,7 +405,7 @@ public:
ab_bits
[
i
*
2
]
=
ab_raw_bit_vec
[
0
][
i
];
ab_bits
[
i
*
2
]
=
ab_raw_bit_vec
[
0
][
i
];
ab_bits
[
i
*
2
+
1
]
=
ab_raw_bit_vec
[
1
][
i
];
ab_bits
[
i
*
2
+
1
]
=
ab_raw_bit_vec
[
1
][
i
];
}
}
thread_pool
.
add_job
([
key
,
sync_score
,
ab_bits
,
ab_quality
,
time
,
&
result_set
]()
thread_pool
.
add_job
([
this
,
key
,
sync_score
,
ab_bits
,
ab_quality
,
time
,
&
result_set
]()
{
{
float
decode_error
=
0
;
float
decode_error
=
0
;
vector
<
int
>
bit_vec
=
code_decode_soft
(
ConvBlockType
::
ab
,
normalize_soft_bits
(
ab_bits
),
&
decode_error
);
vector
<
int
>
bit_vec
=
code_decode_soft
(
ConvBlockType
::
ab
,
normalize_soft_bits
(
ab_bits
),
&
decode_error
);
...
@@ -416,7 +415,7 @@ public:
...
@@ -416,7 +415,7 @@ public:
SyncFinder
::
Score
score_ab
{
0
,
0
,
ConvBlockType
::
ab
};
SyncFinder
::
Score
score_ab
{
0
,
0
,
ConvBlockType
::
ab
};
score_ab
.
index
=
sync_score
.
index
;
score_ab
.
index
=
sync_score
.
index
;
score_ab
.
quality
=
(
ab_quality
[
0
]
+
ab_quality
[
1
])
/
2
;
score_ab
.
quality
=
(
ab_quality
[
0
]
+
ab_quality
[
1
])
/
2
;
result_set
.
add_pattern
(
key
,
time
,
score_ab
,
bit_vec
,
decode_error
,
ResultSet
::
Type
::
BLOCK
);
result_set
.
add_pattern
(
key
,
time
,
score_ab
,
bit_vec
,
decode_error
,
ResultSet
::
Type
::
BLOCK
,
speed
);
}
}
});
});
}
}
...
@@ -434,13 +433,13 @@ public:
...
@@ -434,13 +433,13 @@ public:
vector
<
float
>
soft_bit_vec
=
normalize_soft_bits
(
raw_bit_vec_all
);
vector
<
float
>
soft_bit_vec
=
normalize_soft_bits
(
raw_bit_vec_all
);
thread_pool
.
add_job
([
key
,
score_all
,
soft_bit_vec
,
&
result_set
]()
thread_pool
.
add_job
([
this
,
key
,
score_all
,
soft_bit_vec
,
&
result_set
]()
{
{
float
decode_error
=
0
;
float
decode_error
=
0
;
vector
<
int
>
bit_vec
=
code_decode_soft
(
ConvBlockType
::
ab
,
soft_bit_vec
,
&
decode_error
);
vector
<
int
>
bit_vec
=
code_decode_soft
(
ConvBlockType
::
ab
,
soft_bit_vec
,
&
decode_error
);
if
(
!
bit_vec
.
empty
())
if
(
!
bit_vec
.
empty
())
result_set
.
add_pattern
(
key
,
/* time */
0.0
,
score_all
,
bit_vec
,
decode_error
,
ResultSet
::
Type
::
ALL
);
result_set
.
add_pattern
(
key
,
/* time */
0.0
,
score_all
,
bit_vec
,
decode_error
,
ResultSet
::
Type
::
ALL
,
speed
);
});
});
}
}
}
}
...
@@ -508,6 +507,7 @@ public:
...
@@ -508,6 +507,7 @@ public:
class
ClipDecoder
class
ClipDecoder
{
{
const
int
frames_per_block
=
0
;
const
int
frames_per_block
=
0
;
const
double
speed
=
0
;
vector
<
float
>
vector
<
float
>
mix_or_linear_decode
(
const
Key
&
key
,
vector
<
vector
<
complex
<
float
>>>&
fft_out
,
int
n_channels
)
mix_or_linear_decode
(
const
Key
&
key
,
vector
<
vector
<
complex
<
float
>>>&
fft_out
,
int
n_channels
)
...
@@ -557,13 +557,13 @@ class ClipDecoder
...
@@ -557,13 +557,13 @@ class ClipDecoder
SyncFinder
::
Score
sync_score_nopad
=
sync_score
;
SyncFinder
::
Score
sync_score_nopad
=
sync_score
;
sync_score_nopad
.
index
=
time_offset_sec
*
wav_data
.
sample_rate
();
sync_score_nopad
.
index
=
time_offset_sec
*
wav_data
.
sample_rate
();
thread_pool
.
add_job
([
key
,
raw_bit_vec
,
sync_score_nopad
,
time_offset_sec
,
&
result_set
]()
thread_pool
.
add_job
([
this
,
key
,
raw_bit_vec
,
sync_score_nopad
,
time_offset_sec
,
&
result_set
]()
{
{
float
decode_error
=
0
;
float
decode_error
=
0
;
vector
<
int
>
bit_vec
=
code_decode_soft
(
ConvBlockType
::
ab
,
normalize_soft_bits
(
raw_bit_vec
),
&
decode_error
);
vector
<
int
>
bit_vec
=
code_decode_soft
(
ConvBlockType
::
ab
,
normalize_soft_bits
(
raw_bit_vec
),
&
decode_error
);
if
(
!
bit_vec
.
empty
())
if
(
!
bit_vec
.
empty
())
result_set
.
add_pattern
(
key
,
time_offset_sec
,
sync_score_nopad
,
bit_vec
,
decode_error
,
ResultSet
::
Type
::
CLIP
);
result_set
.
add_pattern
(
key
,
time_offset_sec
,
sync_score_nopad
,
bit_vec
,
decode_error
,
ResultSet
::
Type
::
CLIP
,
speed
);
});
});
}
}
}
}
...
@@ -617,8 +617,9 @@ class ClipDecoder
...
@@ -617,8 +617,9 @@ class ClipDecoder
run_padded
(
key_list
,
l_wav_data
,
result_set
,
time_offset
);
run_padded
(
key_list
,
l_wav_data
,
result_set
,
time_offset
);
}
}
public
:
public
:
ClipDecoder
()
:
ClipDecoder
(
double
speed
)
:
frames_per_block
(
mark_sync_frame_count
()
+
mark_data_frame_count
())
frames_per_block
(
mark_sync_frame_count
()
+
mark_data_frame_count
()),
speed
(
speed
)
{
{
}
}
void
void
...
@@ -669,26 +670,24 @@ decode_and_report (const vector<Key>& key_list, const WavData& wav_data, const v
...
@@ -669,26 +670,24 @@ decode_and_report (const vector<Key>& key_list, const WavData& wav_data, const v
printf
(
"speed %.6f
\n
"
,
speed_result
.
speed
);
printf
(
"speed %.6f
\n
"
,
speed_result
.
speed
);
WavData
wav_data_speed
=
resample
(
wav_data
,
Params
::
mark_sample_rate
*
speed_result
.
speed
);
WavData
wav_data_speed
=
resample
(
wav_data
,
Params
::
mark_sample_rate
*
speed_result
.
speed
);
result_set
.
set_speed_pattern
(
true
);
BlockDecoder
block_decoder
(
speed_result
.
speed
);
BlockDecoder
block_decoder
;
block_decoder
.
run
({
speed_result
.
key
},
wav_data_speed
,
result_set
);
block_decoder
.
run
({
speed_result
.
key
},
wav_data_speed
,
result_set
);
ClipDecoder
clip_decoder
;
ClipDecoder
clip_decoder
(
speed_result
.
speed
)
;
clip_decoder
.
run
({
speed_result
.
key
},
wav_data_speed
,
result_set
);
clip_decoder
.
run
({
speed_result
.
key
},
wav_data_speed
,
result_set
);
result_set
.
set_speed_pattern
(
false
);
}
}
}
}
BlockDecoder
block_decoder
;
BlockDecoder
block_decoder
(
1
)
;
block_decoder
.
run
(
key_list
,
wav_data
,
result_set
);
block_decoder
.
run
(
key_list
,
wav_data
,
result_set
);
ClipDecoder
clip_decoder
;
ClipDecoder
clip_decoder
(
1
)
;
clip_decoder
.
run
(
key_list
,
wav_data
,
result_set
);
clip_decoder
.
run
(
key_list
,
wav_data
,
result_set
);
result_set
.
sort_by_time
();
result_set
.
sort_by_time
();
if
(
!
Params
::
json_output
.
empty
())
if
(
!
Params
::
json_output
.
empty
())
result_set
.
print_json
(
wav_data
,
Params
::
json_output
,
42
/*FIXME */
);
result_set
.
print_json
(
wav_data
,
Params
::
json_output
);
if
(
Params
::
json_output
!=
"-"
)
if
(
Params
::
json_output
!=
"-"
)
result_set
.
print
();
result_set
.
print
();
...
...
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