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
c8c069c1
Commit
c8c069c1
authored
Mar 06, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use frames (rather than seconds) to compute required padding.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
ba3f9fa8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
wmget.cc
src/wmget.cc
+11
-9
No files found.
src/wmget.cc
View file @
c8c069c1
...
@@ -675,17 +675,19 @@ decode_and_report (const WavData& wav_data, const string& orig_pattern)
...
@@ -675,17 +675,19 @@ decode_and_report (const WavData& wav_data, const string& orig_pattern)
report_pattern
(
score_all
,
bit_vec
,
decode_error
);
report_pattern
(
score_all
,
bit_vec
,
decode_error
);
}
}
// L-blocks
// L-blocks
double
wav_seconds
=
double
(
wav_data
.
n_values
())
/
(
wav_data
.
sample_rate
()
*
wav_data
.
n_channels
());
const
int
wav_frames
=
wav_data
.
n_values
()
/
(
Params
::
frame_size
*
wav_data
.
n_channels
());
if
(
wav_seconds
<
120
)
/* clip decoder is only used for small wavs */
const
int
frames_per_block
=
mark_sync_frame_count
()
+
mark_data_frame_count
();
{
if
(
wav_frames
<
frames_per_block
*
2.5
)
/* clip decoder is only used for small wavs */
// clip decoder padding
{
double
padding
=
50
;
// clip decoder padding:
if
(
100
-
wav_seconds
>
50
)
// - for longer clips: at least one data block
padding
=
100
-
wav_seconds
;
// - for smaller clips: available frames + padding is the length of one L-block
printf
(
"wav_seconds = %f, padding = %f
\n
"
,
wav_seconds
,
padding
);
// - 5 extra frames as safety
const
int
pad_frames
=
max
(
frames_per_block
,
frames_per_block
*
2
-
wav_frames
)
+
5
;
auto
ext_samples
=
wav_data
.
samples
();
auto
ext_samples
=
wav_data
.
samples
();
ext_samples
.
insert
(
ext_samples
.
begin
(),
wav_data
.
sample_rate
()
*
wav_data
.
n_channels
()
*
int
(
padding
),
0
);
ext_samples
.
insert
(
ext_samples
.
begin
(),
pad_frames
*
Params
::
frame_size
*
wav_data
.
n_channels
(
),
0
);
ext_samples
.
insert
(
ext_samples
.
end
(),
wav_data
.
sample_rate
()
*
wav_data
.
n_channels
()
*
int
(
padding
),
0
);
ext_samples
.
insert
(
ext_samples
.
end
(),
pad_frames
*
Params
::
frame_size
*
wav_data
.
n_channels
(
),
0
);
WavData
l_wav_data
(
ext_samples
,
wav_data
.
n_channels
(),
wav_data
.
sample_rate
(),
wav_data
.
bit_depth
());
WavData
l_wav_data
(
ext_samples
,
wav_data
.
n_channels
(),
wav_data
.
sample_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