virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

libswresample/rematrix: add support for custom order channel layouts

Browse Source 
Limited to the same channels as a native layout, but not constrained by channel ordering.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-02-02 15:16:06 -03:00
parent e52701d173
commit b9c99baced
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -49,6 +49,8 @@ version 7.1:
error, as such a specifier makes no sense error, as such a specifier makes no sense
- Mastering Display and Content Light Level metadata support in hevc_nvenc - Mastering Display and Content Light Level metadata support in hevc_nvenc
and av1_nvenc encoders and av1_nvenc encoders
- libswresample now accepts custom order channel layouts as input, with some
constrains
version 7.0: version 7.0:

29
libswresample/rematrix.c
View File

@ -104,7 +104,14 @@ static int clean_layout(AVChannelLayout *out, const AVChannelLayout *in, void *s
} }
static int sane_layout(AVChannelLayout *ch_layout) { static int sane_layout(AVChannelLayout *ch_layout) {
if (ch_layout->order != AV_CHANNEL_ORDER_NATIVE) if(ch_layout->nb_channels >= SWR_CH_MAX)
return 0;
if(ch_layout->order == AV_CHANNEL_ORDER_CUSTOM)
for (int i = 0; i < ch_layout->nb_channels; i++) {
if (ch_layout->u.map[i].id >= 64)
return 0;
}
else if (ch_layout->order != AV_CHANNEL_ORDER_NATIVE)
return 0; return 0;
if(!av_channel_layout_subset(ch_layout, AV_CH_LAYOUT_SURROUND)) // at least 1 front speaker if(!av_channel_layout_subset(ch_layout, AV_CH_LAYOUT_SURROUND)) // at least 1 front speaker
return 0; return 0;
@ -118,8 +125,6 @@ static int sane_layout(AVChannelLayout *ch_layout) {
return 0; return 0;
if(!even(av_channel_layout_subset(ch_layout, (AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT)))) if(!even(av_channel_layout_subset(ch_layout, (AV_CH_TOP_FRONT_LEFT | AV_CH_TOP_FRONT_RIGHT))))
return 0; return 0;
if(ch_layout->nb_channels >= SWR_CH_MAX)
return 0;
return 1; return 1;
} }
@ -130,9 +135,10 @@ static void build_matrix(const AVChannelLayout *in_ch_layout, const AVChannelLay
ptrdiff_t stride, enum AVMatrixEncoding matrix_encoding) ptrdiff_t stride, enum AVMatrixEncoding matrix_encoding)
{ {
double matrix[NUM_NAMED_CHANNELS][NUM_NAMED_CHANNELS]={{0}}; double matrix[NUM_NAMED_CHANNELS][NUM_NAMED_CHANNELS]={{0}};
uint64_t unaccounted = in_ch_layout->u.mask & ~out_ch_layout->u.mask; uint64_t unaccounted = av_channel_layout_subset(in_ch_layout, UINT64_MAX) &
~av_channel_layout_subset(out_ch_layout, UINT64_MAX);
double maxcoef=0; double maxcoef=0;
int i, j, out_i; int i, j;
for(i=0; i<FF_ARRAY_ELEMS(matrix); i++){ for(i=0; i<FF_ARRAY_ELEMS(matrix); i++){
if( av_channel_layout_index_from_channel(in_ch_layout, i) >= 0 if( av_channel_layout_index_from_channel(in_ch_layout, i) >= 0
@ -305,14 +311,15 @@ static void build_matrix(const AVChannelLayout *in_ch_layout, const AVChannelLay
} }
for(out_i=i=0; i<64; i++){ for (i = 0; i < 64; i++) {
double sum=0; double sum=0;
int in_i=0; int out_i = av_channel_layout_index_from_channel(out_ch_layout, i);
if (av_channel_layout_index_from_channel(out_ch_layout, i) < 0) if (out_i < 0)
continue; continue;
for(j=0; j<64; j++){ for(j=0; j<64; j++){
if (av_channel_layout_index_from_channel(in_ch_layout, j) < 0) int in_i = av_channel_layout_index_from_channel(in_ch_layout, j);
continue; if (in_i < 0)
continue;
if (i < FF_ARRAY_ELEMS(matrix) && j < FF_ARRAY_ELEMS(matrix[0])) if (i < FF_ARRAY_ELEMS(matrix) && j < FF_ARRAY_ELEMS(matrix[0]))
matrix_param[stride*out_i + in_i] = matrix[i][j]; matrix_param[stride*out_i + in_i] = matrix[i][j];
else else
@ -320,10 +327,8 @@ static void build_matrix(const AVChannelLayout *in_ch_layout, const AVChannelLay
( av_channel_layout_index_from_channel(in_ch_layout, i) >= 0 ( av_channel_layout_index_from_channel(in_ch_layout, i) >= 0
&& av_channel_layout_index_from_channel(out_ch_layout, i) >= 0); && av_channel_layout_index_from_channel(out_ch_layout, i) >= 0);
sum += fabs(matrix_param[stride*out_i + in_i]); sum += fabs(matrix_param[stride*out_i + in_i]);
in_i++;
} }
maxcoef= FFMAX(maxcoef, sum); maxcoef= FFMAX(maxcoef, sum);
out_i++;
} }
if(rematrix_volume < 0) if(rematrix_volume < 0)
maxcoef = -rematrix_volume; maxcoef = -rematrix_volume;