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
605d3b8c
Commit
605d3b8c
authored
May 10, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testhls: avoid tempfile for watermarker input (pass as AudioInputStream)
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
44ad77de
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
51 additions
and
7 deletions
+51
-7
testhls.cc
src/testhls.cc
+51
-7
No files found.
src/testhls.cc
View file @
605d3b8c
...
...
@@ -237,6 +237,49 @@ hls_embed_context (const string& in_dir, const string& out_dir, const string& fi
return
0
;
}
class
WDInputStream
:
public
AudioInputStream
{
WavData
*
wav_data
;
size_t
read_pos
=
0
;
public
:
WDInputStream
(
WavData
*
wav_data
)
:
wav_data
(
wav_data
)
{
}
int
bit_depth
()
const
override
{
return
wav_data
->
bit_depth
();
}
int
sample_rate
()
const
override
{
return
wav_data
->
sample_rate
();
}
int
n_channels
()
const
override
{
return
wav_data
->
n_channels
();
}
size_t
n_frames
()
const
override
{
return
wav_data
->
n_values
()
/
wav_data
->
n_channels
();
}
Error
read_frames
(
std
::
vector
<
float
>&
samples
,
size_t
count
)
override
{
size_t
read_count
=
min
(
n_frames
()
-
read_pos
,
count
);
const
auto
&
wsamples
=
wav_data
->
samples
();
samples
.
assign
(
wsamples
.
begin
()
+
read_pos
*
n_channels
(),
wsamples
.
begin
()
+
(
read_pos
+
read_count
)
*
n_channels
());
read_pos
+=
read_count
;
return
Error
::
Code
::
NONE
;
}
};
int
mark_zexpand
(
WavData
&
wav_data
,
size_t
zero_frames
,
const
string
&
bits
)
{
...
...
@@ -246,22 +289,23 @@ mark_zexpand (WavData& wav_data, size_t zero_frames, const string& bits)
samples
.
insert
(
samples
.
begin
(),
zero_frames
*
wav_data
.
n_channels
(),
/* value */
0
);
wav_data
.
set_samples
(
samples
);
FILE
*
tmp_in
=
tmpfile
();
ScopedFile
tmp_in_s
(
tmp_in
);
string
tmp_in_name
=
string_printf
(
"/dev/fd/%d"
,
fileno
(
tmp_in
));
FILE
*
tmp_out
=
tmpfile
();
ScopedFile
tmp_out_s
(
tmp_out
);
string
tmp_out_name
=
string_printf
(
"/dev/fd/%d"
,
fileno
(
tmp_out
));
Error
err
=
wav_data
.
save
(
tmp_in_name
);
Error
err
;
WDInputStream
in_stream
(
&
wav_data
);
const
int
out_bit_depth
=
in_stream
.
bit_depth
()
>
16
?
24
:
16
;
std
::
unique_ptr
<
AudioOutputStream
>
out_stream
;
out_stream
=
AudioOutputStream
::
create
(
tmp_out_name
,
in_stream
.
n_channels
(),
in_stream
.
sample_rate
(),
out_bit_depth
,
in_stream
.
n_frames
(),
err
);
if
(
err
)
{
error
(
"
mark zexpand save: %s"
,
err
.
message
());
error
(
"
audiowmark: error writing to %s: %s
\n
"
,
tmp_out_name
.
c_str
()
,
err
.
message
());
return
1
;
}
int
rc
=
add_
watermark
(
tmp_in_name
,
tmp_out_name
,
bits
);
int
rc
=
add_
stream_watermark
(
&
in_stream
,
out_stream
.
get
()
,
bits
);
if
(
rc
!=
0
)
return
rc
;
...
...
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