Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
d0dedce7
Commit
d0dedce7
authored
Apr 30, 2010
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reindent
Originally committed as revision 22996 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
ca6d3f23
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
24 deletions
+24
-24
aac.c
libavcodec/aac.c
+3
-3
aacsbr.c
libavcodec/aacsbr.c
+21
-21
No files found.
libavcodec/aac.c
View file @
d0dedce7
...
...
@@ -1892,9 +1892,9 @@ static void spectral_to_sample(AACContext *ac)
apply_channel_coupling
(
ac
,
che
,
type
,
i
,
BETWEEN_TNS_AND_IMDCT
,
apply_dependent_coupling
);
if
(
type
!=
TYPE_CCE
||
che
->
coup
.
coupling_point
==
AFTER_IMDCT
)
{
imdct_and_windowing
(
ac
,
&
che
->
ch
[
0
],
imdct_bias
);
if
(
type
==
TYPE_CPE
)
{
imdct_and_windowing
(
ac
,
&
che
->
ch
[
1
],
imdct_bias
);
}
if
(
type
==
TYPE_CPE
)
{
imdct_and_windowing
(
ac
,
&
che
->
ch
[
1
],
imdct_bias
);
}
if
(
ac
->
m4ac
.
sbr
>
0
)
{
ff_sbr_apply
(
ac
,
&
che
->
sbr
,
type
,
che
->
ch
[
0
].
ret
,
che
->
ch
[
1
].
ret
);
}
...
...
libavcodec/aacsbr.c
View file @
d0dedce7
...
...
@@ -1720,28 +1720,28 @@ void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac,
sbr_dequant
(
sbr
,
id_aac
);
}
for
(
ch
=
0
;
ch
<
nch
;
ch
++
)
{
/* decode channel */
sbr_qmf_analysis
(
&
ac
->
dsp
,
&
sbr
->
rdft
,
ch
?
R
:
L
,
sbr
->
data
[
ch
].
analysis_filterbank_samples
,
(
float
*
)
sbr
->
qmf_filter_scratch
,
sbr
->
data
[
ch
].
W
,
1
/
(
-
1024
*
ac
->
sf_scale
));
sbr_lf_gen
(
ac
,
sbr
,
sbr
->
X_low
,
sbr
->
data
[
ch
].
W
);
if
(
sbr
->
start
)
{
sbr_hf_inverse_filter
(
sbr
->
alpha0
,
sbr
->
alpha1
,
sbr
->
X_low
,
sbr
->
k
[
0
]);
sbr_chirp
(
sbr
,
&
sbr
->
data
[
ch
]);
sbr_hf_gen
(
ac
,
sbr
,
sbr
->
X_high
,
sbr
->
X_low
,
sbr
->
alpha0
,
sbr
->
alpha1
,
sbr
->
data
[
ch
].
bw_array
,
sbr
->
data
[
ch
].
t_env
,
sbr
->
data
[
ch
].
bs_num_env
);
// hf_adj
sbr_mapping
(
ac
,
sbr
,
&
sbr
->
data
[
ch
],
sbr
->
data
[
ch
].
e_a
);
sbr_env_estimate
(
sbr
->
e_curr
,
sbr
->
X_high
,
sbr
,
&
sbr
->
data
[
ch
]);
sbr_gain_calc
(
ac
,
sbr
,
&
sbr
->
data
[
ch
],
sbr
->
data
[
ch
].
e_a
);
sbr_hf_assemble
(
sbr
->
data
[
ch
].
Y
,
sbr
->
X_high
,
sbr
,
&
sbr
->
data
[
ch
],
sbr
->
data
[
ch
].
e_a
);
}
/* decode channel */
sbr_qmf_analysis
(
&
ac
->
dsp
,
&
sbr
->
rdft
,
ch
?
R
:
L
,
sbr
->
data
[
ch
].
analysis_filterbank_samples
,
(
float
*
)
sbr
->
qmf_filter_scratch
,
sbr
->
data
[
ch
].
W
,
1
/
(
-
1024
*
ac
->
sf_scale
));
sbr_lf_gen
(
ac
,
sbr
,
sbr
->
X_low
,
sbr
->
data
[
ch
].
W
);
if
(
sbr
->
start
)
{
sbr_hf_inverse_filter
(
sbr
->
alpha0
,
sbr
->
alpha1
,
sbr
->
X_low
,
sbr
->
k
[
0
]);
sbr_chirp
(
sbr
,
&
sbr
->
data
[
ch
]);
sbr_hf_gen
(
ac
,
sbr
,
sbr
->
X_high
,
sbr
->
X_low
,
sbr
->
alpha0
,
sbr
->
alpha1
,
sbr
->
data
[
ch
].
bw_array
,
sbr
->
data
[
ch
].
t_env
,
sbr
->
data
[
ch
].
bs_num_env
);
// hf_adj
sbr_mapping
(
ac
,
sbr
,
&
sbr
->
data
[
ch
],
sbr
->
data
[
ch
].
e_a
);
sbr_env_estimate
(
sbr
->
e_curr
,
sbr
->
X_high
,
sbr
,
&
sbr
->
data
[
ch
]);
sbr_gain_calc
(
ac
,
sbr
,
&
sbr
->
data
[
ch
],
sbr
->
data
[
ch
].
e_a
);
sbr_hf_assemble
(
sbr
->
data
[
ch
].
Y
,
sbr
->
X_high
,
sbr
,
&
sbr
->
data
[
ch
],
sbr
->
data
[
ch
].
e_a
);
}
/* synthesis */
sbr_x_gen
(
sbr
,
sbr
->
X
,
sbr
->
X_low
,
sbr
->
data
[
ch
].
Y
,
ch
);
/* synthesis */
sbr_x_gen
(
sbr
,
sbr
->
X
,
sbr
->
X_low
,
sbr
->
data
[
ch
].
Y
,
ch
);
}
sbr_qmf_synthesis
(
&
ac
->
dsp
,
&
sbr
->
mdct
,
L
,
sbr
->
X
,
sbr
->
qmf_filter_scratch
,
sbr
->
data
[
0
].
synthesis_filterbank_samples
,
...
...
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