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
4f0e6bcb
Commit
4f0e6bcb
authored
Nov 17, 2019
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reimplement mix step marking for streaming.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
e9898f76
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
4 deletions
+28
-4
audiowmark.cc
src/audiowmark.cc
+28
-4
No files found.
src/audiowmark.cc
View file @
4f0e6bcb
...
@@ -587,6 +587,29 @@ mark_data_stream (vector<vector<FrameDelta>>& frame_mod, const vector<int>& bitv
...
@@ -587,6 +587,29 @@ mark_data_stream (vector<vector<FrameDelta>>& frame_mod, const vector<int>& bitv
const
int
frame_count
=
mark_data_frame_count
();
const
int
frame_count
=
mark_data_frame_count
();
if
(
Params
::
mix
)
{
vector
<
MixEntry
>
mix_entries
=
gen_mix_entries
();
for
(
int
f
=
0
;
f
<
frame_count
;
f
++
)
{
for
(
size_t
frame_b
=
0
;
frame_b
<
Params
::
bands_per_frame
;
frame_b
++
)
{
int
b
=
f
*
Params
::
bands_per_frame
+
frame_b
;
const
int
data_bit
=
bitvec
[
f
/
Params
::
frames_per_bit
];
const
int
u
=
mix_entries
[
b
].
up
;
const
int
d
=
mix_entries
[
b
].
down
;
const
int
index
=
mix_entries
[
b
].
frame
;
frame_mod
[
index
][
u
]
=
data_bit
?
FrameDelta
::
UP
:
FrameDelta
::
DOWN
;
frame_mod
[
index
][
d
]
=
data_bit
?
FrameDelta
::
DOWN
:
FrameDelta
::
UP
;
}
}
}
else
{
// sync block always written in linear order (no mix)
// sync block always written in linear order (no mix)
for
(
int
f
=
0
;
f
<
frame_count
;
f
++
)
for
(
int
f
=
0
;
f
<
frame_count
;
f
++
)
{
{
...
@@ -594,6 +617,7 @@ mark_data_stream (vector<vector<FrameDelta>>& frame_mod, const vector<int>& bitv
...
@@ -594,6 +617,7 @@ mark_data_stream (vector<vector<FrameDelta>>& frame_mod, const vector<int>& bitv
prepare_frame_delta
(
f
,
frame_mod
[
index
],
bitvec
[
f
/
Params
::
frames_per_bit
],
Random
::
Stream
::
data_up_down
);
// FIXME: rename
prepare_frame_delta
(
f
,
frame_mod
[
index
],
bitvec
[
f
/
Params
::
frames_per_bit
],
Random
::
Stream
::
data_up_down
);
// FIXME: rename
}
}
}
}
}
size_t
size_t
...
...
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