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
70f4b453
Commit
70f4b453
authored
Sep 06, 2016
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
doc/showspectrum*: Change options order to reflect numeric values.
Fixes ticket #5823.
parent
496d97f4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
filters.texi
doc/filters.texi
+6
-6
avf_showspectrum.c
libavfilter/avf_showspectrum.c
+5
-5
No files found.
doc/filters.texi
View file @
70f4b453
...
@@ -16980,10 +16980,10 @@ It accepts the following values:
...
@@ -16980,10 +16980,10 @@ It accepts the following values:
the samples start again on the left when they reach the right
the samples start again on the left when they reach the right
@item scroll
@item scroll
the samples scroll from right to left
the samples scroll from right to left
@item rscroll
the samples scroll from left to right
@item fullframe
@item fullframe
frames are only produced when the samples reach the right
frames are only produced when the samples reach the right
@item rscroll
the samples scroll from left to right
@end table
@end table
Default value is @code{replace}.
Default value is @code{replace}.
...
@@ -17039,12 +17039,12 @@ linear
...
@@ -17039,12 +17039,12 @@ linear
square root, default
square root, default
@item cbrt
@item cbrt
cubic root
cubic root
@item log
logarithmic
@item 4thrt
@item 4thrt
4th root
4th root
@item 5thrt
@item 5thrt
5th root
5th root
@item log
logarithmic
@end table
@end table
Default value is @samp{sqrt}.
Default value is @samp{sqrt}.
...
@@ -17187,12 +17187,12 @@ linear
...
@@ -17187,12 +17187,12 @@ linear
square root, default
square root, default
@item cbrt
@item cbrt
cubic root
cubic root
@item log
logarithmic
@item 4thrt
@item 4thrt
4th root
4th root
@item 5thrt
@item 5thrt
5th root
5th root
@item log
logarithmic
@end table
@end table
Default value is @samp{log}.
Default value is @samp{log}.
...
...
libavfilter/avf_showspectrum.c
View file @
70f4b453
...
@@ -94,8 +94,8 @@ static const AVOption showspectrum_options[] = {
...
@@ -94,8 +94,8 @@ static const AVOption showspectrum_options[] = {
{
"slide"
,
"set sliding mode"
,
OFFSET
(
sliding
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
NB_SLIDES
-
1
,
FLAGS
,
"slide"
},
{
"slide"
,
"set sliding mode"
,
OFFSET
(
sliding
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
NB_SLIDES
-
1
,
FLAGS
,
"slide"
},
{
"replace"
,
"replace old columns with new"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
REPLACE
},
0
,
0
,
FLAGS
,
"slide"
},
{
"replace"
,
"replace old columns with new"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
REPLACE
},
0
,
0
,
FLAGS
,
"slide"
},
{
"scroll"
,
"scroll from right to left"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
SCROLL
},
0
,
0
,
FLAGS
,
"slide"
},
{
"scroll"
,
"scroll from right to left"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
SCROLL
},
0
,
0
,
FLAGS
,
"slide"
},
{
"rscroll"
,
"scroll from left to right"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
RSCROLL
},
0
,
0
,
FLAGS
,
"slide"
},
{
"fullframe"
,
"return full frames"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FULLFRAME
},
0
,
0
,
FLAGS
,
"slide"
},
{
"fullframe"
,
"return full frames"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FULLFRAME
},
0
,
0
,
FLAGS
,
"slide"
},
{
"rscroll"
,
"scroll from left to right"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
RSCROLL
},
0
,
0
,
FLAGS
,
"slide"
},
{
"mode"
,
"set channel display mode"
,
OFFSET
(
mode
),
AV_OPT_TYPE_INT
,
{.
i64
=
COMBINED
},
COMBINED
,
NB_MODES
-
1
,
FLAGS
,
"mode"
},
{
"mode"
,
"set channel display mode"
,
OFFSET
(
mode
),
AV_OPT_TYPE_INT
,
{.
i64
=
COMBINED
},
COMBINED
,
NB_MODES
-
1
,
FLAGS
,
"mode"
},
{
"combined"
,
"combined mode"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
COMBINED
},
0
,
0
,
FLAGS
,
"mode"
},
{
"combined"
,
"combined mode"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
COMBINED
},
0
,
0
,
FLAGS
,
"mode"
},
{
"separate"
,
"separate mode"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
SEPARATE
},
0
,
0
,
FLAGS
,
"mode"
},
{
"separate"
,
"separate mode"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
SEPARATE
},
0
,
0
,
FLAGS
,
"mode"
},
...
@@ -110,12 +110,12 @@ static const AVOption showspectrum_options[] = {
...
@@ -110,12 +110,12 @@ static const AVOption showspectrum_options[] = {
{
"fruit"
,
"fruit based coloring"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FRUIT
},
0
,
0
,
FLAGS
,
"color"
},
{
"fruit"
,
"fruit based coloring"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FRUIT
},
0
,
0
,
FLAGS
,
"color"
},
{
"cool"
,
"cool based coloring"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
COOL
},
0
,
0
,
FLAGS
,
"color"
},
{
"cool"
,
"cool based coloring"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
COOL
},
0
,
0
,
FLAGS
,
"color"
},
{
"scale"
,
"set display scale"
,
OFFSET
(
scale
),
AV_OPT_TYPE_INT
,
{.
i64
=
SQRT
},
LINEAR
,
NB_SCALES
-
1
,
FLAGS
,
"scale"
},
{
"scale"
,
"set display scale"
,
OFFSET
(
scale
),
AV_OPT_TYPE_INT
,
{.
i64
=
SQRT
},
LINEAR
,
NB_SCALES
-
1
,
FLAGS
,
"scale"
},
{
"lin"
,
"linear"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LINEAR
},
0
,
0
,
FLAGS
,
"scale"
},
{
"sqrt"
,
"square root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
SQRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"sqrt"
,
"square root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
SQRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"cbrt"
,
"cubic root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
CBRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"cbrt"
,
"cubic root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
CBRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"log"
,
"logarithmic"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LOG
},
0
,
0
,
FLAGS
,
"scale"
},
{
"4thrt"
,
"4th root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FOURTHRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"4thrt"
,
"4th root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FOURTHRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"5thrt"
,
"5th root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FIFTHRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"5thrt"
,
"5th root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FIFTHRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"log"
,
"logarithmic"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LOG
},
0
,
0
,
FLAGS
,
"scale"
},
{
"lin"
,
"linear"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LINEAR
},
0
,
0
,
FLAGS
,
"scale"
},
{
"saturation"
,
"color saturation multiplier"
,
OFFSET
(
saturation
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
-
10
,
10
,
FLAGS
},
{
"saturation"
,
"color saturation multiplier"
,
OFFSET
(
saturation
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
-
10
,
10
,
FLAGS
},
{
"win_func"
,
"set window function"
,
OFFSET
(
win_func
),
AV_OPT_TYPE_INT
,
{.
i64
=
WFUNC_HANNING
},
0
,
NB_WFUNC
-
1
,
FLAGS
,
"win_func"
},
{
"win_func"
,
"set window function"
,
OFFSET
(
win_func
),
AV_OPT_TYPE_INT
,
{.
i64
=
WFUNC_HANNING
},
0
,
NB_WFUNC
-
1
,
FLAGS
,
"win_func"
},
{
"rect"
,
"Rectangular"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
WFUNC_RECT
},
0
,
0
,
FLAGS
,
"win_func"
},
{
"rect"
,
"Rectangular"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
WFUNC_RECT
},
0
,
0
,
FLAGS
,
"win_func"
},
...
@@ -944,12 +944,12 @@ static const AVOption showspectrumpic_options[] = {
...
@@ -944,12 +944,12 @@ static const AVOption showspectrumpic_options[] = {
{
"fruit"
,
"fruit based coloring"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FRUIT
},
0
,
0
,
FLAGS
,
"color"
},
{
"fruit"
,
"fruit based coloring"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FRUIT
},
0
,
0
,
FLAGS
,
"color"
},
{
"cool"
,
"cool based coloring"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
COOL
},
0
,
0
,
FLAGS
,
"color"
},
{
"cool"
,
"cool based coloring"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
COOL
},
0
,
0
,
FLAGS
,
"color"
},
{
"scale"
,
"set display scale"
,
OFFSET
(
scale
),
AV_OPT_TYPE_INT
,
{.
i64
=
LOG
},
0
,
NB_SCALES
-
1
,
FLAGS
,
"scale"
},
{
"scale"
,
"set display scale"
,
OFFSET
(
scale
),
AV_OPT_TYPE_INT
,
{.
i64
=
LOG
},
0
,
NB_SCALES
-
1
,
FLAGS
,
"scale"
},
{
"lin"
,
"linear"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LINEAR
},
0
,
0
,
FLAGS
,
"scale"
},
{
"sqrt"
,
"square root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
SQRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"sqrt"
,
"square root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
SQRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"cbrt"
,
"cubic root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
CBRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"cbrt"
,
"cubic root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
CBRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"log"
,
"logarithmic"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LOG
},
0
,
0
,
FLAGS
,
"scale"
},
{
"4thrt"
,
"4th root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FOURTHRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"4thrt"
,
"4th root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FOURTHRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"5thrt"
,
"5th root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FIFTHRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"5thrt"
,
"5th root"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FIFTHRT
},
0
,
0
,
FLAGS
,
"scale"
},
{
"log"
,
"logarithmic"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LOG
},
0
,
0
,
FLAGS
,
"scale"
},
{
"lin"
,
"linear"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
LINEAR
},
0
,
0
,
FLAGS
,
"scale"
},
{
"saturation"
,
"color saturation multiplier"
,
OFFSET
(
saturation
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
-
10
,
10
,
FLAGS
},
{
"saturation"
,
"color saturation multiplier"
,
OFFSET
(
saturation
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
-
10
,
10
,
FLAGS
},
{
"win_func"
,
"set window function"
,
OFFSET
(
win_func
),
AV_OPT_TYPE_INT
,
{.
i64
=
WFUNC_HANNING
},
0
,
NB_WFUNC
-
1
,
FLAGS
,
"win_func"
},
{
"win_func"
,
"set window function"
,
OFFSET
(
win_func
),
AV_OPT_TYPE_INT
,
{.
i64
=
WFUNC_HANNING
},
0
,
NB_WFUNC
-
1
,
FLAGS
,
"win_func"
},
{
"rect"
,
"Rectangular"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
WFUNC_RECT
},
0
,
0
,
FLAGS
,
"win_func"
},
{
"rect"
,
"Rectangular"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
WFUNC_RECT
},
0
,
0
,
FLAGS
,
"win_func"
},
...
...
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