Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
a5e3b0c1
Commit
a5e3b0c1
authored
Jul 17, 2017
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/vf_maskedmerge: move to "activate" design.
parent
62060846
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
21 deletions
+12
-21
Makefile
libavfilter/Makefile
+1
-1
maskedmerge.h
libavfilter/maskedmerge.h
+1
-1
vf_maskedmerge.c
libavfilter/vf_maskedmerge.c
+10
-19
No files found.
libavfilter/Makefile
View file @
a5e3b0c1
...
...
@@ -226,7 +226,7 @@ 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_MASKEDMERGE_FILTER)
+=
vf_maskedmerge.o
framesync.o
OBJS-$(CONFIG_MASKEDMERGE_FILTER)
+=
vf_maskedmerge.o
framesync
2
.o
OBJS-$(CONFIG_MCDEINT_FILTER)
+=
vf_mcdeint.o
OBJS-$(CONFIG_MERGEPLANES_FILTER)
+=
vf_mergeplanes.o
framesync.o
OBJS-$(CONFIG_MESTIMATE_FILTER)
+=
vf_mestimate.o
motion_estimation.o
...
...
libavfilter/maskedmerge.h
View file @
a5e3b0c1
...
...
@@ -22,7 +22,7 @@
#define AVFILTER_MASKEDMERGE_H
#include "avfilter.h"
#include "framesync.h"
#include "framesync
2
.h"
typedef
struct
MaskedMergeContext
{
const
AVClass
*
class
;
...
...
libavfilter/vf_maskedmerge.c
View file @
a5e3b0c1
...
...
@@ -71,9 +71,9 @@ static int process_frame(FFFrameSync *fs)
AVFrame
*
out
,
*
base
,
*
overlay
,
*
mask
;
int
ret
;
if
((
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
0
,
&
base
,
0
))
<
0
||
(
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
1
,
&
overlay
,
0
))
<
0
||
(
ret
=
ff_framesync_get_frame
(
&
s
->
fs
,
2
,
&
mask
,
0
))
<
0
)
if
((
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
0
,
&
base
,
0
))
<
0
||
(
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
1
,
&
overlay
,
0
))
<
0
||
(
ret
=
ff_framesync
2
_get_frame
(
&
s
->
fs
,
2
,
&
mask
,
0
))
<
0
)
return
ret
;
if
(
ctx
->
is_disabled
)
{
...
...
@@ -232,7 +232,7 @@ static int config_output(AVFilterLink *outlink)
if
((
ret
=
av_image_fill_linesizes
(
s
->
linesize
,
outlink
->
format
,
outlink
->
w
))
<
0
)
return
ret
;
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
;
...
...
@@ -251,44 +251,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
)
{
MaskedMergeContext
*
s
=
inlink
->
dst
->
priv
;
return
ff_framesync_filter_frame
(
&
s
->
fs
,
inlink
,
buf
);
}
static
int
request_frame
(
AVFilterLink
*
outlink
)
{
MaskedMergeContext
*
s
=
outlink
->
src
->
priv
;
return
ff_framesync_request_frame
(
&
s
->
fs
,
outlink
);
MaskedMergeContext
*
s
=
ctx
->
priv
;
return
ff_framesync2_activate
(
&
s
->
fs
);
}
static
av_cold
void
uninit
(
AVFilterContext
*
ctx
)
{
MaskedMergeContext
*
s
=
ctx
->
priv
;
ff_framesync_uninit
(
&
s
->
fs
);
ff_framesync
2
_uninit
(
&
s
->
fs
);
}
static
const
AVFilterPad
maskedmerge_inputs
[]
=
{
{
.
name
=
"base"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
.
config_props
=
config_input
,
},
{
.
name
=
"overlay"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
},
{
.
name
=
"mask"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
filter_frame
=
filter_frame
,
},
{
NULL
}
};
...
...
@@ -298,7 +289,6 @@ static const AVFilterPad maskedmerge_outputs[] = {
.
name
=
"default"
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
config_props
=
config_output
,
.
request_frame
=
request_frame
,
},
{
NULL
}
};
...
...
@@ -309,6 +299,7 @@ AVFilter ff_vf_maskedmerge = {
.
priv_size
=
sizeof
(
MaskedMergeContext
),
.
uninit
=
uninit
,
.
query_formats
=
query_formats
,
.
activate
=
activate
,
.
inputs
=
maskedmerge_inputs
,
.
outputs
=
maskedmerge_outputs
,
.
priv_class
=
&
maskedmerge_class
,
...
...
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