Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
d0dedce7
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d0dedce7
编写于
4月 30, 2010
作者:
A
Alex Converse
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reindent
Originally committed as revision 22996 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
ca6d3f23
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
24 deletion
+24
-24
libavcodec/aac.c
libavcodec/aac.c
+3
-3
libavcodec/aacsbr.c
libavcodec/aacsbr.c
+21
-21
未找到文件。
libavcodec/aac.c
浏览文件 @
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
浏览文件 @
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
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录