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
183f3450
Commit
183f3450
authored
Mar 25, 2013
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/curves: support preset shorthand.
parent
dc65d784
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
11 deletions
+15
-11
filters.texi
doc/filters.texi
+10
-2
version.h
libavfilter/version.h
+1
-1
vf_curves.c
libavfilter/vf_curves.c
+3
-7
filter.mak
tests/fate/filter.mak
+1
-1
No files found.
doc/filters.texi
View file @
183f3450
...
...
@@ -2328,8 +2328,10 @@ If there is no key point defined in @code{x=0}, the filter will automatically
insert a @var{(0;0)} point. In the same way, if there is no key point defined
in @code{x=1}, the filter will automatically insert a @var{(1;1)} point.
The filter accepts parameters as a list of @var{key}=@var{value} pairs,
separated by ":".
The filter accepts parameters as a list of @var{key}=@var{value}
pairs, separated by ":". If the key of the first options is omitted,
the arguments are interpreted according to the syntax
curves[=@var{preset}].
A description of the accepted parameters follows.
...
...
@@ -2390,6 +2392,12 @@ The previous example can also be achieved with the associated built-in preset:
@example
curves=preset=vintage
@end example
@item
Or simply:
@example
curves=vintage
@end example
@end itemize
@section decimate
...
...
libavfilter/version.h
View file @
183f3450
...
...
@@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 48
#define LIBAVFILTER_VERSION_MICRO 10
3
#define LIBAVFILTER_VERSION_MICRO 10
4
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
...
...
libavfilter/vf_curves.c
View file @
183f3450
...
...
@@ -287,12 +287,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
CurvesContext
*
curves
=
ctx
->
priv
;
struct
keypoint
*
comp_points
[
NB_COMP
]
=
{
0
};
curves
->
class
=
&
curves_class
;
av_opt_set_defaults
(
curves
);
if
((
ret
=
av_set_options_string
(
curves
,
args
,
"="
,
":"
))
<
0
)
return
ret
;
if
(
curves
->
preset
)
{
char
**
pts
=
curves
->
comp_points_str
;
if
(
pts
[
0
]
||
pts
[
1
]
||
pts
[
2
])
{
...
...
@@ -354,7 +348,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
}
}
av_opt_free
(
curves
);
return
0
;
}
...
...
@@ -424,6 +417,8 @@ static const AVFilterPad curves_outputs[] = {
{
NULL
}
};
static
const
char
*
const
shorthand
[]
=
{
"preset"
,
NULL
};
AVFilter
avfilter_vf_curves
=
{
.
name
=
"curves"
,
.
description
=
NULL_IF_CONFIG_SMALL
(
"Adjust components curves."
),
...
...
@@ -433,4 +428,5 @@ AVFilter avfilter_vf_curves = {
.
inputs
=
curves_inputs
,
.
outputs
=
curves_outputs
,
.
priv_class
=
&
curves_class
,
.
shorthand
=
shorthand
,
};
tests/fate/filter.mak
View file @
183f3450
...
...
@@ -48,7 +48,7 @@ FATE_HQDN3D += fate-filter-hqdn3d
fate-filter-hqdn3d: CMD = framecrc -idct simple -i $(SAMPLES)/smjpeg/scenwin.mjpg -vf perms=random,hqdn3d -an
FATE_FILTER-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILTER) += $(FATE_HQDN3D)
fate-filter-curves: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi -vf perms=random,curves=
preset=
vintage
fate-filter-curves: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi -vf perms=random,curves=vintage
FATE_FILTER-$(call ALLYES, UTVIDEO_DECODER AVI_DEMUXER PERMS_FILTER CURVES_FILTER) += fate-filter-curves
FATE_GRADFUN += fate-filter-gradfun
...
...
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