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
4a69b182
Commit
4a69b182
authored
Apr 23, 2019
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/af_surround: export more channel's in/out gains
parent
ce15c3a4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
112 additions
and
0 deletions
+112
-0
filters.texi
doc/filters.texi
+42
-0
af_surround.c
libavfilter/af_surround.c
+70
-0
No files found.
doc/filters.texi
View file @
4a69b182
...
...
@@ -4883,6 +4883,48 @@ Set front center input volume. By default, this is @var{1}.
@item fc_out
Set front center output volume. By default, this is @var{1}.
@item fl_in
Set front left input volume. By default, this is @var{1}.
@item fl_out
Set front left output volume. By default, this is @var{1}.
@item fr_in
Set front right input volume. By default, this is @var{1}.
@item fr_out
Set front right output volume. By default, this is @var{1}.
@item sl_in
Set side left input volume. By default, this is @var{1}.
@item sl_out
Set side left output volume. By default, this is @var{1}.
@item sr_in
Set side right input volume. By default, this is @var{1}.
@item sr_out
Set side right output volume. By default, this is @var{1}.
@item bl_in
Set back left input volume. By default, this is @var{1}.
@item bl_out
Set back left output volume. By default, this is @var{1}.
@item br_in
Set back right input volume. By default, this is @var{1}.
@item br_out
Set back right output volume. By default, this is @var{1}.
@item bc_in
Set back center input volume. By default, this is @var{1}.
@item bc_out
Set back center output volume. By default, this is @var{1}.
@item lfe_in
Set LFE input volume. By default, this is @var{1}.
...
...
libavfilter/af_surround.c
View file @
4a69b182
...
...
@@ -39,6 +39,20 @@ typedef struct AudioSurroundContext {
float
level_out
;
float
fc_in
;
float
fc_out
;
float
fl_in
;
float
fl_out
;
float
fr_in
;
float
fr_out
;
float
sl_in
;
float
sl_out
;
float
sr_in
;
float
sr_out
;
float
bl_in
;
float
bl_out
;
float
br_in
;
float
br_out
;
float
bc_in
;
float
bc_out
;
float
lfe_in
;
float
lfe_out
;
int
lfe_mode
;
...
...
@@ -202,6 +216,27 @@ static int config_input(AVFilterLink *inlink)
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_FRONT_CENTER
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
fc_in
;
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_FRONT_LEFT
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
fl_in
;
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_FRONT_RIGHT
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
fr_in
;
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_SIDE_LEFT
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
sl_in
;
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_SIDE_RIGHT
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
sr_in
;
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_BACK_LEFT
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
bl_in
;
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_BACK_RIGHT
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
br_in
;
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_BACK_CENTER
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
bc_in
;
ch
=
av_get_channel_layout_channel_index
(
inlink
->
channel_layout
,
AV_CH_LOW_FREQUENCY
);
if
(
ch
>=
0
)
s
->
input_levels
[
ch
]
*=
s
->
lfe_in
;
...
...
@@ -244,6 +279,27 @@ static int config_output(AVFilterLink *outlink)
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_FRONT_CENTER
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
fc_out
;
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_FRONT_LEFT
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
fl_out
;
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_FRONT_RIGHT
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
fr_out
;
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_SIDE_LEFT
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
sl_out
;
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_SIDE_RIGHT
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
sr_out
;
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_BACK_LEFT
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
bl_out
;
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_BACK_RIGHT
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
br_out
;
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_BACK_CENTER
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
bc_out
;
ch
=
av_get_channel_layout_channel_index
(
outlink
->
channel_layout
,
AV_CH_LOW_FREQUENCY
);
if
(
ch
>=
0
)
s
->
output_levels
[
ch
]
*=
s
->
lfe_out
;
...
...
@@ -1620,6 +1676,20 @@ static const AVOption surround_options[] = {
{
"sub"
,
"substract LFE channel with others"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
1
},
0
,
1
,
FLAGS
,
"lfe_mode"
},
{
"fc_in"
,
"set front center channel input level"
,
OFFSET
(
fc_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"fc_out"
,
"set front center channel output level"
,
OFFSET
(
fc_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"fl_in"
,
"set front left channel input level"
,
OFFSET
(
fl_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"fl_out"
,
"set front left channel output level"
,
OFFSET
(
fl_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"fr_in"
,
"set front right channel input level"
,
OFFSET
(
fr_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"fr_out"
,
"set front right channel output level"
,
OFFSET
(
fr_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"sl_in"
,
"set side left channel input level"
,
OFFSET
(
sl_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"sl_out"
,
"set side left channel output level"
,
OFFSET
(
sl_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"sr_in"
,
"set side right channel input level"
,
OFFSET
(
sr_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"sr_out"
,
"set side right channel output level"
,
OFFSET
(
sr_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"bl_in"
,
"set back left channel input level"
,
OFFSET
(
bl_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"bl_out"
,
"set back left channel output level"
,
OFFSET
(
bl_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"br_in"
,
"set back right channel input level"
,
OFFSET
(
br_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"br_out"
,
"set back right channel output level"
,
OFFSET
(
br_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"bc_in"
,
"set back center channel input level"
,
OFFSET
(
bc_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"bc_out"
,
"set back center channel output level"
,
OFFSET
(
bc_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"lfe_in"
,
"set lfe channel input level"
,
OFFSET
(
lfe_in
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"lfe_out"
,
"set lfe channel output level"
,
OFFSET
(
lfe_out
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=
1
},
0
,
10
,
FLAGS
},
{
"allx"
,
"set all channel's x spread"
,
OFFSET
(
all_x
),
AV_OPT_TYPE_FLOAT
,
{.
dbl
=-
1
},
-
1
,
15
,
FLAGS
},
...
...
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