Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
34610e11
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,发现更多精彩内容 >>
提交
34610e11
编写于
4月 10, 2013
作者:
C
Clément Bœsch
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavfi/curves: switch to an AVOptions-based system.
上级
8da1f1f2
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
23 addition
and
28 deletion
+23
-28
doc/filters.texi
doc/filters.texi
+14
-18
libavfilter/avfilter.c
libavfilter/avfilter.c
+1
-0
libavfilter/vf_curves.c
libavfilter/vf_curves.c
+8
-10
未找到文件。
doc/filters.texi
浏览文件 @
34610e11
...
...
@@ -2369,30 +2369,15 @@ If there is no key point defined in @code{x=0}, the filter will automatically
insert a @var{(0;0)} point. In the same way, if there is no key point defined
in @code{x=1}, the filter will automatically insert a @var{(1;1)} point.
The filter accepts parameters as a list of @var{key}=@var{value}
pairs, separated by ":". If the key of the first options is omitted,
the arguments are interpreted according to the syntax
curves[=@var{preset}].
A description of the accepted parameters follows.
The filter accepts the following options:
@table @option
@item red, r
Set the key points for the red component.
@item green, g
Set the key points for the green component.
@item blue, b
Set the key points for the blue component.
@item all
Set the key points for all components.
Can be used in addition to the other key points component
options. In this case, the unset component(s) will fallback on this
@option{all} setting.
@item preset
Select one of the available color presets. This option can not be used in
addition to the @option{r}, @option{g}, @option{b} parameters.
Available presets are:
@table @samp
@item none
@item color_negative
@item cross_process
@item darker
...
...
@@ -2404,7 +2389,18 @@ Available presets are:
@item strong_contrast
@item vintage
@end table
Default is unset.
Default is @code{none}.
@item red, r
Set the key points for the red component.
@item green, g
Set the key points for the green component.
@item blue, b
Set the key points for the blue component.
@item all
Set the key points for all components.
Can be used in addition to the other key points component
options. In this case, the unset component(s) will fallback on this
@option{all} setting.
@end table
To avoid some filtergraph syntax conflicts, each key points list need to be
...
...
libavfilter/avfilter.c
浏览文件 @
34610e11
...
...
@@ -662,6 +662,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!
strcmp
(
filter
->
filter
->
name
,
"colormatrix"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"crop"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"cropdetect"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"curves"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"delogo"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"drawbox"
)
||
!
strcmp
(
filter
->
filter
->
name
,
"drawtext"
)
||
...
...
libavfilter/vf_curves.c
浏览文件 @
34610e11
...
...
@@ -59,14 +59,8 @@ typedef struct {
#define OFFSET(x) offsetof(CurvesContext, x)
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
static
const
AVOption
curves_options
[]
=
{
{
"red"
,
"set red points coordinates"
,
OFFSET
(
comp_points_str
[
0
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"r"
,
"set red points coordinates"
,
OFFSET
(
comp_points_str
[
0
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"green"
,
"set green points coordinates"
,
OFFSET
(
comp_points_str
[
1
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"g"
,
"set green points coordinates"
,
OFFSET
(
comp_points_str
[
1
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"blue"
,
"set blue points coordinates"
,
OFFSET
(
comp_points_str
[
2
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"b"
,
"set blue points coordinates"
,
OFFSET
(
comp_points_str
[
2
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"all"
,
"set points coordinates for all components"
,
OFFSET
(
comp_points_str_all
),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"preset"
,
"select a color curves preset"
,
OFFSET
(
preset
),
AV_OPT_TYPE_INT
,
{.
i64
=
PRESET_NONE
},
PRESET_NONE
,
NB_PRESETS
-
1
,
FLAGS
,
"preset_name"
},
{
"none"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PRESET_NONE
},
INT_MIN
,
INT_MAX
,
FLAGS
,
"preset_name"
},
{
"color_negative"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PRESET_COLOR_NEGATIVE
},
INT_MIN
,
INT_MAX
,
FLAGS
,
"preset_name"
},
{
"cross_process"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PRESET_CROSS_PROCESS
},
INT_MIN
,
INT_MAX
,
FLAGS
,
"preset_name"
},
{
"darker"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PRESET_DARKER
},
INT_MIN
,
INT_MAX
,
FLAGS
,
"preset_name"
},
...
...
@@ -77,6 +71,13 @@ static const AVOption curves_options[] = {
{
"negative"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PRESET_NEGATIVE
},
INT_MIN
,
INT_MAX
,
FLAGS
,
"preset_name"
},
{
"strong_contrast"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PRESET_STRONG_CONTRAST
},
INT_MIN
,
INT_MAX
,
FLAGS
,
"preset_name"
},
{
"vintage"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PRESET_VINTAGE
},
INT_MIN
,
INT_MAX
,
FLAGS
,
"preset_name"
},
{
"red"
,
"set red points coordinates"
,
OFFSET
(
comp_points_str
[
0
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"r"
,
"set red points coordinates"
,
OFFSET
(
comp_points_str
[
0
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"green"
,
"set green points coordinates"
,
OFFSET
(
comp_points_str
[
1
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"g"
,
"set green points coordinates"
,
OFFSET
(
comp_points_str
[
1
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"blue"
,
"set blue points coordinates"
,
OFFSET
(
comp_points_str
[
2
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"b"
,
"set blue points coordinates"
,
OFFSET
(
comp_points_str
[
2
]),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
"all"
,
"set points coordinates for all components"
,
OFFSET
(
comp_points_str_all
),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
.
flags
=
FLAGS
},
{
NULL
}
};
...
...
@@ -447,8 +448,6 @@ static const AVFilterPad curves_outputs[] = {
{
NULL
}
};
static
const
char
*
const
shorthand
[]
=
{
"preset"
,
NULL
};
AVFilter
avfilter_vf_curves
=
{
.
name
=
"curves"
,
.
description
=
NULL_IF_CONFIG_SMALL
(
"Adjust components curves."
),
...
...
@@ -458,5 +457,4 @@ AVFilter avfilter_vf_curves = {
.
inputs
=
curves_inputs
,
.
outputs
=
curves_outputs
,
.
priv_class
=
&
curves_class
,
.
shorthand
=
shorthand
,
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录