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
bab02285
Commit
bab02285
authored
May 16, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor skip/seek code to process more than one frame at once.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
24a61ea2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
15 deletions
+39
-15
wmadd.cc
src/wmadd.cc
+39
-15
No files found.
src/wmadd.cc
View file @
bab02285
...
...
@@ -561,17 +561,24 @@ public:
size_t
skip
(
size_t
zeros
)
{
if
(
!
need_resampler
)
{
return
wm_gen
.
skip
(
zeros
);
/* cheap case */
}
else
assert
(
zeros
%
Params
::
frame_size
==
0
);
size_t
out
=
0
;
while
(
zeros
)
{
/* FIXME: inefficient */
vector
<
float
>
samples
(
zeros
*
n_channels
);
size_t
n_values
=
run
(
samples
).
size
();
return
n_values
/
n_channels
;
if
(
!
need_resampler
)
{
out
+=
wm_gen
.
skip
(
Params
::
frame_size
);
/* cheap case */
}
else
{
/* FIXME: inefficient */
vector
<
float
>
samples
(
Params
::
frame_size
*
n_channels
);
size_t
n_values
=
run
(
samples
).
size
();
out
+=
n_values
/
n_channels
;
}
zeros
-=
Params
::
frame_size
;
}
return
out
;
}
int
data_blocks
()
const
...
...
@@ -660,19 +667,36 @@ add_stream_watermark (AudioInputStream *in_stream, AudioOutputStream *out_stream
size_t
total_output_frames
=
0
;
size_t
audio_buffer_frames
=
0
;
Error
err
;
while
(
zero_frames
>=
Params
::
frame_size
)
if
(
zero_frames
>=
Params
::
frame_size
)
{
total_input_frames
+=
Params
::
frame_size
;
audio_buffer_frames
+=
Params
::
frame_size
;
size_t
frames
=
wm_resampler
.
skip
(
Params
::
frame_size
);
size_t
skip_blocks
=
zero_frames
/
Params
::
frame_size
;
total_input_frames
+=
Params
::
frame_size
*
skip_blocks
;
audio_buffer_frames
+=
Params
::
frame_size
*
skip_blocks
;
size_t
frames
=
wm_resampler
.
skip
(
Params
::
frame_size
*
skip_blocks
);
audio_buffer_frames
-=
frames
;
frames
=
limiter
.
skip
(
frames
);
err
=
out_stream
->
write_frames
(
vector
<
float
>
(
frames
*
n_channels
));
vector
<
float
>
zblock
(
Params
::
frame_size
*
n_channels
);
size_t
wframes
=
frames
;
while
(
wframes
>
0
)
{
if
(
wframes
>=
Params
::
frame_size
)
{
err
=
out_stream
->
write_frames
(
zblock
);
wframes
-=
Params
::
frame_size
;
}
else
{
zblock
.
resize
(
wframes
*
n_channels
);
err
=
out_stream
->
write_frames
(
zblock
);
wframes
=
0
;
}
}
total_output_frames
+=
frames
;
zero_frames
-=
Params
::
frame_size
;
zero_frames
-=
Params
::
frame_size
*
skip_blocks
;
}
audio_buffer
.
write_frames
(
std
::
vector
<
float
>
(
audio_buffer_frames
*
n_channels
));
while
(
true
)
...
...
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