Showing the changes to libavfilter (1 of 2 files). Show all
Unified · Split
| @@ -69,7 +69,7 @@ static const AVOption stereotools_options[] = { · 68 unmodified lines | ||
| 69 | 69 | { "muter", "mute R", OFFSET(mute_r), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, A }, |
| 70 | 70 | { "phasel", "phase L", OFFSET(phase_l), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, A }, |
| 71 | 71 | { "phaser", "phase R", OFFSET(phase_r), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, A }, |
| 72 | − { "mode", "set stereo mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 8, A, "mode" }, | |
| 72 | + { "mode", "set stereo mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 10, A, "mode" }, | |
| 73 | 73 | { "lr>lr", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, A, "mode" }, |
| 74 | 74 | { "lr>ms", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, A, "mode" }, |
| 75 | 75 | { "ms>lr", 0, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, A, "mode" }, |
| @@ -79,6 +79,8 @@ static const AVOption stereotools_options[] = { · 3 unmodified lines | ||
| 79 | 79 | { "lr>rl", 0, 0, AV_OPT_TYPE_CONST, {.i64=6}, 0, 0, A, "mode" }, |
| 80 | 80 | { "ms>ll", 0, 0, AV_OPT_TYPE_CONST, {.i64=7}, 0, 0, A, "mode" }, |
| 81 | 81 | { "ms>rr", 0, 0, AV_OPT_TYPE_CONST, {.i64=8}, 0, 0, A, "mode" }, |
| 82 | + { "ms>rl", 0, 0, AV_OPT_TYPE_CONST, {.i64=9}, 0, 0, A, "mode" }, | |
| 83 | + { "lr>l-r", 0, 0, AV_OPT_TYPE_CONST, {.i64=10}, 0, 0, A, "mode" }, | |
| 82 | 84 | { "slev", "set side level", OFFSET(slev), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.015625, 64, A }, |
| 83 | 85 | { "sbal", "set side balance", OFFSET(sbal), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -1, 1, A }, |
| 84 | 86 | { "mlev", "set middle level", OFFSET(mlev), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.015625, 64, A }, |
| @@ -235,7 +237,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 150 unmodified lines | ||
| 235 | 237 | L = R; |
| 236 | 238 | break; |
| 237 | 239 | case 5: |
| 238 | − L = (L + R) / 2; | |
| 240 | + L = (L + R) * 0.5; | |
| 239 | 241 | R = L; |
| 240 | 242 | break; |
| 241 | 243 | case 6: |
| @@ -259,6 +261,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 17 unmodified lines | ||
| 259 | 261 | L = r; |
| 260 | 262 | R = r; |
| 261 | 263 | break; |
| 264 | + case 9: | |
| 265 | + l = L * mlev * FFMIN(1., 2. - mpan) + R * slev * FFMIN(1., 2. - sbal); | |
| 266 | + r = L * mlev * FFMIN(1., mpan) - R * slev * FFMIN(1., sbal); | |
| 267 | + L = r; | |
| 268 | + R = l; | |
| 269 | + break; | |
| 270 | + case 10: | |
| 271 | + L = (L - R) * 0.5; | |
| 272 | + R = L; | |
| 273 | + break; | |
| 262 | 274 | } |
| 263 | 275 | |
| 264 | 276 | L *= 1. - mute_l; |