Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
eba5cb20
Commit
eba5cb20
authored
Jan 17, 2015
by
Muhammad Faiz
Committed by
Michael Niedermayer
Jan 18, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/showcqt: add gamma2 option
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
dff6c925
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
filters.texi
doc/filters.texi
+10
-0
avf_showcqt.c
libavfilter/avf_showcqt.c
+4
-1
No files found.
doc/filters.texi
View file @
eba5cb20
...
...
@@ -11205,6 +11205,10 @@ Specify gamma. Lower gamma makes the spectrum more contrast, higher gamma
makes the spectrum having more range. Acceptable value is [1.0, 7.0].
Default value is @code{3.0}.
@item gamma2
Specify gamma of bargraph. Acceptable value is [1.0, 7.0].
Default value is @code{1.0}.
@item fontfile
Specify font file for use with freetype. If not specified, use embedded font.
...
...
@@ -11295,6 +11299,12 @@ Custom fontcolor, C-note is colored green, others are colored blue
fontcolor='if(mod(floor(midi(f)+0.5),12), 0x0000FF, g(1))'
@end example
@item
Custom gamma, now spectrum is linear to the amplitude.
@example
gamma=2:gamma2=2
@end example
@end itemize
@section showspectrum
...
...
libavfilter/avf_showcqt.c
View file @
eba5cb20
...
...
@@ -90,6 +90,7 @@ typedef struct {
float
coeffclamp
;
/* lower coeffclamp, more precise, higher coeffclamp, faster */
int
fullhd
;
/* if true, output video is at full HD resolution, otherwise it will be halved */
float
gamma
;
/* lower gamma, more contrast, higher gamma, more range */
float
gamma2
;
/* gamma of bargraph */
int
fps
;
/* the required fps is so strict, so it's enough to be int, but 24000/1001 etc cannot be encoded */
int
count
;
/* fps * count = transform rate */
}
ShowCQTContext
;
...
...
@@ -103,6 +104,7 @@ static const AVOption showcqt_options[] = {
{
"timeclamp"
,
"set timeclamp"
,
OFFSET
(
timeclamp
),
AV_OPT_TYPE_DOUBLE
,
{
.
dbl
=
0
.
17
},
0
.
1
,
1
.
0
,
FLAGS
},
{
"coeffclamp"
,
"set coeffclamp"
,
OFFSET
(
coeffclamp
),
AV_OPT_TYPE_FLOAT
,
{
.
dbl
=
1
},
0
.
1
,
10
,
FLAGS
},
{
"gamma"
,
"set gamma"
,
OFFSET
(
gamma
),
AV_OPT_TYPE_FLOAT
,
{
.
dbl
=
3
},
1
,
7
,
FLAGS
},
{
"gamma2"
,
"set gamma of bargraph"
,
OFFSET
(
gamma2
),
AV_OPT_TYPE_FLOAT
,
{
.
dbl
=
1
},
1
,
7
,
FLAGS
},
{
"fullhd"
,
"set full HD resolution"
,
OFFSET
(
fullhd
),
AV_OPT_TYPE_INT
,
{
.
i64
=
1
},
0
,
1
,
FLAGS
},
{
"fps"
,
"set video fps"
,
OFFSET
(
fps
),
AV_OPT_TYPE_INT
,
{
.
i64
=
25
},
10
,
100
,
FLAGS
},
{
"count"
,
"set number of transform per frame"
,
OFFSET
(
count
),
AV_OPT_TYPE_INT
,
{
.
i64
=
6
},
1
,
30
,
FLAGS
},
...
...
@@ -566,6 +568,7 @@ static int plot_cqt(AVFilterLink *inlink)
for
(
x
=
0
;
x
<
VIDEO_WIDTH
;
x
++
)
{
int
u
;
float
g
=
1
.
0
f
/
s
->
gamma
;
float
g2
=
1
.
0
f
/
s
->
gamma2
;
FFTComplex
l
=
{
0
,
0
};
FFTComplex
r
=
{
0
,
0
};
...
...
@@ -581,7 +584,7 @@ static int plot_cqt(AVFilterLink *inlink)
result
[
x
][
0
]
=
l
.
re
*
l
.
re
+
l
.
im
*
l
.
im
;
result
[
x
][
2
]
=
r
.
re
*
r
.
re
+
r
.
im
*
r
.
im
;
result
[
x
][
1
]
=
0
.
5
f
*
(
result
[
x
][
0
]
+
result
[
x
][
2
]);
result
[
x
][
3
]
=
result
[
x
][
1
]
;
result
[
x
][
3
]
=
(
g2
==
1
.
0
f
)
?
result
[
x
][
1
]
:
powf
(
result
[
x
][
1
],
g2
)
;
result
[
x
][
0
]
=
255
.
0
f
*
powf
(
FFMIN
(
1
.
0
f
,
result
[
x
][
0
]),
g
);
result
[
x
][
1
]
=
255
.
0
f
*
powf
(
FFMIN
(
1
.
0
f
,
result
[
x
][
1
]),
g
);
result
[
x
][
2
]
=
255
.
0
f
*
powf
(
FFMIN
(
1
.
0
f
,
result
[
x
][
2
]),
g
);
...
...
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