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
3a08c062
Commit
3a08c062
authored
Jan 15, 2019
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement padding so that the whole wave is marked.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
8da680ab
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
3 deletions
+28
-3
audiowmark.cc
src/audiowmark.cc
+28
-3
No files found.
src/audiowmark.cc
View file @
3a08c062
...
...
@@ -39,7 +39,7 @@ namespace Params
static
int
sync_search_step
=
256
;
static
int
sync_search_fine
=
8
;
static
int
frames_pad_start
=
100
;
// padding at start, in case track starts with silence
static
size_t
frames_pad_start
=
100
;
// padding at start, in case track starts with silence
}
void
...
...
@@ -486,6 +486,19 @@ mark_sync (const WavData& wav_data, int start_frame, const vector<vector<complex
}
}
void
mark_pad
(
const
WavData
&
wav_data
,
size_t
frame
,
const
vector
<
vector
<
complex
<
float
>>>&
fft_out
,
vector
<
vector
<
complex
<
float
>>>&
fft_delta_spect
)
{
assert
(
fft_out
.
size
()
>=
(
frame
+
1
)
*
wav_data
.
n_channels
());
for
(
int
ch
=
0
;
ch
<
wav_data
.
n_channels
();
ch
++
)
{
size_t
index
=
frame
*
wav_data
.
n_channels
()
+
ch
;
mark_bit_linear
(
frame
,
fft_out
[
index
],
fft_delta_spect
[
index
],
0
);
}
}
int
add_watermark
(
const
string
&
infile
,
const
string
&
outfile
,
const
string
&
bits
)
{
...
...
@@ -546,7 +559,14 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
fft_delta_spect
.
push_back
(
vector
<
complex
<
float
>>
(
fft_out
.
back
().
size
()));
}
}
size_t
frame_index
=
Params
::
frames_pad_start
;
// FIXME: should really pad here
size_t
frame_index
=
0
;
/* padding at start */
while
(
frame_index
<
Params
::
frames_pad_start
)
{
mark_pad
(
wav_data
,
frame_index
,
fft_out
,
fft_delta_spect
);
frame_index
++
;
}
/* embed sync|data|sync|data|... */
while
(
frame_index
+
(
mark_sync_frame_count
()
+
mark_data_frame_count
())
<
size_t
(
frame_count
(
wav_data
)))
{
mark_sync
(
wav_data
,
frame_index
,
fft_out
,
fft_delta_spect
);
...
...
@@ -555,6 +575,12 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
mark_data
(
wav_data
,
frame_index
,
fft_out
,
fft_delta_spect
,
bitvec
);
frame_index
+=
mark_data_frame_count
();
}
/* padding at end */
while
(
frame_index
<
size_t
(
frame_count
(
wav_data
)))
{
mark_pad
(
wav_data
,
frame_index
,
fft_out
,
fft_delta_spect
);
frame_index
++
;
}
/* generate synthesis window */
// we want overlapping synthesis windows, so the window affects the last, the current and the next frame
...
...
@@ -584,7 +610,6 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
// cosine
synth_window
[
i
]
=
(
cos
(
tri
*
M_PI
+
M_PI
)
+
1
)
*
0.5
;
}
for
(
size_t
pos
=
0
;
pos
<
in_signal
.
size
();
pos
++
)
out_signal
[
pos
]
=
in_signal
[
pos
]
*
Params
::
pre_scale
;
...
...
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