Skip to content

V
vlc
Commit e49759a3 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

codec: opus: don't support more than 8 channels 

We have no mapping for > 8 channels.
cid #1062574
parent 202c1123
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/codec/opus.c
View file @ e49759a3
...@@ -283,7 +283,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket ) ...@@ -283,7 +283,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
msg_Dbg( p_dec, "Opus audio with %d channels", p_header->channels); msg_Dbg( p_dec, "Opus audio with %d channels", p_header->channels);
if((p_header->channels>2 && p_header->channel_mapping==0) || if((p_header->channels>2 && p_header->channel_mapping==0) ||
(p_header->channels>8 && p_header->channel_mapping==1) || p_header->channels>8 ||
p_header->channel_mapping>1) p_header->channel_mapping>1)
{ {
msg_Err( p_dec, "Unsupported channel mapping" ); msg_Err( p_dec, "Unsupported channel mapping" );
...@@ -297,7 +297,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket ) ...@@ -297,7 +297,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
p_dec->fmt_out.audio.i_channels = p_header->channels; p_dec->fmt_out.audio.i_channels = p_header->channels;
p_dec->fmt_out.audio.i_rate = 48000; p_dec->fmt_out.audio.i_rate = 48000;
if( p_header->channels>2 && p_header->channels<9 ) if( p_header->channels>2 )
{ {
static const uint32_t *pi_ch[6] = { pi_3channels_in, pi_4channels_in, static const uint32_t *pi_ch[6] = { pi_3channels_in, pi_4channels_in,
pi_5channels_in, pi_6channels_in, pi_5channels_in, pi_6channels_in,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment