Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Opus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xiph.Org
Opus
Commits
fd314f4b
Commit
fd314f4b
authored
12 years ago
by
Jean-Marc Valin
Browse files
Options
Downloads
Patches
Plain Diff
More stack usage reduction in quant_all_bands()
Reduce size of "norm" because we never need it for the last band
parent
5055cf8c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
celt/bands.c
+10
-5
10 additions, 5 deletions
celt/bands.c
with
10 additions
and
5 deletions
celt/bands.c
+
10
−
5
View file @
fd314f4b
...
...
@@ -1208,9 +1208,11 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
M
=
1
<<
LM
;
B
=
shortBlocks
?
M
:
1
;
ALLOC
(
_norm
,
C
*
M
*
eBands
[
m
->
nbEBands
],
celt_norm
);
/* No need to allocate norm for the last band because we don't need an
output in that band */
ALLOC
(
_norm
,
C
*
M
*
eBands
[
m
->
nbEBands
-
1
],
celt_norm
);
norm
=
_norm
;
norm2
=
norm
+
M
*
eBands
[
m
->
nbEBands
];
norm2
=
norm
+
M
*
eBands
[
m
->
nbEBands
-
1
];
/* We can use the last band as scratch space because we don't need that
scratch space for the last band */
lowband_scratch
=
X_
+
M
*
eBands
[
m
->
nbEBands
-
1
];
...
...
@@ -1227,6 +1229,9 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
int
tf_change
=
0
;
unsigned
x_cm
;
unsigned
y_cm
;
int
last
;
last
=
(
i
==
end
-
1
);
X
=
X_
+
M
*
eBands
[
i
];
if
(
Y_
!=
NULL
)
...
...
@@ -1300,14 +1305,14 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
{
x_cm
=
quant_band
(
encode
,
m
,
i
,
X
,
NULL
,
N
,
b
/
2
,
spread
,
B
,
intensity
,
tf_change
,
effective_lowband
!=
-
1
?
norm
+
effective_lowband
:
NULL
,
ec
,
&
remaining_bits
,
LM
,
norm
+
M
*
eBands
[
i
],
bandE
,
0
,
seed
,
Q15ONE
,
lowband_scratch
,
x_cm
);
last
?
NULL
:
norm
+
M
*
eBands
[
i
],
bandE
,
0
,
seed
,
Q15ONE
,
lowband_scratch
,
x_cm
);
y_cm
=
quant_band
(
encode
,
m
,
i
,
Y
,
NULL
,
N
,
b
/
2
,
spread
,
B
,
intensity
,
tf_change
,
effective_lowband
!=
-
1
?
norm2
+
effective_lowband
:
NULL
,
ec
,
&
remaining_bits
,
LM
,
norm2
+
M
*
eBands
[
i
],
bandE
,
0
,
seed
,
Q15ONE
,
lowband_scratch
,
y_cm
);
last
?
NULL
:
norm2
+
M
*
eBands
[
i
],
bandE
,
0
,
seed
,
Q15ONE
,
lowband_scratch
,
y_cm
);
}
else
{
x_cm
=
quant_band
(
encode
,
m
,
i
,
X
,
Y
,
N
,
b
,
spread
,
B
,
intensity
,
tf_change
,
effective_lowband
!=
-
1
?
norm
+
effective_lowband
:
NULL
,
ec
,
&
remaining_bits
,
LM
,
norm
+
M
*
eBands
[
i
],
bandE
,
0
,
seed
,
Q15ONE
,
lowband_scratch
,
x_cm
|
y_cm
);
last
?
NULL
:
norm
+
M
*
eBands
[
i
],
bandE
,
0
,
seed
,
Q15ONE
,
lowband_scratch
,
x_cm
|
y_cm
);
y_cm
=
x_cm
;
}
collapse_masks
[
i
*
C
+
0
]
=
(
unsigned
char
)
x_cm
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment