1. ffmpeg
  2. Commit a23a56e77c0c2059f27baa194abc3213aee8825f
Browse code

libavfilter/af_biquads: add shorter option for width_type

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Paul B Mahol authored on 2017/06/19 00:31:03
Showing 2 changed files
doc/filters.texi
History View file @ a23a56e
... ... 
@@ -1074,7 +1074,7 @@ The filter accepts the following options:
1074 1074 
 @item frequency, f
1075 1075 
 Set frequency in Hz.
1076 1076
1077 
-@item width_type
1077 
+@item width_type, t
1078 1078 
 Set method to specify band-width of filter.
1079 1079 
 @table @option
1080 1080 
 @item h
... ... 
@@ -1809,7 +1809,7 @@ Set the filter's central frequency. Default is @code{3000}.
1809 1809 
 @item csg
1810 1810 
 Constant skirt gain if set to 1. Defaults to 0.
1811 1811
1812 
-@item width_type
1812 
+@item width_type, t
1813 1813 
 Set method to specify band-width of filter.
1814 1814 
 @table @option
1815 1815 
 @item h
... ... 
@@ -1841,7 +1841,7 @@ The filter accepts the following options:
1841 1841 
 @item frequency, f
1842 1842 
 Set the filter's central frequency. Default is @code{3000}.
1843 1843
1844 
-@item width_type
1844 
+@item width_type, t
1845 1845 
 Set method to specify band-width of filter.
1846 1846 
 @table @option
1847 1847 
 @item h
... ... 
@@ -1880,7 +1880,7 @@ Set the filter's central frequency and so can be used
1880 1880 
 to extend or reduce the frequency range to be boosted or cut.
1881 1881 
 The default value is @code{100} Hz.
1882 1882
1883 
-@item width_type
1883 
+@item width_type, t
1884 1884 
 Set method to specify band-width of filter.
1885 1885 
 @table @option
1886 1886 
 @item h
... ... 
@@ -2498,7 +2498,7 @@ The filter accepts the following options:
2498 2498 
 @item frequency, f
2499 2499 
 Set the filter's central frequency in Hz.
2500 2500
2501 
-@item width_type
2501 
+@item width_type, t
2502 2502 
 Set method to specify band-width of filter.
2503 2503 
 @table @option
2504 2504 
 @item h
... ... 
@@ -2527,13 +2527,13 @@ Specify which channels to filter, by default all available are filtered.
2527 2527 
 @item
2528 2528 
 Attenuate 10 dB at 1000 Hz, with a bandwidth of 200 Hz:
2529 2529 
 @example
2530 
-equalizer=f=1000:width_type=h:width=200:g=-10
2530 
+equalizer=f=1000:t=h:width=200:g=-10
2531 2531 
 @end example
2532 2532
2533 2533 
 @item
2534 2534 
 Apply 2 dB gain at 1000 Hz with Q 1 and attenuate 5 dB at 100 Hz with Q 2:
2535 2535 
 @example
2536 
-equalizer=f=1000:width_type=q:width=1:g=2,equalizer=f=100:width_type=q:width=2:g=-5
2536 
+equalizer=f=1000:t=q:w=1:g=2,equalizer=f=100:t=q:w=2:g=-5
2537 2537 
 @end example
2538 2538 
 @end itemize
2539 2539
... ... 
@@ -2847,7 +2847,7 @@ Set frequency in Hz. Default is 3000.
2847 2847 
 @item poles, p
2848 2848 
 Set number of poles. Default is 2.
2849 2849
2850 
-@item width_type
2850 
+@item width_type, t
2851 2851 
 Set method to specify band-width of filter.
2852 2852 
 @table @option
2853 2853 
 @item h
... ... 
@@ -3134,7 +3134,7 @@ Set frequency in Hz. Default is 500.
3134 3134 
 @item poles, p
3135 3135 
 Set number of poles. Default is 2.
3136 3136
3137 
-@item width_type
3137 
+@item width_type, t
3138 3138 
 Set method to specify band-width of filter.
3139 3139 
 @table @option
3140 3140 
 @item h
... ... 
@@ -3890,7 +3890,7 @@ Set the filter's central frequency and so can be used
3890 3890 
 to extend or reduce the frequency range to be boosted or cut.
3891 3891 
 The default value is @code{3000} Hz.
3892 3892
3893 
-@item width_type
3893 
+@item width_type, t
3894 3894 
 Set method to specify band-width of filter.
3895 3895 
 @table @option
3896 3896 
 @item h
libavfilter/af_biquads.c
History View file @ a23a56e
... ... 
@@ -493,6 +493,7 @@ static const AVOption equalizer_options[] = {
493 493 
     {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=0}, 0, 999999, FLAGS},
494 494 
     {"f",         "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=0}, 0, 999999, FLAGS},
495 495 
     {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
496 
+    {"t",          "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
496 497 
     {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"},
497 498 
     {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"},
498 499 
     {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"},
... ... 
@@ -513,6 +514,7 @@ static const AVOption bass_options[] = {
513 513 
     {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=100}, 0, 999999, FLAGS},
514 514 
     {"f",         "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=100}, 0, 999999, FLAGS},
515 515 
     {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
516 
+    {"t",          "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
516 517 
     {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"},
517 518 
     {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"},
518 519 
     {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"},
... ... 
@@ -533,6 +535,7 @@ static const AVOption treble_options[] = {
533 533 
     {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
534 534 
     {"f",         "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
535 535 
     {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
536 
+    {"t",          "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
536 537 
     {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"},
537 538 
     {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"},
538 539 
     {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"},
... ... 
@@ -553,6 +556,7 @@ static const AVOption bandpass_options[] = {
553 553 
     {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
554 554 
     {"f",         "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
555 555 
     {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
556 
+    {"t",          "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
556 557 
     {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"},
557 558 
     {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"},
558 559 
     {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"},
... ... 
@@ -572,6 +576,7 @@ static const AVOption bandreject_options[] = {
572 572 
     {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
573 573 
     {"f",         "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
574 574 
     {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
575 
+    {"t",          "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
575 576 
     {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"},
576 577 
     {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"},
577 578 
     {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"},
... ... 
@@ -590,6 +595,7 @@ static const AVOption lowpass_options[] = {
590 590 
     {"frequency", "set frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=500}, 0, 999999, FLAGS},
591 591 
     {"f",         "set frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=500}, 0, 999999, FLAGS},
592 592 
     {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
593 
+    {"t",          "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
593 594 
     {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"},
594 595 
     {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"},
595 596 
     {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"},
... ... 
@@ -610,6 +616,7 @@ static const AVOption highpass_options[] = {
610 610 
     {"frequency", "set frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
611 611 
     {"f",         "set frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
612 612 
     {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
613 
+    {"t",          "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, SLOPE, FLAGS, "width_type"},
613 614 
     {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"},
614 615 
     {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"},
615 616 
     {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"},
... ... 
@@ -630,6 +637,7 @@ static const AVOption allpass_options[] = {
630 630 
     {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
631 631 
     {"f",         "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS},
632 632 
     {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=HERTZ}, HERTZ, SLOPE, FLAGS, "width_type"},
633 
+    {"t",          "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=HERTZ}, HERTZ, SLOPE, FLAGS, "width_type"},
633 634 
     {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"},
634 635 
     {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"},
635 636 
     {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"},