Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
d07e25de
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,发现更多精彩内容 >>
提交
d07e25de
编写于
7月 17, 2017
作者:
N
Nicolas George
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavfi/vf_threshold: move to "activate" design.
Also fix missing dependency.
上级
0dd8320e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
23 deletion
+13
-23
libavfilter/Makefile
libavfilter/Makefile
+1
-1
libavfilter/vf_threshold.c
libavfilter/vf_threshold.c
+12
-22
未找到文件。
libavfilter/Makefile
浏览文件 @
d07e25de
...
...
@@ -308,7 +308,7 @@ OBJS-$(CONFIG_SWAPRECT_FILTER) += vf_swaprect.o
OBJS-$(CONFIG_SWAPUV_FILTER)
+=
vf_swapuv.o
OBJS-$(CONFIG_TBLEND_FILTER)
+=
vf_blend.o dualinput.o framesync.o
OBJS-$(CONFIG_TELECINE_FILTER)
+=
vf_telecine.o
OBJS-$(CONFIG_THRESHOLD_FILTER)
+=
vf_threshold.o
OBJS-$(CONFIG_THRESHOLD_FILTER)
+=
vf_threshold.o
framesync2.o
OBJS-$(CONFIG_THUMBNAIL_FILTER)
+=
vf_thumbnail.o
OBJS-$(CONFIG_TILE_FILTER)
+=
vf_tile.o
OBJS-$(CONFIG_TINTERLACE_FILTER)
+=
vf_tinterlace.o
...
...
libavfilter/vf_threshold.c
浏览文件 @
d07e25de
...
...
@@ -28,7 +28,7 @@
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
#include "framesync.h"
#include "framesync
2
.h"
#include "internal.h"
#include "video.h"
...
...
@@ -96,10 +96,10 @@ static int process_frame(FFFrameSync *fs)
AVFrame
*
out
,
*
in
,
*
threshold
,
*
min
,
*
max
;
int
ret
;
if
((
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
0
,
&
in
,
0
))
<
0
||
(
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
1
,
&
threshold
,
0
))
<
0
||
(
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
2
,
&
min
,
0
))
<
0
||
(
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
3
,
&
max
,
0
))
<
0
)
if
((
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
0
,
&
in
,
0
))
<
0
||
(
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
1
,
&
threshold
,
0
))
<
0
||
(
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
2
,
&
min
,
0
))
<
0
||
(
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
3
,
&
max
,
0
))
<
0
)
return
ret
;
if
(
ctx
->
is_disabled
)
{
...
...
@@ -256,7 +256,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
,
4
))
<
0
)
if
((
ret
=
ff_framesync
2
_init
(
&
s
->
fs
,
ctx
,
4
))
<
0
)
return
ret
;
in
=
s
->
fs
.
in
;
...
...
@@ -279,49 +279,39 @@ 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
)
{
ThresholdContext
*
s
=
inlink
->
dst
->
priv
;
return
ff_framesync_filter_frame
(
&
s
->
fs
,
inlink
,
buf
);
}
static
int
request_frame
(
AVFilterLink
*
outlink
)
{
ThresholdContext
*
s
=
outlink
->
src
->
priv
;
return
ff_framesync_request_frame
(
&
s
->
fs
,
outlink
);
ThresholdContext
*
s
=
ctx
->
priv
;
return
ff_framesync2_activate
(
&
s
->
fs
);
}
static
av_cold
void
uninit
(
AVFilterContext
*
ctx
)
{
ThresholdContext
*
s
=
ctx
->
priv
;
ff_framesync_uninit
(
&
s
->
fs
);
ff_framesync
2
_uninit
(
&
s
->
fs
);
}
static
const
AVFilterPad
inputs
[]
=
{
{
.
name
=
"default"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
.
config_props
=
config_input
,
},
{
.
name
=
"threshold"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
},
{
.
name
=
"min"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
},
{
.
name
=
"max"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
},
{
NULL
}
};
...
...
@@ -331,7 +321,6 @@ static const AVFilterPad outputs[] = {
.
name
=
"default"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
config_props
=
config_output
,
.
request_frame
=
request_frame
,
},
{
NULL
}
};
...
...
@@ -343,6 +332,7 @@ AVFilter ff_vf_threshold = {
.
priv_class
=
&
threshold_class
,
.
uninit
=
uninit
,
.
query_formats
=
query_formats
,
.
activate
=
activate
,
.
inputs
=
inputs
,
.
outputs
=
outputs
,
.
flags
=
AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录