[FFmpeg-devel] [PATCH] Use channel count if channel layout is undefined

[Michael Niedermayer]

On Mon, Jul 09, 2018 at 04:48:02PM +0100, Marcin Gorzel wrote:
> Rematrixing supports up to 64 channels but there is only a limited number of channel layouts defined. Currently, in/out channel count is obtained from the channel layout so if the channel layout is undefined (e.g. for 9, 10, 11 channels etc.) the in/out channel count will be 0 and the rematrixing will fail. This change adds a check if the channel layout is non-zero, and if not, prefers to use the in|out_ch_count instead. This seems to be related to ticket #6790.
> ---
>  libavcodec/utils.c                |  1 +
>  libswresample/rematrix.c          | 18 ++++++++++++------
>  libswresample/swresample.c        | 10 ++++++++++
>  libswresample/x86/rematrix_init.c |  8 ++++++--
>  4 files changed, 29 insertions(+), 8 deletions(-)

Changes to libavcodec and libswresample should be in seperate patches

a fate test for the case that is fixed would also be good probably

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20180713/2e31db33/attachment.sig>