mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-22 00:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/af_surround: add support for two more channels

Browse Source
This commit is contained in:
Paul B Mahol 2024-10-25 23:32:05 +02:00
parent 8ce6abcc05
commit 8020860b1d
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/af_surround.c
View File

@ -34,7 +34,7 @@
enum SurroundChannel {
SC_FL = 1, SC_FR, SC_FC, SC_LF, SC_BL, SC_BR, SC_BC, SC_SL, SC_SR,
SC_TC, SC_TFC, SC_TFL, SC_TFR, SC_TBC, SC_TBL, SC_TBR,
SC_LF2, SC_TSL, SC_TSR, SC_BFC, SC_BFL, SC_BFR,
SC_LF2, SC_TSL, SC_TSR, SC_BFC, SC_BFL, SC_BFR, SC_FLC, SC_FRC,
SC_NB,
};
@ -54,6 +54,7 @@ static const int8_t ch_dif[SC_NB] = {
[SC_TBL] = 1,
[SC_TSL] = 1,
[SC_BFL] = 1,
[SC_FLC] = 1,
[SC_FR] = -1,
[SC_BR] = -1,
[SC_SR] = -1,
@ -61,6 +62,7 @@ static const int8_t ch_dif[SC_NB] = {
[SC_TBR] = -1,
[SC_TSR] = -1,
[SC_BFR] = -1,
[SC_FRC] = -1,
};
static const int sc_map[64] = {
@ -86,6 +88,8 @@ static const int sc_map[64] = {
[AV_CHAN_BOTTOM_FRONT_CENTER] = SC_BFC,
[AV_CHAN_BOTTOM_FRONT_LEFT ] = SC_BFL,
[AV_CHAN_BOTTOM_FRONT_RIGHT ] = SC_BFR,
[AV_CHAN_FRONT_LEFT_OF_CENTER] = SC_FLC,
[AV_CHAN_FRONT_RIGHT_OF_CENTER] = SC_FRC,
};
typedef struct AudioSurroundContext {

10
libavfilter/surround_template.c
View File

@ -594,6 +594,14 @@ static void fn(calculate_factors)(AVFilterContext *ctx, int ch, int chan)
for (int n = 0; n < rdft_size; n++)
x_out[n] = FMA(x[n], F(0.5), F(0.5));
break;
case AV_CHAN_FRONT_LEFT_OF_CENTER:
for (int n = 0; n < rdft_size; n++)
x_out[n] = F(1.0) - FMIN(FABS(x[n]+F(0.5)), F(1.0));
break;
case AV_CHAN_FRONT_RIGHT_OF_CENTER:
for (int n = 0; n < rdft_size; n++)
x_out[n] = F(1.0) - FMIN(FABS(x[n]-F(0.5)), F(1.0));
break;
default:
for (int n = 0; n < rdft_size; n++)
x_out[n] = x[n];
@ -610,6 +618,8 @@ static void fn(calculate_factors)(AVFilterContext *ctx, int ch, int chan)
case AV_CHAN_BOTTOM_FRONT_CENTER:
case AV_CHAN_BOTTOM_FRONT_LEFT:
case AV_CHAN_BOTTOM_FRONT_RIGHT:
case AV_CHAN_FRONT_LEFT_OF_CENTER:
case AV_CHAN_FRONT_RIGHT_OF_CENTER:
for (int n = 0; n < rdft_size; n++)
y_out[n] = FMA(y[n], F(0.5), F(0.5));
break;