Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
8d2b4b8c
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,发现更多精彩内容 >>
提交
8d2b4b8c
编写于
9月 02, 2015
作者:
P
Paul B Mahol
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avfilter/vf_drawgraph: add rscroll slide mode
Signed-off-by:
N
Paul B Mahol
<
onemda@gmail.com
>
上级
81f7a257
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
5 deletion
+16
-5
doc/filters.texi
doc/filters.texi
+3
-0
libavfilter/f_drawgraph.c
libavfilter/f_drawgraph.c
+13
-5
未找到文件。
doc/filters.texi
浏览文件 @
8d2b4b8c
...
...
@@ -4496,6 +4496,9 @@ Replace old columns with new ones.
@item scroll
Scroll from right to left.
@item rscroll
Scroll from left to right.
@end table
Default is @code{frame}.
...
...
libavfilter/f_drawgraph.c
浏览文件 @
8d2b4b8c
...
...
@@ -65,10 +65,11 @@ static const AVOption drawgraph_options[] = {
{
"bar"
,
"draw bars"
,
OFFSET
(
mode
),
AV_OPT_TYPE_CONST
,
{.
i64
=
0
},
0
,
0
,
FLAGS
,
"mode"
},
{
"dot"
,
"draw dots"
,
OFFSET
(
mode
),
AV_OPT_TYPE_CONST
,
{.
i64
=
1
},
0
,
0
,
FLAGS
,
"mode"
},
{
"line"
,
"draw lines"
,
OFFSET
(
mode
),
AV_OPT_TYPE_CONST
,
{.
i64
=
2
},
0
,
0
,
FLAGS
,
"mode"
},
{
"slide"
,
"set slide mode"
,
OFFSET
(
slide
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
2
,
FLAGS
,
"slide"
},
{
"slide"
,
"set slide mode"
,
OFFSET
(
slide
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
3
,
FLAGS
,
"slide"
},
{
"frame"
,
"draw new frames"
,
OFFSET
(
slide
),
AV_OPT_TYPE_CONST
,
{.
i64
=
0
},
0
,
0
,
FLAGS
,
"slide"
},
{
"replace"
,
"replace old columns with new"
,
OFFSET
(
slide
),
AV_OPT_TYPE_CONST
,
{.
i64
=
1
},
0
,
0
,
FLAGS
,
"slide"
},
{
"scroll"
,
"scroll from right to left"
,
OFFSET
(
slide
),
AV_OPT_TYPE_CONST
,
{.
i64
=
2
},
0
,
0
,
FLAGS
,
"slide"
},
{
"rscroll"
,
"scroll from left to right"
,
OFFSET
(
slide
),
AV_OPT_TYPE_CONST
,
{.
i64
=
3
},
0
,
0
,
FLAGS
,
"slide"
},
{
"size"
,
"set graph size"
,
OFFSET
(
w
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
"900x256"
},
0
,
0
,
FLAGS
},
{
"s"
,
"set graph size"
,
OFFSET
(
w
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
"900x256"
},
0
,
0
,
FLAGS
},
{
NULL
}
...
...
@@ -181,7 +182,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
fg
=
av_expr_eval
(
s
->
fg_expr
[
i
],
values
,
NULL
);
bg
=
AV_RN32
(
s
->
bg
);
if
(
i
==
0
&&
s
->
x
>=
outlink
->
w
)
{
if
(
i
==
0
&&
(
s
->
x
>=
outlink
->
w
||
s
->
slide
==
3
)
)
{
if
(
s
->
slide
==
0
||
s
->
slide
==
1
)
s
->
x
=
0
;
...
...
@@ -192,6 +193,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
out
->
data
[
0
]
+
j
*
out
->
linesize
[
0
]
+
4
,
(
outlink
->
w
-
1
)
*
4
);
}
}
else
if
(
s
->
slide
==
3
)
{
s
->
x
=
0
;
for
(
j
=
0
;
j
<
outlink
->
h
;
j
++
)
{
memmove
(
out
->
data
[
0
]
+
j
*
out
->
linesize
[
0
]
+
4
,
out
->
data
[
0
]
+
j
*
out
->
linesize
[
0
],
(
outlink
->
w
-
1
)
*
4
);
}
}
else
if
(
s
->
slide
==
0
)
{
clear_image
(
s
,
out
,
outlink
);
}
...
...
@@ -202,7 +210,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
switch
(
s
->
mode
)
{
case
0
:
if
(
i
==
0
&&
(
s
->
slide
==
1
||
s
->
slide
==
2
))
if
(
i
==
0
&&
(
s
->
slide
>
0
))
for
(
j
=
0
;
j
<
outlink
->
h
;
j
++
)
draw_dot
(
bg
,
x
,
j
,
out
);
...
...
@@ -218,7 +226,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
}
break
;
case
1
:
if
(
i
==
0
&&
(
s
->
slide
==
1
||
s
->
slide
==
2
))
if
(
i
==
0
&&
(
s
->
slide
>
0
))
for
(
j
=
0
;
j
<
outlink
->
h
;
j
++
)
draw_dot
(
bg
,
x
,
j
,
out
);
draw_dot
(
fg
,
x
,
y
,
out
);
...
...
@@ -229,7 +237,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
s
->
prev_y
[
i
]
=
y
;
}
if
(
i
==
0
&&
(
s
->
slide
==
1
||
s
->
slide
==
2
))
{
if
(
i
==
0
&&
(
s
->
slide
>
0
))
{
for
(
j
=
0
;
j
<
y
;
j
++
)
draw_dot
(
bg
,
x
,
j
,
out
);
for
(
j
=
outlink
->
h
-
1
;
j
>
y
;
j
--
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录