History

avfilter/af_amix: add sum option

Paul B Mahol committed 5 years ago

Commit 57651491 parent e955f5a2 files · +16 −3Browse files

Unified · Split

2 files
  1. doc/filters.texi +6 −0
  2. libavfilter/af_amix.c +10 −3
doc/filters.texi+6−0
@@ -1879,6 +1879,11 @@ stream ends. The default value is 2 seconds. · 1878 unmodified lines
18791879 @item weights
18801880 Specify weight of each input audio stream as sequence.
18811881 Each weight is separated by space. By default all inputs have same weight.
1882+
1883+@item sum
1884+Do not scale inputs but instead do only summation of samples.
1885+Beware of heavy clipping if inputs are not normalized prior of filtering
1886+or output from @var{amix} normalized after filtering. By default is disabled.
18821887 @end table
18831888
18841889 @subsection Commands
@@ -1886,6 +1891,7 @@ Each weight is separated by space. By default all inputs have same weight. · 1 unmodified line
18861891 This filter supports the following commands:
18871892 @table @option
18881893 @item weights
1894+@item sum
18891895 Syntax is same as option with same name.
18901896 @end table
18911897
libavfilter/af_amix.c+10−3
@@ -164,6 +164,7 @@ typedef struct MixContext { · 163 unmodified lines
164164 int duration_mode; /**< mode for determining duration */
165165 float dropout_transition; /**< transition time when an input drops out */
166166 char *weights_str; /**< string for custom weights for every input */
167+ int sum; /**< inputs are not scaled, only added */
167168
168169 int nb_channels; /**< number of channels */
169170 int sample_rate; /**< sample rate */
@@ -195,6 +196,8 @@ static const AVOption amix_options[] = { · 25 unmodified lines
195196 OFFSET(dropout_transition), AV_OPT_TYPE_FLOAT, { .dbl = 2.0 }, 0, INT_MAX, A|F },
196197 { "weights", "Set weight for each input.",
197198 OFFSET(weights_str), AV_OPT_TYPE_STRING, {.str="1 1"}, 0, 0, A|F|T },
199+ { "sum", "Do not scale inputs instead do only sum",
200+ OFFSET(sum), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, A|F|T },
198201 { NULL }
199202 };
200203
@@ -227,10 +230,14 @@ static void calculate_scales(MixContext *s, int nb_samples) · 26 unmodified lines
227230 }
228231
229232 for (i = 0; i < s->nb_inputs; i++) {
230− if (s->input_state[i] & INPUT_ON)
231− s->input_scale[i] = 1.0f / s->scale_norm[i] * FFSIGN(s->weights[i]);
232− else
233+ if (s->input_state[i] & INPUT_ON) {
234+ if (s->sum)
235+ s->input_scale[i] = 1.0f;
236+ else
237+ s->input_scale[i] = 1.0f / s->scale_norm[i] * FFSIGN(s->weights[i]);
238+ } else {
233239 s->input_scale[i] = 0.0f;
240+ }
234241 }
235242 }
236243

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t