Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
0a275fec
Commit
0a275fec
authored
Jan 30, 2020
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_xfade: add radial transition
parent
b99ed6e4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
0 deletions
+32
-0
filters.texi
doc/filters.texi
+1
-0
vf_xfade.c
libavfilter/vf_xfade.c
+31
-0
No files found.
doc/filters.texi
View file @
0a275fec
...
...
@@ -20060,6 +20060,7 @@ Set one of available transition effects:
@
item
distance
@
item
fadeblack
@
item
fadewhite
@
item
radial
@
end
table
Default
transition
effect
is
fade
.
...
...
libavfilter/vf_xfade.c
View file @
0a275fec
...
...
@@ -45,6 +45,7 @@ enum XFadeTransitions {
DISTANCE
,
FADEBLACK
,
FADEWHITE
,
RADIAL
,
NB_TRANSITIONS
,
};
...
...
@@ -141,6 +142,7 @@ static const AVOption xfade_options[] = {
{
"distance"
,
"distance transition"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
DISTANCE
},
0
,
0
,
FLAGS
,
"transition"
},
{
"fadeblack"
,
"fadeblack transition"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FADEBLACK
},
0
,
0
,
FLAGS
,
"transition"
},
{
"fadewhite"
,
"fadewhite transition"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FADEWHITE
},
0
,
0
,
FLAGS
,
"transition"
},
{
"radial"
,
"radial transition"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
RADIAL
},
0
,
0
,
FLAGS
,
"transition"
},
{
"duration"
,
"set cross fade duration"
,
OFFSET
(
duration
),
AV_OPT_TYPE_DURATION
,
{.
i64
=
1000000
},
0
,
60000000
,
FLAGS
},
{
"offset"
,
"set cross fade start relative to first input stream"
,
OFFSET
(
offset
),
AV_OPT_TYPE_DURATION
,
{.
i64
=
0
},
INT64_MIN
,
INT64_MAX
,
FLAGS
},
{
"expr"
,
"set expression for custom transition"
,
OFFSET
(
custom_str
),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
0
,
0
,
FLAGS
},
...
...
@@ -649,6 +651,34 @@ static void fadewhite##name##_transition(AVFilterContext *ctx,
FADEWHITE_TRANSITION
(
8
,
uint8_t
,
1
)
FADEWHITE_TRANSITION
(
16
,
uint16_t
,
2
)
#define RADIAL_TRANSITION(name, type, div) \
static void radial##name##_transition(AVFilterContext *ctx, \
const AVFrame *a, const AVFrame *b, AVFrame *out, \
float progress, \
int slice_start, int slice_end, int jobnr) \
{ \
XFadeContext *s = ctx->priv; \
const int width = out->width; \
const int height = out->height; \
\
for (int y = slice_start; y < slice_end; y++) { \
for (int x = 0; x < width; x++) { \
const float smooth = atan2f(x - width / 2, y - height / 2) - \
(progress - 0.5f) * (M_PI * 2.5f); \
for (int p = 0; p < s->nb_planes; p++) { \
const type *xf0 = (const type *)(a->data[p] + y * a->linesize[p]); \
const type *xf1 = (const type *)(b->data[p] + y * b->linesize[p]); \
type *dst = (type *)(out->data[p] + y * out->linesize[p]); \
\
dst[x] = mix(xf1[x], xf0[x], smoothstep(0.f, 1.f, smooth)); \
} \
} \
} \
}
RADIAL_TRANSITION
(
8
,
uint8_t
,
1
)
RADIAL_TRANSITION
(
16
,
uint16_t
,
2
)
static
inline
double
getpix
(
void
*
priv
,
double
x
,
double
y
,
int
plane
,
int
nb
)
{
XFadeContext
*
s
=
priv
;
...
...
@@ -754,6 +784,7 @@ static int config_output(AVFilterLink *outlink)
case
DISTANCE
:
s
->
transitionf
=
s
->
depth
<=
8
?
distance8_transition
:
distance16_transition
;
break
;
case
FADEBLACK
:
s
->
transitionf
=
s
->
depth
<=
8
?
fadeblack8_transition
:
fadeblack16_transition
;
break
;
case
FADEWHITE
:
s
->
transitionf
=
s
->
depth
<=
8
?
fadewhite8_transition
:
fadewhite16_transition
;
break
;
case
RADIAL
:
s
->
transitionf
=
s
->
depth
<=
8
?
radial8_transition
:
radial16_transition
;
break
;
}
if
(
s
->
transition
==
CUSTOM
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment