PR #24095 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24095 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24095.patch
>From 22ca440594aa60922c57ecf72e878aadc4ece50d Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Tue, 11 Aug 2026 23:19:25 +0200 Subject: [PATCH] swresample/rematrix: Use AVChannel in av_channel_layout_index_from_chan Signed-off-by: Andreas Rheinhardt <[email protected]> --- libswresample/rematrix.c | 2 +- tests/ref/fate/swr-rematrix-22.2-7.1.2 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 46cbed4bae..5e9f536814 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -436,7 +436,7 @@ static void build_matrix(const AVChannelLayout *in_ch_layout, const AVChannelLay * U+030 = U-030 = M+110 = M-110 = sqrt(1/4) */ matrix[TOP_FRONT_LEFT ][TOP_CENTER] += 0.5; matrix[TOP_FRONT_RIGHT][TOP_CENTER] += 0.5; - if (av_channel_layout_index_from_channel(out_ch_layout, AV_CH_BACK_LEFT) >= 0) { + if (av_channel_layout_index_from_channel(out_ch_layout, AV_CHAN_BACK_LEFT) >= 0) { matrix[BACK_LEFT ][TOP_CENTER] += 0.5; matrix[BACK_RIGHT][TOP_CENTER] += 0.5; } else if (av_channel_layout_index_from_channel(out_ch_layout, AV_CHAN_SIDE_LEFT) >= 0) { diff --git a/tests/ref/fate/swr-rematrix-22.2-7.1.2 b/tests/ref/fate/swr-rematrix-22.2-7.1.2 index 14a4179a5d..eebdb10b2b 100644 --- a/tests/ref/fate/swr-rematrix-22.2-7.1.2 +++ b/tests/ref/fate/swr-rematrix-22.2-7.1.2 @@ -2,9 +2,9 @@ [FR] = { .FL = 0.000000, .FR = 1.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 1.000000, .BC = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 1.000000, }, [FC] = { .FL = 0.000000, .FR = 0.000000, .FC = 1.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 1.000000, .BFL = 0.000000, .BFR = 0.000000, }, [LFE] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 1.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, .LFE2 = 0.707107, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, -[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 1.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.707107, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.707107, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, -[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 1.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.707107, .SL = 0.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.707107, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, -[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, .SL = 1.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, -[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, .SL = 0.000000, .SR = 1.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, +[BL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 1.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.707107, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.707107, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, +[BR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 1.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.707107, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.707107, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, +[SL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, .SL = 1.000000, .SR = 0.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, +[SR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, .SL = 0.000000, .SR = 1.000000, .TC = 0.000000, .TFL = 0.000000, .TFC = 0.000000, .TFR = 0.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, [TFL] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 1.000000, .TFC = 0.707107, .TFR = 0.000000, .TBL = 0.707107, .TBC = 0.000000, .TBR = 0.000000, .LFE2 = 0.000000, .TSL = 0.707107, .TSR = 0.000000, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, [TFR] = { .FL = 0.000000, .FR = 0.000000, .FC = 0.000000, .LFE = 0.000000, .BL = 0.000000, .BR = 0.000000, .FLC = 0.000000, .FRC = 0.000000, .BC = 0.000000, .SL = 0.000000, .SR = 0.000000, .TC = 0.500000, .TFL = 0.000000, .TFC = 0.707107, .TFR = 1.000000, .TBL = 0.000000, .TBC = 0.000000, .TBR = 0.707107, .LFE2 = 0.000000, .TSL = 0.000000, .TSR = 0.707107, .BFC = 0.000000, .BFL = 0.000000, .BFR = 0.000000, }, -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
