Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -931,8 +931,8 @@ static const AVOption equalizer_options[] = { · 930 unmodified lines | ||
| 931 | 931 | |
| 932 | 932 | DEFINE_BIQUAD_FILTER(equalizer, "Apply two-pole peaking equalization (EQ) filter."); |
| 933 | 933 | #endif /* CONFIG_EQUALIZER_FILTER */ |
| 934 | −#if CONFIG_BASS_FILTER | |
| 935 | −static const AVOption bass_options[] = { | |
| 934 | +#if CONFIG_BASS_FILTER || CONFIG_LOWSHELF_FILTER | |
| 935 | +static const AVOption bass_lowshelf_options[] = { | |
| 936 | 936 | {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=100}, 0, 999999, FLAGS}, |
| 937 | 937 | {"f", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=100}, 0, 999999, FLAGS}, |
| 938 | 938 | {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, NB_WTYPE-1, FLAGS, "width_type"}, |
| @@ -970,10 +970,18 @@ static const AVOption bass_options[] = { · 31 unmodified lines | ||
| 970 | 970 | {NULL} |
| 971 | 971 | }; |
| 972 | 972 | |
| 973 | +#if CONFIG_BASS_FILTER | |
| 974 | +#define bass_options bass_lowshelf_options | |
| 973 | 975 | DEFINE_BIQUAD_FILTER(bass, "Boost or cut lower frequencies."); |
| 974 | 976 | #endif /* CONFIG_BASS_FILTER */ |
| 975 | −#if CONFIG_TREBLE_FILTER | |
| 976 | −static const AVOption treble_options[] = { | |
| 977 | + | |
| 978 | +#if CONFIG_LOWSHELF_FILTER | |
| 979 | +#define lowshelf_options bass_lowshelf_options | |
| 980 | +DEFINE_BIQUAD_FILTER(lowshelf, "Apply a low shelf filter."); | |
| 981 | +#endif /* CONFIG_LOWSHELF_FILTER */ | |
| 982 | +#endif /* CONFIG_BASS_FILTER || CONFIG LOWSHELF_FILTER */ | |
| 983 | +#if CONFIG_TREBLE_FILTER || CONFIG_HIGHSHELF_FILTER | |
| 984 | +static const AVOption treble_highshelf_options[] = { | |
| 977 | 985 | {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS}, |
| 978 | 986 | {"f", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS}, |
| 979 | 987 | {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, NB_WTYPE-1, FLAGS, "width_type"}, |
| @@ -1011,8 +1019,16 @@ static const AVOption treble_options[] = { · 31 unmodified lines | ||
| 1011 | 1019 | {NULL} |
| 1012 | 1020 | }; |
| 1013 | 1021 | |
| 1022 | +#if CONFIG_TREBLE_FILTER | |
| 1023 | +#define treble_options treble_highshelf_options | |
| 1014 | 1024 | DEFINE_BIQUAD_FILTER(treble, "Boost or cut upper frequencies."); |
| 1015 | 1025 | #endif /* CONFIG_TREBLE_FILTER */ |
| 1026 | + | |
| 1027 | +#if CONFIG_HIGHSHELF_FILTER | |
| 1028 | +#define highshelf_options treble_highshelf_options | |
| 1029 | +DEFINE_BIQUAD_FILTER(highshelf, "Apply a high shelf filter."); | |
| 1030 | +#endif /* CONFIG_HIGHSHELF_FILTER */ | |
| 1031 | +#endif /* CONFIG_TREBLE_FILTER || CONFIG_HIGHSHELF_FILTER */ | |
| 1016 | 1032 | #if CONFIG_BANDPASS_FILTER |
| 1017 | 1033 | static const AVOption bandpass_options[] = { |
| 1018 | 1034 | {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS}, |
| @@ -1205,88 +1221,6 @@ static const AVOption allpass_options[] = { · 186 unmodified lines | ||
| 1205 | 1221 | |
| 1206 | 1222 | DEFINE_BIQUAD_FILTER(allpass, "Apply a two-pole all-pass filter."); |
| 1207 | 1223 | #endif /* CONFIG_ALLPASS_FILTER */ |
| 1208 | −#if CONFIG_LOWSHELF_FILTER | |
| 1209 | −static const AVOption lowshelf_options[] = { | |
| 1210 | − {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=100}, 0, 999999, FLAGS}, | |
| 1211 | − {"f", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=100}, 0, 999999, FLAGS}, | |
| 1212 | − {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, NB_WTYPE-1, FLAGS, "width_type"}, | |
| 1213 | − {"t", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, NB_WTYPE-1, FLAGS, "width_type"}, | |
| 1214 | − {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"}, | |
| 1215 | − {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"}, | |
| 1216 | − {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"}, | |
| 1217 | − {"s", "slope", 0, AV_OPT_TYPE_CONST, {.i64=SLOPE}, 0, 0, FLAGS, "width_type"}, | |
| 1218 | − {"k", "kHz", 0, AV_OPT_TYPE_CONST, {.i64=KHERTZ}, 0, 0, FLAGS, "width_type"}, | |
| 1219 | − {"width", "set shelf transition steep", OFFSET(width), AV_OPT_TYPE_DOUBLE, {.dbl=0.5}, 0, 99999, FLAGS}, | |
| 1220 | − {"w", "set shelf transition steep", OFFSET(width), AV_OPT_TYPE_DOUBLE, {.dbl=0.5}, 0, 99999, FLAGS}, | |
| 1221 | − {"gain", "set gain", OFFSET(gain), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -900, 900, FLAGS}, | |
| 1222 | − {"g", "set gain", OFFSET(gain), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -900, 900, FLAGS}, | |
| 1223 | − {"poles", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, AF}, | |
| 1224 | − {"p", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, AF}, | |
| 1225 | − {"mix", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS}, | |
| 1226 | − {"m", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS}, | |
| 1227 | − {"channels", "set channels to filter", OFFSET(channels), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=-1}, INT64_MIN, INT64_MAX, FLAGS}, | |
| 1228 | − {"c", "set channels to filter", OFFSET(channels), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=-1}, INT64_MIN, INT64_MAX, FLAGS}, | |
| 1229 | − {"normalize", "normalize coefficients", OFFSET(normalize), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, | |
| 1230 | − {"n", "normalize coefficients", OFFSET(normalize), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, | |
| 1231 | − {"transform", "set transform type", OFFSET(transform_type), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_TTYPE-1, AF, "transform_type"}, | |
| 1232 | − {"a", "set transform type", OFFSET(transform_type), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_TTYPE-1, AF, "transform_type"}, | |
| 1233 | − {"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"}, | |
| 1234 | − {"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"}, | |
| 1235 | − {"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"}, | |
| 1236 | − {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"}, | |
| 1237 | − {"precision", "set filtering precision", OFFSET(precision), AV_OPT_TYPE_INT, {.i64=-1}, -1, 3, AF, "precision"}, | |
| 1238 | − {"r", "set filtering precision", OFFSET(precision), AV_OPT_TYPE_INT, {.i64=-1}, -1, 3, AF, "precision"}, | |
| 1239 | − {"auto", "automatic", 0, AV_OPT_TYPE_CONST, {.i64=-1}, 0, 0, AF, "precision"}, | |
| 1240 | − {"s16", "signed 16-bit", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, AF, "precision"}, | |
| 1241 | − {"s32", "signed 32-bit", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "precision"}, | |
| 1242 | − {"f32", "floating-point single", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, AF, "precision"}, | |
| 1243 | − {"f64", "floating-point double", 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, AF, "precision"}, | |
| 1244 | − {NULL} | |
| 1245 | −}; | |
| 1246 | − | |
| 1247 | −DEFINE_BIQUAD_FILTER(lowshelf, "Apply a low shelf filter."); | |
| 1248 | −#endif /* CONFIG_LOWSHELF_FILTER */ | |
| 1249 | −#if CONFIG_HIGHSHELF_FILTER | |
| 1250 | −static const AVOption highshelf_options[] = { | |
| 1251 | − {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS}, | |
| 1252 | − {"f", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=3000}, 0, 999999, FLAGS}, | |
| 1253 | − {"width_type", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, NB_WTYPE-1, FLAGS, "width_type"}, | |
| 1254 | − {"t", "set filter-width type", OFFSET(width_type), AV_OPT_TYPE_INT, {.i64=QFACTOR}, HERTZ, NB_WTYPE-1, FLAGS, "width_type"}, | |
| 1255 | − {"h", "Hz", 0, AV_OPT_TYPE_CONST, {.i64=HERTZ}, 0, 0, FLAGS, "width_type"}, | |
| 1256 | − {"q", "Q-Factor", 0, AV_OPT_TYPE_CONST, {.i64=QFACTOR}, 0, 0, FLAGS, "width_type"}, | |
| 1257 | − {"o", "octave", 0, AV_OPT_TYPE_CONST, {.i64=OCTAVE}, 0, 0, FLAGS, "width_type"}, | |
| 1258 | − {"s", "slope", 0, AV_OPT_TYPE_CONST, {.i64=SLOPE}, 0, 0, FLAGS, "width_type"}, | |
| 1259 | − {"k", "kHz", 0, AV_OPT_TYPE_CONST, {.i64=KHERTZ}, 0, 0, FLAGS, "width_type"}, | |
| 1260 | − {"width", "set shelf transition steep", OFFSET(width), AV_OPT_TYPE_DOUBLE, {.dbl=0.5}, 0, 99999, FLAGS}, | |
| 1261 | − {"w", "set shelf transition steep", OFFSET(width), AV_OPT_TYPE_DOUBLE, {.dbl=0.5}, 0, 99999, FLAGS}, | |
| 1262 | − {"gain", "set gain", OFFSET(gain), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -900, 900, FLAGS}, | |
| 1263 | − {"g", "set gain", OFFSET(gain), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -900, 900, FLAGS}, | |
| 1264 | − {"poles", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, AF}, | |
| 1265 | − {"p", "set number of poles", OFFSET(poles), AV_OPT_TYPE_INT, {.i64=2}, 1, 2, AF}, | |
| 1266 | − {"mix", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS}, | |
| 1267 | − {"m", "set mix", OFFSET(mix), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0, 1, FLAGS}, | |
| 1268 | − {"channels", "set channels to filter", OFFSET(channels), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=-1}, INT64_MIN, INT64_MAX, FLAGS}, | |
| 1269 | − {"c", "set channels to filter", OFFSET(channels), AV_OPT_TYPE_CHANNEL_LAYOUT, {.i64=-1}, INT64_MIN, INT64_MAX, FLAGS}, | |
| 1270 | − {"normalize", "normalize coefficients", OFFSET(normalize), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, | |
| 1271 | − {"n", "normalize coefficients", OFFSET(normalize), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, | |
| 1272 | − {"transform", "set transform type", OFFSET(transform_type), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_TTYPE-1, AF, "transform_type"}, | |
| 1273 | − {"a", "set transform type", OFFSET(transform_type), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_TTYPE-1, AF, "transform_type"}, | |
| 1274 | − {"di", "direct form I", 0, AV_OPT_TYPE_CONST, {.i64=DI}, 0, 0, AF, "transform_type"}, | |
| 1275 | − {"dii", "direct form II", 0, AV_OPT_TYPE_CONST, {.i64=DII}, 0, 0, AF, "transform_type"}, | |
| 1276 | − {"tdii", "transposed direct form II", 0, AV_OPT_TYPE_CONST, {.i64=TDII}, 0, 0, AF, "transform_type"}, | |
| 1277 | − {"latt", "lattice-ladder form", 0, AV_OPT_TYPE_CONST, {.i64=LATT}, 0, 0, AF, "transform_type"}, | |
| 1278 | − {"precision", "set filtering precision", OFFSET(precision), AV_OPT_TYPE_INT, {.i64=-1}, -1, 3, AF, "precision"}, | |
| 1279 | − {"r", "set filtering precision", OFFSET(precision), AV_OPT_TYPE_INT, {.i64=-1}, -1, 3, AF, "precision"}, | |
| 1280 | − {"auto", "automatic", 0, AV_OPT_TYPE_CONST, {.i64=-1}, 0, 0, AF, "precision"}, | |
| 1281 | − {"s16", "signed 16-bit", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, AF, "precision"}, | |
| 1282 | − {"s32", "signed 32-bit", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "precision"}, | |
| 1283 | − {"f32", "floating-point single", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, AF, "precision"}, | |
| 1284 | − {"f64", "floating-point double", 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, AF, "precision"}, | |
| 1285 | − {NULL} | |
| 1286 | −}; | |
| 1287 | − | |
| 1288 | −DEFINE_BIQUAD_FILTER(highshelf, "Apply a high shelf filter."); | |
| 1289 | −#endif /* CONFIG_HIGHSHELF_FILTER */ | |
| 1290 | 1224 | #if CONFIG_BIQUAD_FILTER |
| 1291 | 1225 | static const AVOption biquad_options[] = { |
| 1292 | 1226 | {"a0", NULL, OFFSET(oa0), AV_OPT_TYPE_DOUBLE, {.dbl=1}, INT32_MIN, INT32_MAX, FLAGS}, |