sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-28 15:19:38 +03:00
Code Activity

swresample/tests/rematrix: print rows in layout order

Browse Source 
Otherwise, custom layouts will be printed as if they were in native order.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2026-08-14 16:11:08 -03:00
parent d02bad0c90
commit c39bc13fdb
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libswresample/tests/rematrix.c
View File

@@ -41,16 +41,15 @@ static void print_matrix_row(const double *matrix,
printf("[%s] = { ", out_name);
for (int i = 0; i < 64; i++) {
int in = av_channel_layout_index_from_channel(in_layout, i);
if (in < 0)
enum AVChannel in_ch = av_channel_layout_channel_from_index(in_layout, i);
if (in_ch == AV_CHAN_NONE)
continue;
av_channel_name(in_name, sizeof(in_name), i);
printf(".%s = %f, ", in_name, matrix[out * MATRIX_STRIDE + in]);
}
for (int in = 0; in < in_layout->nb_channels; in++) {
if (channel_is_unused(in_layout, in))
printf(".UNSD%d = %f, ", in,
matrix[out * MATRIX_STRIDE + in]);
av_channel_name(in_name, sizeof(in_name), in_ch);
if (in_ch == AV_CHAN_UNUSED)
printf(".UNSD%d = %f, ", i,
matrix[out * MATRIX_STRIDE + i]);
else
printf(".%s = %f, ", in_name, matrix[out * MATRIX_STRIDE + i]);
}
printf("},\n");
}
@@ -91,18 +90,15 @@ static int print_matrix(const AVChannelLayout *in_layout,
}
}
for (int i = 0; i < 64; i++) {
int out_i = av_channel_layout_index_from_channel(out_layout, i);
if (out_i < 0)
for (int i = 0; i < out_layout->nb_channels; i++) {
enum AVChannel out_ch = av_channel_layout_channel_from_index(out_layout, i);
if (out_ch == AV_CHAN_NONE)
continue;
av_channel_name(out_name, sizeof(out_name), i);
print_matrix_row(matrix, in_layout, out_i, out_name);
}
for (int out = 0; out < out_layout->nb_channels; out++) {
if (channel_is_unused(out_layout, out)) {
snprintf(out_name, sizeof(out_name), "UNSD%d", out);
print_matrix_row(matrix, in_layout, out, out_name);
}
if (out_ch == AV_CHAN_UNUSED)
snprintf(out_name, sizeof(out_name), "UNSD%d", i);
else
av_channel_name(out_name, sizeof(out_name), out_ch);
print_matrix_row(matrix, in_layout, i, out_name);
}
return 0;

2
tests/ref/fate/swr-rematrix-unused-output
View File

@@ -1,4 +1,4 @@
[FL] = { .FL = 1.000000, .FR = 0.000000, .FC = 0.707107, .LFE = 0.000000, .BL = 0.707107, .BR = 0.000000, },
[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.707107, .LFE = 0.000000, .BL = 0.000000, .BR = 0.707107, },
[UNSD1] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, },
[FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.707107, .LFE = 0.000000, .BL = 0.000000, .BR = 0.707107, },
[UNSD3] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, },