Commit 48c82889 authored by vaclav's avatar vaclav
Browse files

reverb IVAS_MAX_OUTPUT_CHANNELS change

parent d3d11bb8

lib_com/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


#define IVAS_MAX_NUM_OBJECTS       4

#define IVAS_MAX_INPUT_CHANNELS    16

#define IVAS_MAX_OUTPUT_CHANNELS   20

#define IVAS_MAX_OUTPUT_CHANNELS   16 /* Note: there is an exception for OSBA and EXT otuput where it can be 20 (HOA3 + 4 ISM channels) */

#define IVAS_CLDFB_NO_COL_MAX      16

#define IVAS_CLDFB_NO_CHANNELS_MAX 60

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -2375,7 +2375,7 @@ ivas_error IVAS_DEC_GetFormat( 




/*---------------------------------------------------------------------*

 * getInputBufferSize()

 * getOutputBufferSize()

 *

 *

 *---------------------------------------------------------------------*/
@@ -2391,7 +2391,7 @@ static int16_t getOutputBufferSize( 


    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

    {

        return (int16_t) ( st_ivas->hDecoderConfig->output_Fs * IVAS_MAX_OUTPUT_CHANNELS / FRAMES_PER_SEC );

        return (int16_t) ( st_ivas->hDecoderConfig->output_Fs * ( IVAS_MAX_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) / FRAMES_PER_SEC );

    }

    else if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM )

    {

lib_rend/ivas_reverb_utils.c

+8 −8
Original line number Diff line number Diff line
@@ -30,8 +30,16 @@ 


*******************************************************************************************************/



#include <stdint.h>

#include "options.h"

#include "prot.h"

#include "ivas_prot_rend.h"

#include "ivas_rom_rend.h"

#include <math.h>

#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmc_auto.h"





/*-----------------------------------------------------------------------------------------*
@@ -48,14 +56,6 @@ 
 * Local function prototypes

 *-----------------------------------------------------------------------------------------*/



#ifndef min

#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )

#endif



#ifndef max

#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )

#endif



typedef struct cldfb_convolver_state

{

    const float *filter_taps_left_re[CLDFB_NO_CHANNELS_MAX];

readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ Where the first two rows are comma separated azimuth and elevation positions of 
The output channel ordering is 0, 1, ... N-1. The third row contains an index "LFE0" (zero based) 

specifying the output channel to which the LFE input will be routed if present. If the third row is 

omitted, the LFE input is downmixed to all channels with a factor of 1/N. Position is not considered for

the LFE channel. Maximum number of supported loudskpeakers N is 20.

the LFE channel. Maximum number of supported loudskpeakers N is 16.

An example custom loudspeaker layout file is available: ls_setup_16ch_8+4+4.txt