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
4daad3c3
Commit
4daad3c3
authored
Nov 26, 2018
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use both channels for decoding bits (average up/down values).
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
769368ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
16 deletions
+13
-16
TODO
src/TODO
+0
-1
audiowmark.cc
src/audiowmark.cc
+13
-15
No files found.
src/TODO
View file @
4daad3c3
- use both channels for decoding
- non-blind decoder
- standard tests (-> mp3, ->ogg, ...)
- refactor fft
...
...
src/audiowmark.cc
View file @
4daad3c3
...
...
@@ -332,9 +332,12 @@ get_watermark (const string& origfile, const string& infile, const string& orig_
fprintf
(
stderr
,
"audiowmark: error loading %s: %s
\n
"
,
infile
.
c_str
(),
wav_data
.
error_blurb
());
return
1
;
}
vector
<
int
>
bit_vec
[
wav_data
.
n_channels
()];
vector
<
int
>
bit_vec
;
for
(
int
f
=
0
;
f
<
frame_count
(
wav_data
);
f
++
)
{
double
umag
=
0
,
dmag
=
0
;
for
(
int
ch
=
0
;
ch
<
wav_data
.
n_channels
();
ch
++
)
{
vector
<
float
>
frame
=
get_frame
(
wav_data
,
f
,
ch
);
...
...
@@ -365,7 +368,6 @@ get_watermark (const string& origfile, const string& infile, const string& orig_
vector
<
int
>
up
;
vector
<
int
>
down
;
get_up_down
(
f
,
up
,
down
);
double
umag
=
0
,
dmag
=
0
;
for
(
auto
u
:
up
)
{
const
double
re
=
fft_out
[
u
*
2
];
...
...
@@ -383,30 +385,26 @@ get_watermark (const string& origfile, const string& infile, const string& orig_
dmag
+=
mag
;
}
bit_vec
[
ch
].
push_back
((
umag
>
dmag
)
?
1
:
0
);
free_array_float
(
fft_out
);
free_array_float
(
fft_in
);
}
}
bit_vec
.
push_back
((
umag
>
dmag
)
?
1
:
0
);
}
int
bits
=
0
,
bit_errors
=
0
;
for
(
int
ch
=
0
;
ch
<
wav_data
.
n_channels
();
ch
++
)
if
(
!
orig_pattern
.
empty
())
{
printf
(
"ch[%d]=%s
\n
"
,
ch
,
bit_vec_to_str
(
bit_vec
[
ch
]).
c_str
())
;
int
bits
=
0
,
bit_errors
=
0
;
if
(
!
orig_pattern
.
empty
())
vector
<
int
>
orig_vec
=
bit_str_to_vec
(
orig_pattern
);
for
(
size_t
i
=
0
;
i
<
bit_vec
.
size
();
i
++
)
{
vector
<
int
>
orig_vec
=
bit_str_to_vec
(
orig_pattern
);
for
(
size_t
i
=
0
;
i
<
bit_vec
[
ch
].
size
();
i
++
)
{
bits
++
;
if
(
bit_vec
[
ch
][
i
]
!=
orig_vec
[
i
%
orig_vec
.
size
()])
bit_errors
++
;
}
bits
++
;
if
(
bit_vec
[
i
]
!=
orig_vec
[
i
%
orig_vec
.
size
()])
bit_errors
++
;
}
printf
(
"bit_error_rate %.3f %%
\n
"
,
double
(
100.0
*
bit_errors
)
/
bits
);
}
printf
(
"bit_error_rate %.3f %%
\n
"
,
double
(
100.0
*
bit_errors
)
/
bits
);
return
0
;
}
...
...
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