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
12f997d0
Commit
12f997d0
authored
Aug 22, 2016
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter: add maskedclamp filter
parent
3c36d960
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
370 additions
and
1 deletion
+370
-1
Changelog
Changelog
+1
-0
filters.texi
doc/filters.texi
+21
-0
Makefile
libavfilter/Makefile
+1
-0
allfilters.c
libavfilter/allfilters.c
+1
-0
version.h
libavfilter/version.h
+1
-1
vf_maskedclamp.c
libavfilter/vf_maskedclamp.c
+345
-0
No files found.
Changelog
View file @
12f997d0
...
@@ -18,6 +18,7 @@ version <next>:
...
@@ -18,6 +18,7 @@ version <next>:
- bitplanenoise video filter
- bitplanenoise video filter
- floating point support in als decoder
- floating point support in als decoder
- fifo muxer
- fifo muxer
- maskedclamp filter
version 3.1:
version 3.1:
...
...
doc/filters.texi
View file @
12f997d0
...
@@ -9234,6 +9234,27 @@ lutyuv=u='(val-maxval/2)*2+maxval/2':v='(val-maxval/2)*2+maxval/2'
...
@@ -9234,6 +9234,27 @@ lutyuv=u='(val-maxval/2)*2+maxval/2':v='(val-maxval/2)*2+maxval/2'
@end example
@end example
@end itemize
@end itemize
@section maskedclamp
Clamp the first input stream with the second input and third input stream.
Returns the value of first stream to be between second input
stream - @code{undershoot} and third input stream + @code{overshoot}.
This filter accepts the following options:
@table @option
@item undershoot
Default value is @code{0}.
@item overshoot
Default value is @code{0}.
@item planes
Set which planes will be processed as bitmap, unprocessed planes will be
copied from first stream.
By default value 0xf, all planes will be processed.
@end table
@section maskedmerge
@section maskedmerge
Merge the first input stream with the second input stream using per pixel
Merge the first input stream with the second input stream using per pixel
...
...
libavfilter/Makefile
View file @
12f997d0
...
@@ -207,6 +207,7 @@ OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o
...
@@ -207,6 +207,7 @@ OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o
OBJS-$(CONFIG_LUT3D_FILTER)
+=
vf_lut3d.o
OBJS-$(CONFIG_LUT3D_FILTER)
+=
vf_lut3d.o
OBJS-$(CONFIG_LUTRGB_FILTER)
+=
vf_lut.o
OBJS-$(CONFIG_LUTRGB_FILTER)
+=
vf_lut.o
OBJS-$(CONFIG_LUTYUV_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.o
OBJS-$(CONFIG_MCDEINT_FILTER)
+=
vf_mcdeint.o
OBJS-$(CONFIG_MCDEINT_FILTER)
+=
vf_mcdeint.o
OBJS-$(CONFIG_MERGEPLANES_FILTER)
+=
vf_mergeplanes.o
framesync.o
OBJS-$(CONFIG_MERGEPLANES_FILTER)
+=
vf_mergeplanes.o
framesync.o
...
...
libavfilter/allfilters.c
View file @
12f997d0
...
@@ -224,6 +224,7 @@ void avfilter_register_all(void)
...
@@ -224,6 +224,7 @@ void avfilter_register_all(void)
REGISTER_FILTER
(
LUT3D
,
lut3d
,
vf
);
REGISTER_FILTER
(
LUT3D
,
lut3d
,
vf
);
REGISTER_FILTER
(
LUTRGB
,
lutrgb
,
vf
);
REGISTER_FILTER
(
LUTRGB
,
lutrgb
,
vf
);
REGISTER_FILTER
(
LUTYUV
,
lutyuv
,
vf
);
REGISTER_FILTER
(
LUTYUV
,
lutyuv
,
vf
);
REGISTER_FILTER
(
MASKEDCLAMP
,
maskedclamp
,
vf
);
REGISTER_FILTER
(
MASKEDMERGE
,
maskedmerge
,
vf
);
REGISTER_FILTER
(
MASKEDMERGE
,
maskedmerge
,
vf
);
REGISTER_FILTER
(
MCDEINT
,
mcdeint
,
vf
);
REGISTER_FILTER
(
MCDEINT
,
mcdeint
,
vf
);
REGISTER_FILTER
(
MERGEPLANES
,
mergeplanes
,
vf
);
REGISTER_FILTER
(
MERGEPLANES
,
mergeplanes
,
vf
);
...
...
libavfilter/version.h
View file @
12f997d0
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#include "libavutil/version.h"
#define LIBAVFILTER_VERSION_MAJOR 6
#define LIBAVFILTER_VERSION_MAJOR 6
#define LIBAVFILTER_VERSION_MINOR 5
2
#define LIBAVFILTER_VERSION_MINOR 5
3
#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
...
...
libavfilter/vf_maskedclamp.c
0 → 100644
View file @
12f997d0
This diff is collapsed.
Click to expand it.
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