Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
548ef7a1
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,发现更多精彩内容 >>
提交
548ef7a1
编写于
6月 02, 2020
作者:
L
Limin Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avfilter: add D2TS, TS2D, TS2T as a common macro in internal.h
Signed-off-by:
N
Limin Wang
<
lance.lmwang@gmail.com
>
上级
04172d23
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
4 addition
and
29 deletion
+4
-29
libavfilter/aeval.c
libavfilter/aeval.c
+0
-2
libavfilter/af_volume.c
libavfilter/af_volume.c
+0
-4
libavfilter/f_select.c
libavfilter/f_select.c
+0
-3
libavfilter/f_sendcmd.c
libavfilter/f_sendcmd.c
+0
-3
libavfilter/internal.h
libavfilter/internal.h
+4
-0
libavfilter/setpts.c
libavfilter/setpts.c
+0
-4
libavfilter/vf_delogo.c
libavfilter/vf_delogo.c
+0
-1
libavfilter/vf_eq.c
libavfilter/vf_eq.c
+0
-2
libavfilter/vf_hue.c
libavfilter/vf_hue.c
+0
-3
libavfilter/vf_rotate.c
libavfilter/vf_rotate.c
+0
-2
libavfilter/vf_scale.c
libavfilter/vf_scale.c
+0
-2
libavfilter/vf_vignette.c
libavfilter/vf_vignette.c
+0
-3
未找到文件。
libavfilter/aeval.c
浏览文件 @
548ef7a1
...
@@ -416,8 +416,6 @@ static int aeval_config_output(AVFilterLink *outlink)
...
@@ -416,8 +416,6 @@ static int aeval_config_output(AVFilterLink *outlink)
return
0
;
return
0
;
}
}
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb))
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
in
)
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
in
)
{
{
EvalContext
*
eval
=
inlink
->
dst
->
priv
;
EvalContext
*
eval
=
inlink
->
dst
->
priv
;
...
...
libavfilter/af_volume.c
浏览文件 @
548ef7a1
...
@@ -335,10 +335,6 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar
...
@@ -335,10 +335,6 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar
return
ret
;
return
ret
;
}
}
#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb))
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
buf
)
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
buf
)
{
{
AVFilterContext
*
ctx
=
inlink
->
dst
;
AVFilterContext
*
ctx
=
inlink
->
dst
;
...
...
libavfilter/f_select.c
浏览文件 @
548ef7a1
...
@@ -325,9 +325,6 @@ static double get_concatdec_select(AVFrame *frame, int64_t pts)
...
@@ -325,9 +325,6 @@ static double get_concatdec_select(AVFrame *frame, int64_t pts)
return
NAN
;
return
NAN
;
}
}
#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
static
void
select_frame
(
AVFilterContext
*
ctx
,
AVFrame
*
frame
)
static
void
select_frame
(
AVFilterContext
*
ctx
,
AVFrame
*
frame
)
{
{
SelectContext
*
select
=
ctx
->
priv
;
SelectContext
*
select
=
ctx
->
priv
;
...
...
libavfilter/f_sendcmd.c
浏览文件 @
548ef7a1
...
@@ -475,9 +475,6 @@ static av_cold void uninit(AVFilterContext *ctx)
...
@@ -475,9 +475,6 @@ static av_cold void uninit(AVFilterContext *ctx)
av_freep
(
&
s
->
intervals
);
av_freep
(
&
s
->
intervals
);
}
}
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb))
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
ref
)
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
ref
)
{
{
AVFilterContext
*
ctx
=
inlink
->
dst
;
AVFilterContext
*
ctx
=
inlink
->
dst
;
...
...
libavfilter/internal.h
浏览文件 @
548ef7a1
...
@@ -234,6 +234,10 @@ void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts
...
@@ -234,6 +234,10 @@ void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts
void
ff_command_queue_pop
(
AVFilterContext
*
filter
);
void
ff_command_queue_pop
(
AVFilterContext
*
filter
);
#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))
/* misc trace functions */
/* misc trace functions */
#define FF_TPRINTF_START(ctx, func) ff_tlog(NULL, "%-16s: ", #func)
#define FF_TPRINTF_START(ctx, func) ff_tlog(NULL, "%-16s: ", #func)
...
...
libavfilter/setpts.c
浏览文件 @
548ef7a1
...
@@ -142,10 +142,6 @@ static int config_input(AVFilterLink *inlink)
...
@@ -142,10 +142,6 @@ static int config_input(AVFilterLink *inlink)
return
0
;
return
0
;
}
}
#define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb))
#define BUF_SIZE 64
#define BUF_SIZE 64
static
inline
char
*
double2int64str
(
char
*
buf
,
double
v
)
static
inline
char
*
double2int64str
(
char
*
buf
,
double
v
)
...
...
libavfilter/vf_delogo.c
浏览文件 @
548ef7a1
...
@@ -55,7 +55,6 @@ enum var_name {
...
@@ -55,7 +55,6 @@ enum var_name {
VAR_T
,
VAR_T
,
VAR_VARS_NB
VAR_VARS_NB
};
};
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))
static
int
set_expr
(
AVExpr
**
pexpr
,
const
char
*
expr
,
const
char
*
option
,
void
*
log_ctx
)
static
int
set_expr
(
AVExpr
**
pexpr
,
const
char
*
expr
,
const
char
*
option
,
void
*
log_ctx
)
{
{
...
...
libavfilter/vf_eq.c
浏览文件 @
548ef7a1
...
@@ -249,8 +249,6 @@ static int query_formats(AVFilterContext *ctx)
...
@@ -249,8 +249,6 @@ static int query_formats(AVFilterContext *ctx)
return
ff_set_common_formats
(
ctx
,
fmts_list
);
return
ff_set_common_formats
(
ctx
,
fmts_list
);
}
}
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
in
)
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
in
)
{
{
AVFilterContext
*
ctx
=
inlink
->
dst
;
AVFilterContext
*
ctx
=
inlink
->
dst
;
...
...
libavfilter/vf_hue.c
浏览文件 @
548ef7a1
...
@@ -363,9 +363,6 @@ static void apply_lut10(HueContext *s,
...
@@ -363,9 +363,6 @@ static void apply_lut10(HueContext *s,
}
}
}
}
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
inpic
)
static
int
filter_frame
(
AVFilterLink
*
inlink
,
AVFrame
*
inpic
)
{
{
HueContext
*
hue
=
inlink
->
dst
->
priv
;
HueContext
*
hue
=
inlink
->
dst
->
priv
;
...
...
libavfilter/vf_rotate.c
浏览文件 @
548ef7a1
...
@@ -415,8 +415,6 @@ static av_always_inline void simple_rotate(uint8_t *dst, const uint8_t *src, int
...
@@ -415,8 +415,6 @@ static av_always_inline void simple_rotate(uint8_t *dst, const uint8_t *src, int
}
}
}
}
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)*av_q2d(tb))
static
int
filter_slice
(
AVFilterContext
*
ctx
,
void
*
arg
,
int
job
,
int
nb_jobs
)
static
int
filter_slice
(
AVFilterContext
*
ctx
,
void
*
arg
,
int
job
,
int
nb_jobs
)
{
{
ThreadData
*
td
=
arg
;
ThreadData
*
td
=
arg
;
...
...
libavfilter/vf_scale.c
浏览文件 @
548ef7a1
...
@@ -647,8 +647,6 @@ static int scale_slice(AVFilterLink *link, AVFrame *out_buf, AVFrame *cur_pic, s
...
@@ -647,8 +647,6 @@ static int scale_slice(AVFilterLink *link, AVFrame *out_buf, AVFrame *cur_pic, s
out
,
out_stride
);
out
,
out_stride
);
}
}
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))
static
int
scale_frame
(
AVFilterLink
*
link
,
AVFrame
*
in
,
AVFrame
**
frame_out
)
static
int
scale_frame
(
AVFilterLink
*
link
,
AVFrame
*
in
,
AVFrame
**
frame_out
)
{
{
AVFilterContext
*
ctx
=
link
->
dst
;
AVFilterContext
*
ctx
=
link
->
dst
;
...
...
libavfilter/vf_vignette.c
浏览文件 @
548ef7a1
...
@@ -155,9 +155,6 @@ static double get_natural_factor(const VignetteContext *s, int x, int y)
...
@@ -155,9 +155,6 @@ static double get_natural_factor(const VignetteContext *s, int x, int y)
}
}
}
}
#define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
#define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb))
static
void
update_context
(
VignetteContext
*
s
,
AVFilterLink
*
inlink
,
AVFrame
*
frame
)
static
void
update_context
(
VignetteContext
*
s
,
AVFilterLink
*
inlink
,
AVFrame
*
frame
)
{
{
int
x
,
y
;
int
x
,
y
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录