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
5f5bf383
Commit
5f5bf383
authored
Nov 20, 2019
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement subtraction test. Fix padding generator at start of audio.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
e3fdba89
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
58 additions
and
9 deletions
+58
-9
audiowmark.cc
src/audiowmark.cc
+58
-9
No files found.
src/audiowmark.cc
View file @
5f5bf383
...
@@ -588,18 +588,17 @@ mark_sync_stream (vector<vector<FrameDelta>>& frame_mod, int ab)
...
@@ -588,18 +588,17 @@ mark_sync_stream (vector<vector<FrameDelta>>& frame_mod, int ab)
}
}
void
void
mark_pad
(
const
WavData
&
wav_data
,
size_t
frame
,
const
vector
<
vector
<
complex
<
float
>>>&
fft_out
,
vector
<
vector
<
complex
<
float
>>>&
fft_delta_spect
)
init_pad_mod_vec
(
vector
<
vector
<
FrameDelta
>>&
pad_mod_vec
)
{
{
/* TODO FIXME
UpDownGen
up_down_gen
(
Random
::
Stream
::
pad_up_down
);
assert (fft_out.size() >= (frame + 1) * wav_data.n_channels());
for (
int ch = 0; ch < wav_data.n_channels(); ch
++)
for
(
size_t
f
=
0
;
f
<
Params
::
frames_pad_start
;
f
++
)
{
{
size_t index = frame * wav_data.n_channels() + ch
;
vector
<
FrameDelta
>
mod
(
Params
::
max_band
+
1
)
;
mark_bit_linear (frame, fft_out[index], fft_delta_spect[index], 0, Random::Stream::pad_up_down);
prepare_frame_delta
(
up_down_gen
,
f
,
mod
,
0
);
pad_mod_vec
.
push_back
(
mod
);
}
}
*/
}
}
void
void
...
@@ -754,6 +753,9 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
...
@@ -754,6 +753,9 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
int
ab
=
0
;
int
ab
=
0
;
vector
<
float
>
samples
;
vector
<
float
>
samples
;
vector
<
vector
<
FrameDelta
>>
pad_mod_vec
;
init_pad_mod_vec
(
pad_mod_vec
);
vector
<
vector
<
FrameDelta
>>
frame_mod_vec_a
,
frame_mod_vec_b
;
vector
<
vector
<
FrameDelta
>>
frame_mod_vec_a
,
frame_mod_vec_b
;
init_frame_mod_vec
(
frame_mod_vec_a
,
0
,
bitvec_a
);
init_frame_mod_vec
(
frame_mod_vec_a
,
0
,
bitvec_a
);
...
@@ -774,8 +776,12 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
...
@@ -774,8 +776,12 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
{
{
fft_delta_spect
.
push_back
(
vector
<
complex
<
float
>>
(
fft_out
.
back
().
size
()));
fft_delta_spect
.
push_back
(
vector
<
complex
<
float
>>
(
fft_out
.
back
().
size
()));
}
}
if
(
state
==
State
::
PAD
)
if
(
state
==
State
::
WATERMARK
)
{
for
(
int
ch
=
0
;
ch
<
in_stream
->
n_channels
();
ch
++
)
apply_frame_delta
(
pad_mod_vec
[
frame_number
],
fft_out
[
ch
],
fft_delta_spect
[
ch
]);
}
else
if
(
state
==
State
::
WATERMARK
)
{
{
for
(
int
ch
=
0
;
ch
<
in_stream
->
n_channels
();
ch
++
)
for
(
int
ch
=
0
;
ch
<
in_stream
->
n_channels
();
ch
++
)
apply_frame_delta
(
ab
?
frame_mod_vec_b
[
frame_number
]
:
frame_mod_vec_a
[
frame_number
],
fft_out
[
ch
],
fft_delta_spect
[
ch
]);
apply_frame_delta
(
ab
?
frame_mod_vec_b
[
frame_number
]
:
frame_mod_vec_a
[
frame_number
],
fft_out
[
ch
],
fft_delta_spect
[
ch
]);
...
@@ -1601,6 +1607,45 @@ cut_start (const string& infile, const string& outfile, const string& start_str)
...
@@ -1601,6 +1607,45 @@ cut_start (const string& infile, const string& outfile, const string& start_str)
return
0
;
return
0
;
}
}
int
test_subtract
(
const
string
&
infile1
,
const
string
&
infile2
,
const
string
&
outfile
)
{
WavData
in1_data
;
if
(
!
in1_data
.
load
(
infile1
))
{
error
(
"audiowmark: error loading %s: %s
\n
"
,
infile1
.
c_str
(),
in1_data
.
error_blurb
());
return
1
;
}
WavData
in2_data
;
if
(
!
in2_data
.
load
(
infile2
))
{
error
(
"audiowmark: error loading %s: %s
\n
"
,
infile2
.
c_str
(),
in2_data
.
error_blurb
());
return
1
;
}
if
(
in1_data
.
n_values
()
!=
in2_data
.
n_values
())
{
error
(
"audiowmark: %s values: %zd ; %s values: %zd ; size mismatch"
,
infile1
.
c_str
(),
in1_data
.
n_values
(),
infile2
.
c_str
(),
in2_data
.
n_values
());
return
1
;
}
assert
(
in1_data
.
n_channels
()
==
in2_data
.
n_channels
());
const
auto
&
in1_signal
=
in1_data
.
samples
();
const
auto
&
in2_signal
=
in2_data
.
samples
();
vector
<
float
>
out_signal
;
for
(
size_t
i
=
0
;
i
<
in1_data
.
n_values
();
i
++
)
out_signal
.
push_back
(
in1_signal
[
i
]
-
in2_signal
[
i
]);
WavData
out_wav_data
(
out_signal
,
in1_data
.
n_channels
(),
in1_data
.
sample_rate
(),
in1_data
.
bit_depth
());
if
(
!
out_wav_data
.
save
(
outfile
))
{
fprintf
(
stderr
,
"audiowmark: error saving %s: %s
\n
"
,
outfile
.
c_str
(),
out_wav_data
.
error_blurb
());
return
1
;
}
return
0
;
}
int
int
gen_key
(
const
string
&
outfile
)
gen_key
(
const
string
&
outfile
)
{
{
...
@@ -1647,6 +1692,10 @@ main (int argc, char **argv)
...
@@ -1647,6 +1692,10 @@ main (int argc, char **argv)
{
{
cut_start
(
argv
[
2
],
argv
[
3
],
argv
[
4
]);
cut_start
(
argv
[
2
],
argv
[
3
],
argv
[
4
]);
}
}
else
if
(
op
==
"test-subtract"
&&
argc
==
5
)
{
test_subtract
(
argv
[
2
],
argv
[
3
],
argv
[
4
]);
}
else
if
(
op
==
"gen-key"
&&
argc
==
3
)
else
if
(
op
==
"gen-key"
&&
argc
==
3
)
{
{
return
gen_key
(
argv
[
2
]);
return
gen_key
(
argv
[
2
]);
...
...
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