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
515de762
Commit
515de762
authored
May 19, 2020
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor skipping code.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
cb30c155
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
19 deletions
+21
-19
wmadd.cc
src/wmadd.cc
+21
-19
No files found.
src/wmadd.cc
View file @
515de762
...
@@ -244,14 +244,16 @@ public:
...
@@ -244,14 +244,16 @@ public:
size_t
size_t
skip
(
size_t
zeros
)
skip
(
size_t
zeros
)
{
{
assert
(
zeros
==
Params
::
frame_size
);
assert
(
zeros
%
Params
::
frame_size
==
0
&&
zeros
>
0
);
size_t
out
=
0
;
if
(
first_frame
)
if
(
first_frame
)
{
{
first_frame
=
false
;
first_frame
=
false
;
return
0
;
return
zeros
-
Params
::
frame_size
;
}
}
else
else
return
Params
::
frame_size
;
return
zeros
;
}
}
};
};
...
@@ -309,11 +311,12 @@ public:
...
@@ -309,11 +311,12 @@ public:
size_t
size_t
skip
(
size_t
zeros
)
skip
(
size_t
zeros
)
{
{
assert
(
zeros
==
Params
::
frame_size
);
assert
(
zeros
%
Params
::
frame_size
==
0
);
for
(
int
i
=
0
;
i
<
zeros
/
Params
::
frame_size
;
i
++
)
bump_frame_number
();
bump_frame_number
();
return
wm_synth
.
skip
(
Params
::
frame_size
);
return
wm_synth
.
skip
(
zeros
);
}
}
void
void
bump_frame_number
()
bump_frame_number
()
...
@@ -563,24 +566,23 @@ public:
...
@@ -563,24 +566,23 @@ public:
skip
(
size_t
zeros
)
skip
(
size_t
zeros
)
{
{
assert
(
zeros
%
Params
::
frame_size
==
0
);
assert
(
zeros
%
Params
::
frame_size
==
0
);
size_t
out
=
0
;
while
(
zeros
)
{
if
(
!
need_resampler
)
if
(
!
need_resampler
)
{
{
out
+=
wm_gen
.
skip
(
Params
::
frame_size
);
/* cheap case */
return
wm_gen
.
skip
(
zeros
);
/* cheap case */
}
}
else
else
{
{
/* FIXME: inefficient */
/* FIXME: inefficient */
vector
<
float
>
samples
(
Params
::
frame_size
*
n_channels
);
vector
<
float
>
samples
(
Params
::
frame_size
*
n_channels
);
size_t
n_values
=
run
(
samples
).
size
()
;
size_t
out
=
0
;
out
+=
n_values
/
n_channels
;
while
(
zeros
)
}
{
zeros
-=
Params
::
frame_size
;
zeros
-=
Params
::
frame_size
;
out
+=
run
(
samples
).
size
()
/
n_channels
;
}
}
return
out
;
return
out
;
}
}
}
int
int
data_blocks
()
const
data_blocks
()
const
{
{
...
...
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