Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
27d8af03
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,发现更多精彩内容 >>
提交
27d8af03
编写于
7月 17, 2017
作者:
N
Nicolas George
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavfi/vf_maskedclamp: move to "activate" design.
上级
0bc331bd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
21 deletion
+12
-21
libavfilter/Makefile
libavfilter/Makefile
+1
-1
libavfilter/vf_maskedclamp.c
libavfilter/vf_maskedclamp.c
+11
-20
未找到文件。
libavfilter/Makefile
浏览文件 @
27d8af03
...
...
@@ -225,7 +225,7 @@ OBJS-$(CONFIG_LUT2_FILTER) += vf_lut2.o framesync.o
OBJS-$(CONFIG_LUT3D_FILTER)
+=
vf_lut3d.o
OBJS-$(CONFIG_LUTRGB_FILTER)
+=
vf_lut.o
OBJS-$(CONFIG_LUTYUV_FILTER)
+=
vf_lut.o
OBJS-$(CONFIG_MASKEDCLAMP_FILTER)
+=
vf_maskedclamp.o framesync.o
OBJS-$(CONFIG_MASKEDCLAMP_FILTER)
+=
vf_maskedclamp.o framesync
2
.o
OBJS-$(CONFIG_MASKEDMERGE_FILTER)
+=
vf_maskedmerge.o framesync2.o
OBJS-$(CONFIG_MCDEINT_FILTER)
+=
vf_mcdeint.o
OBJS-$(CONFIG_MERGEPLANES_FILTER)
+=
vf_mergeplanes.o framesync2.o
...
...
libavfilter/vf_maskedclamp.c
浏览文件 @
27d8af03
...
...
@@ -25,7 +25,7 @@
#include "formats.h"
#include "internal.h"
#include "video.h"
#include "framesync.h"
#include "framesync
2
.h"
#define OFFSET(x) offsetof(MaskedClampContext, x)
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
...
...
@@ -93,9 +93,9 @@ static int process_frame(FFFrameSync *fs)
AVFrame
*
out
,
*
base
,
*
dark
,
*
bright
;
int
ret
;
if
((
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
0
,
&
base
,
0
))
<
0
||
(
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
1
,
&
dark
,
0
))
<
0
||
(
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
2
,
&
bright
,
0
))
<
0
)
if
((
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
0
,
&
base
,
0
))
<
0
||
(
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
1
,
&
dark
,
0
))
<
0
||
(
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
2
,
&
bright
,
0
))
<
0
)
return
ret
;
if
(
ctx
->
is_disabled
)
{
...
...
@@ -265,7 +265,7 @@ static int config_output(AVFilterLink *outlink)
outlink
->
sample_aspect_ratio
=
base
->
sample_aspect_ratio
;
outlink
->
frame_rate
=
base
->
frame_rate
;
if
((
ret
=
ff_framesync_init
(
&
s
->
fs
,
ctx
,
3
))
<
0
)
if
((
ret
=
ff_framesync
2
_init
(
&
s
->
fs
,
ctx
,
3
))
<
0
)
return
ret
;
in
=
s
->
fs
.
in
;
...
...
@@ -284,44 +284,35 @@ static int config_output(AVFilterLink *outlink)
s
->
fs
.
opaque
=
s
;
s
->
fs
.
on_event
=
process_frame
;
return
ff_framesync_configure
(
&
s
->
fs
);
return
ff_framesync
2
_configure
(
&
s
->
fs
);
}
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
buf
)
static
int
activate
(
AVFilterContext
*
ctx
)
{
MaskedClampContext
*
s
=
inlink
->
dst
->
priv
;
return
ff_framesync_filter_frame
(
&
s
->
fs
,
inlink
,
buf
);
}
static
int
request_frame
(
AVFilterLink
*
outlink
)
{
MaskedClampContext
*
s
=
outlink
->
src
->
priv
;
return
ff_framesync_request_frame
(
&
s
->
fs
,
outlink
);
MaskedClampContext
*
s
=
ctx
->
priv
;
return
ff_framesync2_activate
(
&
s
->
fs
);
}
static
av_cold
void
uninit
(
AVFilterContext
*
ctx
)
{
MaskedClampContext
*
s
=
ctx
->
priv
;
ff_framesync_uninit
(
&
s
->
fs
);
ff_framesync
2
_uninit
(
&
s
->
fs
);
}
static
const
AVFilterPad
maskedclamp_inputs
[]
=
{
{
.
name
=
"base"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
.
config_props
=
config_input
,
},
{
.
name
=
"dark"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
},
{
.
name
=
"bright"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
},
{
NULL
}
};
...
...
@@ -331,7 +322,6 @@ static const AVFilterPad maskedclamp_outputs[] = {
.
name
=
"default"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
config_props
=
config_output
,
.
request_frame
=
request_frame
,
},
{
NULL
}
};
...
...
@@ -341,6 +331,7 @@ AVFilter ff_vf_maskedclamp = {
.
description
=
NULL_IF_CONFIG_SMALL
(
"Clamp first stream with second stream and third stream."
),
.
priv_size
=
sizeof
(
MaskedClampContext
),
.
uninit
=
uninit
,
.
activate
=
activate
,
.
query_formats
=
query_formats
,
.
inputs
=
maskedclamp_inputs
,
.
outputs
=
maskedclamp_outputs
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录