Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
2790d7a9
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,发现更多精彩内容 >>
提交
2790d7a9
编写于
2月 18, 2011
作者:
Y
Young Han Lee
提交者:
Ronald S. Bultje
3月 07, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
aacenc: remove the data arrays
Signed-off-by:
N
Ronald S. Bultje
<
rsbultje@gmail.com
>
上级
c9256246
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
16 deletion
+17
-16
libavcodec/aacenc.c
libavcodec/aacenc.c
+15
-13
libavcodec/aacenc.h
libavcodec/aacenc.h
+2
-3
未找到文件。
libavcodec/aacenc.c
浏览文件 @
2790d7a9
...
...
@@ -225,40 +225,41 @@ static void apply_window_and_mdct(AVCodecContext *avctx, AACEncContext *s,
const
float
*
lwindow
=
sce
->
ics
.
use_kb_window
[
0
]
?
ff_aac_kbd_long_1024
:
ff_sine_1024
;
const
float
*
swindow
=
sce
->
ics
.
use_kb_window
[
0
]
?
ff_aac_kbd_short_128
:
ff_sine_128
;
const
float
*
pwindow
=
sce
->
ics
.
use_kb_window
[
1
]
?
ff_aac_kbd_short_128
:
ff_sine_128
;
float
*
output
=
sce
->
ret
;
if
(
sce
->
ics
.
window_sequence
[
0
]
!=
EIGHT_SHORT_SEQUENCE
)
{
memcpy
(
s
->
output
,
sce
->
saved
,
sizeof
(
float
)
*
1024
);
memcpy
(
output
,
sce
->
saved
,
sizeof
(
float
)
*
1024
);
if
(
sce
->
ics
.
window_sequence
[
0
]
==
LONG_STOP_SEQUENCE
)
{
memset
(
s
->
output
,
0
,
sizeof
(
s
->
output
[
0
])
*
448
);
memset
(
output
,
0
,
sizeof
(
output
[
0
])
*
448
);
for
(
i
=
448
;
i
<
576
;
i
++
)
s
->
output
[
i
]
=
sce
->
saved
[
i
]
*
pwindow
[
i
-
448
];
output
[
i
]
=
sce
->
saved
[
i
]
*
pwindow
[
i
-
448
];
for
(
i
=
576
;
i
<
704
;
i
++
)
s
->
output
[
i
]
=
sce
->
saved
[
i
];
output
[
i
]
=
sce
->
saved
[
i
];
}
if
(
sce
->
ics
.
window_sequence
[
0
]
!=
LONG_START_SEQUENCE
)
{
for
(
i
=
0
;
i
<
1024
;
i
++
)
{
s
->
output
[
i
+
1024
]
=
audio
[
i
*
chans
]
*
lwindow
[
1024
-
i
-
1
];
output
[
i
+
1024
]
=
audio
[
i
*
chans
]
*
lwindow
[
1024
-
i
-
1
];
sce
->
saved
[
i
]
=
audio
[
i
*
chans
]
*
lwindow
[
i
];
}
}
else
{
for
(
i
=
0
;
i
<
448
;
i
++
)
s
->
output
[
i
+
1024
]
=
audio
[
i
*
chans
];
output
[
i
+
1024
]
=
audio
[
i
*
chans
];
for
(;
i
<
576
;
i
++
)
s
->
output
[
i
+
1024
]
=
audio
[
i
*
chans
]
*
swindow
[
576
-
i
-
1
];
memset
(
s
->
output
+
1024
+
576
,
0
,
sizeof
(
s
->
output
[
0
])
*
448
);
output
[
i
+
1024
]
=
audio
[
i
*
chans
]
*
swindow
[
576
-
i
-
1
];
memset
(
output
+
1024
+
576
,
0
,
sizeof
(
output
[
0
])
*
448
);
for
(
i
=
0
;
i
<
1024
;
i
++
)
sce
->
saved
[
i
]
=
audio
[
i
*
chans
];
}
ff_mdct_calc
(
&
s
->
mdct1024
,
sce
->
coeffs
,
s
->
output
);
ff_mdct_calc
(
&
s
->
mdct1024
,
sce
->
coeffs
,
output
);
}
else
{
for
(
k
=
0
;
k
<
1024
;
k
+=
128
)
{
for
(
i
=
448
+
k
;
i
<
448
+
k
+
256
;
i
++
)
s
->
output
[
i
-
448
-
k
]
=
(
i
<
1024
)
output
[
i
-
448
-
k
]
=
(
i
<
1024
)
?
sce
->
saved
[
i
]
:
audio
[(
i
-
1024
)
*
chans
];
s
->
dsp
.
vector_fmul
(
s
->
output
,
s
->
output
,
k
?
swindow
:
pwindow
,
128
);
s
->
dsp
.
vector_fmul_reverse
(
s
->
output
+
128
,
s
->
output
+
128
,
swindow
,
128
);
ff_mdct_calc
(
&
s
->
mdct128
,
sce
->
coeffs
+
k
,
s
->
output
);
s
->
dsp
.
vector_fmul
(
output
,
output
,
k
?
swindow
:
pwindow
,
128
);
s
->
dsp
.
vector_fmul_reverse
(
output
+
128
,
output
+
128
,
swindow
,
128
);
ff_mdct_calc
(
&
s
->
mdct128
,
sce
->
coeffs
+
k
,
output
);
}
for
(
i
=
0
;
i
<
1024
;
i
++
)
sce
->
saved
[
i
]
=
audio
[
i
*
chans
];
...
...
@@ -597,6 +598,7 @@ static int aac_encode_frame(AVCodecContext *avctx,
}
for
(
j
=
0
;
j
<
chans
;
j
++
)
{
s
->
cur_channel
=
start_ch
+
j
;
s
->
scoefs
=
cpe
->
ch
[
j
].
ret
;
encode_individual_channel
(
avctx
,
s
,
&
cpe
->
ch
[
j
],
cpe
->
common_window
);
}
start_ch
+=
chans
;
...
...
libavcodec/aacenc.h
浏览文件 @
2790d7a9
...
...
@@ -52,8 +52,7 @@ typedef struct AACEncContext {
FFTContext
mdct1024
;
///< long (1024 samples) frame transform context
FFTContext
mdct128
;
///< short (128 samples) frame transform context
DSPContext
dsp
;
DECLARE_ALIGNED
(
16
,
FFTSample
,
output
)[
2048
];
///< temporary buffer for MDCT input coefficients
int16_t
*
samples
;
///< saved preprocessed input
int16_t
*
samples
;
///< saved preprocessed input
int
samplerate_index
;
///< MPEG-4 samplerate index
...
...
@@ -64,8 +63,8 @@ typedef struct AACEncContext {
int
cur_channel
;
int
last_frame
;
float
lambda
;
float
*
scoefs
;
///< scaled coefficients
DECLARE_ALIGNED
(
16
,
int
,
qcoefs
)[
96
];
///< quantized coefficients
DECLARE_ALIGNED
(
16
,
float
,
scoefs
)[
1024
];
///< scaled coefficients
}
AACEncContext
;
#endif
/* AVCODEC_AACENC_H */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录