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
917ad384
Commit
917ad384
authored
May 10, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New add_stream_watermark() function - add watermark to in/out streams.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
1352e16a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
26 deletions
+36
-26
wmadd.cc
src/wmadd.cc
+35
-26
wmcommon.hh
src/wmcommon.hh
+1
-0
No files found.
src/wmadd.cc
View file @
917ad384
...
...
@@ -546,7 +546,7 @@ info_format (const string& label, const RawFormat& format)
}
int
add_
watermark
(
const
string
&
infile
,
const
string
&
outfile
,
const
string
&
bits
)
add_
stream_watermark
(
AudioInputStream
*
in_stream
,
AudioOutputStream
*
out_stream
,
const
string
&
bits
)
{
auto
bitvec
=
bit_str_to_vec
(
bits
);
if
(
bitvec
.
empty
())
...
...
@@ -573,25 +573,6 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
bitvec
=
expanded_bitvec
;
}
/* open input stream */
Error
err
;
std
::
unique_ptr
<
AudioInputStream
>
in_stream
=
AudioInputStream
::
create
(
infile
,
err
);
if
(
err
)
{
error
(
"audiowmark: error opening %s: %s
\n
"
,
infile
.
c_str
(),
err
.
message
());
return
1
;
}
/* open output stream */
const
int
out_bit_depth
=
in_stream
->
bit_depth
()
>
16
?
24
:
16
;
std
::
unique_ptr
<
AudioOutputStream
>
out_stream
;
out_stream
=
AudioOutputStream
::
create
(
outfile
,
in_stream
->
n_channels
(),
in_stream
->
sample_rate
(),
out_bit_depth
,
in_stream
->
n_frames
(),
err
);
if
(
err
)
{
error
(
"audiowmark: error writing to %s: %s
\n
"
,
outfile
.
c_str
(),
err
.
message
());
return
1
;
}
/* sanity checks */
if
(
in_stream
->
sample_rate
()
!=
out_stream
->
sample_rate
())
{
...
...
@@ -605,12 +586,6 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
}
/* write some informational messages */
info
(
"Input: %s
\n
"
,
Params
::
input_label
.
size
()
?
Params
::
input_label
.
c_str
()
:
infile
.
c_str
());
if
(
Params
::
input_format
==
Format
::
RAW
)
info_format
(
"Raw Input"
,
Params
::
raw_input_format
);
info
(
"Output: %s
\n
"
,
Params
::
output_label
.
size
()
?
Params
::
output_label
.
c_str
()
:
outfile
.
c_str
());
if
(
Params
::
output_format
==
Format
::
RAW
)
info_format
(
"Raw Output"
,
Params
::
raw_output_format
);
info
(
"Message: %s
\n
"
,
bit_vec_to_str
(
bitvec
).
c_str
());
info
(
"Strength: %.6g
\n\n
"
,
Params
::
water_delta
*
1000
);
...
...
@@ -644,6 +619,7 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
size_t
total_input_frames
=
0
;
size_t
total_output_frames
=
0
;
Error
err
;
while
(
true
)
{
err
=
in_stream
->
read_frames
(
samples
,
Params
::
frame_size
);
...
...
@@ -717,4 +693,37 @@ add_watermark (const string& infile, const string& outfile, const string& bits)
return
0
;
}
int
add_watermark
(
const
string
&
infile
,
const
string
&
outfile
,
const
string
&
bits
)
{
/* open input stream */
Error
err
;
std
::
unique_ptr
<
AudioInputStream
>
in_stream
=
AudioInputStream
::
create
(
infile
,
err
);
if
(
err
)
{
error
(
"audiowmark: error opening %s: %s
\n
"
,
infile
.
c_str
(),
err
.
message
());
return
1
;
}
/* open output stream */
const
int
out_bit_depth
=
in_stream
->
bit_depth
()
>
16
?
24
:
16
;
std
::
unique_ptr
<
AudioOutputStream
>
out_stream
;
out_stream
=
AudioOutputStream
::
create
(
outfile
,
in_stream
->
n_channels
(),
in_stream
->
sample_rate
(),
out_bit_depth
,
in_stream
->
n_frames
(),
err
);
if
(
err
)
{
error
(
"audiowmark: error writing to %s: %s
\n
"
,
outfile
.
c_str
(),
err
.
message
());
return
1
;
}
/* write input/output stream details */
info
(
"Input: %s
\n
"
,
Params
::
input_label
.
size
()
?
Params
::
input_label
.
c_str
()
:
infile
.
c_str
());
if
(
Params
::
input_format
==
Format
::
RAW
)
info_format
(
"Raw Input"
,
Params
::
raw_input_format
);
info
(
"Output: %s
\n
"
,
Params
::
output_label
.
size
()
?
Params
::
output_label
.
c_str
()
:
outfile
.
c_str
());
if
(
Params
::
output_format
==
Format
::
RAW
)
info_format
(
"Raw Output"
,
Params
::
raw_output_format
);
return
add_stream_watermark
(
in_stream
.
get
(),
out_stream
.
get
(),
bits
);
}
src/wmcommon.hh
View file @
917ad384
...
...
@@ -161,6 +161,7 @@ randomize_bit_order (const std::vector<T>& bit_vec, bool encode)
return
out_bits
;
}
int
add_stream_watermark
(
AudioInputStream
*
in_stream
,
AudioOutputStream
*
out_stream
,
const
std
::
string
&
bits
);
int
add_watermark
(
const
std
::
string
&
infile
,
const
std
::
string
&
outfile
,
const
std
::
string
&
bits
);
int
get_watermark
(
const
std
::
string
&
infile
,
const
std
::
string
&
orig_pattern
);
...
...
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