Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
7a6d88ee
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,发现更多精彩内容 >>
提交
7a6d88ee
编写于
10月 10, 2018
作者:
P
Paul B Mahol
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avfilter/af_afir: remove again option, merge it with gtype
上级
a628fa1f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
38 deletion
+39
-38
doc/filters.texi
doc/filters.texi
+5
-4
libavfilter/af_afir.c
libavfilter/af_afir.c
+34
-33
libavfilter/af_afir.h
libavfilter/af_afir.h
+0
-1
未找到文件。
doc/filters.texi
浏览文件 @
7a6d88ee
...
...
@@ -1173,14 +1173,15 @@ Set wet gain. This sets final output gain.
@item length
Set Impulse Response filter length. Default is 1, which means whole IR is processed.
@item again
Enable applying gain measured from power of IR. For approach to use for measuring power
of IR see next option.
@item gtype
Enable applying gain measured from power of IR.
Set which approach to use for auto gain measurement.
@table @option
@item none
Do not apply any gain.
@item peak
select peak gain, very conservative approach. This is default value.
...
...
libavfilter/af_afir.c
浏览文件 @
7a6d88ee
...
...
@@ -335,38 +335,39 @@ static int convert_coeffs(AVFilterContext *ctx)
s
->
gain
=
1
;
if
(
s
->
again
)
{
switch
(
s
->
gtype
)
{
case
0
:
for
(
ch
=
0
;
ch
<
ctx
->
inputs
[
1
]
->
channels
;
ch
++
)
{
float
*
time
=
(
float
*
)
s
->
in
[
1
]
->
extended_data
[
!
s
->
one2many
*
ch
];
for
(
i
=
0
;
i
<
s
->
nb_taps
;
i
++
)
power
+=
FFABS
(
time
[
i
]);
}
s
->
gain
=
ctx
->
inputs
[
1
]
->
channels
/
power
;
break
;
case
1
:
for
(
ch
=
0
;
ch
<
ctx
->
inputs
[
1
]
->
channels
;
ch
++
)
{
float
*
time
=
(
float
*
)
s
->
in
[
1
]
->
extended_data
[
!
s
->
one2many
*
ch
];
for
(
i
=
0
;
i
<
s
->
nb_taps
;
i
++
)
power
+=
time
[
i
];
}
s
->
gain
=
ctx
->
inputs
[
1
]
->
channels
/
power
;
break
;
case
2
:
for
(
ch
=
0
;
ch
<
ctx
->
inputs
[
1
]
->
channels
;
ch
++
)
{
float
*
time
=
(
float
*
)
s
->
in
[
1
]
->
extended_data
[
!
s
->
one2many
*
ch
];
for
(
i
=
0
;
i
<
s
->
nb_taps
;
i
++
)
power
+=
time
[
i
]
*
time
[
i
];
}
s
->
gain
=
sqrtf
(
ch
/
power
);
break
;
default:
return
AVERROR_BUG
;
switch
(
s
->
gtype
)
{
case
-
1
:
/* nothinkg to do */
break
;
case
0
:
for
(
ch
=
0
;
ch
<
ctx
->
inputs
[
1
]
->
channels
;
ch
++
)
{
float
*
time
=
(
float
*
)
s
->
in
[
1
]
->
extended_data
[
!
s
->
one2many
*
ch
];
for
(
i
=
0
;
i
<
s
->
nb_taps
;
i
++
)
power
+=
FFABS
(
time
[
i
]);
}
s
->
gain
=
ctx
->
inputs
[
1
]
->
channels
/
power
;
break
;
case
1
:
for
(
ch
=
0
;
ch
<
ctx
->
inputs
[
1
]
->
channels
;
ch
++
)
{
float
*
time
=
(
float
*
)
s
->
in
[
1
]
->
extended_data
[
!
s
->
one2many
*
ch
];
for
(
i
=
0
;
i
<
s
->
nb_taps
;
i
++
)
power
+=
time
[
i
];
}
s
->
gain
=
ctx
->
inputs
[
1
]
->
channels
/
power
;
break
;
case
2
:
for
(
ch
=
0
;
ch
<
ctx
->
inputs
[
1
]
->
channels
;
ch
++
)
{
float
*
time
=
(
float
*
)
s
->
in
[
1
]
->
extended_data
[
!
s
->
one2many
*
ch
];
for
(
i
=
0
;
i
<
s
->
nb_taps
;
i
++
)
power
+=
time
[
i
]
*
time
[
i
];
}
s
->
gain
=
sqrtf
(
ch
/
power
);
break
;
default:
return
AVERROR_BUG
;
}
s
->
gain
=
FFMIN
(
s
->
gain
*
s
->
ir_gain
,
1
.
f
);
...
...
@@ -738,8 +739,8 @@ static const AVOption afir_options[] = {
{
"dry"
,
"set dry gain"
,
OFFSET
(
dry_gain
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
AF
},
{
"wet"
,
"set wet gain"
,
OFFSET
(
wet_gain
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
AF
},
{
"length"
,
"set IR length"
,
OFFSET
(
length
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
1
,
AF
},
{
"
again"
,
"enable auto gain"
,
OFFSET
(
again
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
1
},
0
,
1
,
AF
},
{
"gtype"
,
"set auto gain type"
,
OFFSET
(
gtype
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
2
,
AF
,
"gtype"
},
{
"
gtype"
,
"set IR auto gain type"
,
OFFSET
(
gtype
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
-
1
,
2
,
AF
,
"gtype"
},
{
"none"
,
"without auto gain"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=-
1
},
0
,
0
,
AF
,
"gtype"
},
{
"peak"
,
"peak gain"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
0
},
0
,
0
,
AF
,
"gtype"
},
{
"dc"
,
"DC gain"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
1
},
0
,
0
,
AF
,
"gtype"
},
{
"gn"
,
"gain to noise"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
2
},
0
,
0
,
AF
,
"gtype"
},
...
...
libavfilter/af_afir.h
浏览文件 @
7a6d88ee
...
...
@@ -38,7 +38,6 @@ typedef struct AudioFIRContext {
float
wet_gain
;
float
dry_gain
;
float
length
;
int
again
;
int
gtype
;
float
ir_gain
;
int
ir_format
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录