Commit 7b89b5d9 authored by Adam Mills's avatar Adam Mills
Browse files

The number of decorr chs should be 8, this fixes it

parent 42bd76ed

lib_com/ivas_cnst.h

+6 −3
Original line number Diff line number Diff line
@@ -1100,18 +1100,21 @@ typedef enum 


#define IVAS_SPAR_BR_TABLE_LEN                  20



/* TD decorr */ // ToDo: not all 16CH are currently supported -> to be revisited later

/* TD decorr */

enum

{

    IVAS_TD_DECORR_OUT_1CH = 1,

    IVAS_TD_DECORR_OUT_2CH,

    IVAS_TD_DECORR_OUT_3CH,

    IVAS_TD_DECORR_OUT_4CH,

    IVAS_TD_DECORR_OUT_5CH

    IVAS_TD_DECORR_OUT_5CH,

    IVAS_TD_DECORR_OUT_6CH,

    IVAS_TD_DECORR_OUT_7CH,

    IVAS_TD_DECORR_OUT_8CH

};



#define IVAS_SPAR_MAX_DMX_CHS                   4

#define IVAS_MAX_DECORR_CHS                     IVAS_TD_DECORR_OUT_5CH

#define IVAS_MAX_DECORR_CHS                     IVAS_TD_DECORR_OUT_8CH 

#define IVAS_MAX_DECORR_APD_SECTIONS            16

#define IVAS_APD_2_SECT                         2

#define IVAS_APD_4_SECT                         4

lib_com/ivas_td_decorr.c

+5 −1
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ static int16_t ivas_get_APD_filt_orders( 
    int16_t i;

    int16_t num_apd_sections = 0;

    float sum_R, R[IVAS_MAX_DECORR_APD_SECTIONS];

    printf("Och %d\n", num_out_chans);



    switch ( num_out_chans )

    {
@@ -327,6 +328,9 @@ static int16_t ivas_get_APD_filt_orders( 
            num_apd_sections = IVAS_APD_4_SECT;

            break;

        case IVAS_TD_DECORR_OUT_5CH:

        case IVAS_TD_DECORR_OUT_6CH:

        case IVAS_TD_DECORR_OUT_7CH:

        case IVAS_TD_DECORR_OUT_8CH:

            num_apd_sections = IVAS_APD_8_SECT;

            break;

        default:
@@ -345,7 +349,7 @@ static int16_t ivas_get_APD_filt_orders( 
    {

        APD_filt_orders[i] = (int16_t) ceil( output_Fs * IVAS_DECORR_PARM_APD_TAU * R[i] / sum_R );

    }



    printf("NUM_APD: %d\n", num_apd_sections);

    return num_apd_sections;

}