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
40019adf
Commit
40019adf
authored
Dec 13, 2018
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use same code to generate mix entries for add/get.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
5949bb87
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
34 deletions
+28
-34
audiowmark.cc
src/audiowmark.cc
+28
-34
No files found.
src/audiowmark.cc
View file @
40019adf
...
...
@@ -400,6 +400,32 @@ watermark_frame (const vector<float>& input_frame, int f, int data_bit)
return
new_frame
;
}
struct
MixEntry
{
int
frame
;
int
up
;
int
down
;
};
vector
<
MixEntry
>
gen_mix_entries
(
int
block
)
{
vector
<
MixEntry
>
mix_entries
;
for
(
int
f
=
0
;
f
<
Params
::
block
*
Params
::
frames_per_bit
;
f
++
)
{
vector
<
int
>
up
;
vector
<
int
>
down
;
get_up_down
(
f
,
up
,
down
);
assert
(
up
.
size
()
==
down
.
size
());
for
(
size_t
i
=
0
;
i
<
up
.
size
();
i
++
)
mix_entries
.
push_back
({
f
,
up
[
i
],
down
[
i
]
});
}
gen_shuffle
(
mix_entries
,
/* seed */
block
);
return
mix_entries
;
}
int
add_watermark
(
const
string
&
infile
,
const
string
&
outfile
,
const
string
&
bits
)
{
...
...
@@ -466,23 +492,7 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
}
for
(
int
block
=
0
;
block
<
frame_count
(
wav_data
)
/
(
Params
::
block
*
Params
::
frames_per_bit
);
block
++
)
{
struct
MixEntry
{
int
frame
;
int
up
;
int
down
;
};
vector
<
MixEntry
>
mix_entries
;
for
(
int
f
=
0
;
f
<
Params
::
block
*
Params
::
frames_per_bit
;
f
++
)
{
vector
<
int
>
up
;
vector
<
int
>
down
;
get_up_down
(
f
,
up
,
down
);
assert
(
up
.
size
()
==
down
.
size
());
for
(
size_t
i
=
0
;
i
<
up
.
size
();
i
++
)
mix_entries
.
push_back
({
f
,
up
[
i
],
down
[
i
]
});
}
gen_shuffle
(
mix_entries
,
/* seed */
block
);
vector
<
MixEntry
>
mix_entries
=
gen_mix_entries
(
block
);
const
int
block_start
=
block
*
Params
::
block
*
Params
::
frames_per_bit
;
for
(
int
f
=
0
;
f
<
Params
::
block
*
Params
::
frames_per_bit
;
f
++
)
...
...
@@ -639,23 +649,7 @@ get_watermark (const string& infile, const string& orig_pattern)
{
for
(
int
block
=
0
;
block
<
frame_count
(
wav_data
)
/
(
Params
::
block
*
Params
::
frames_per_bit
);
block
++
)
{
struct
MixEntry
{
int
frame
;
int
up
;
int
down
;
};
vector
<
MixEntry
>
mix_entries
;
for
(
int
f
=
0
;
f
<
Params
::
block
*
Params
::
frames_per_bit
;
f
++
)
{
vector
<
int
>
up
;
vector
<
int
>
down
;
get_up_down
(
f
,
up
,
down
);
assert
(
up
.
size
()
==
down
.
size
());
for
(
size_t
i
=
0
;
i
<
up
.
size
();
i
++
)
mix_entries
.
push_back
({
f
,
up
[
i
],
down
[
i
]
});
}
gen_shuffle
(
mix_entries
,
/* seed */
block
);
vector
<
MixEntry
>
mix_entries
=
gen_mix_entries
(
block
);
double
umag
=
0
,
dmag
=
0
;
for
(
int
f
=
0
;
f
<
Params
::
block
*
Params
::
frames_per_bit
;
f
++
)
...
...
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