Commit d3edb2e5 authored by Adam Mills's avatar Adam Mills
Browse files

Adding back in the 16ch macros to see if it fixes tests

parent 860fefe4

lib_com/ivas_cnst.h

+14 −3
Original line number Diff line number Diff line
@@ -1100,18 +1100,29 @@ typedef enum 


#define IVAS_SPAR_BR_TABLE_LEN                  20



/* TD decorr */

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

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,

    IVAS_TD_DECORR_OUT_9CH,

    IVAS_TD_DECORR_OUT_10CH,

    IVAS_TD_DECORR_OUT_11CH,

    IVAS_TD_DECORR_OUT_12CH,

    IVAS_TD_DECORR_OUT_13CH,

    IVAS_TD_DECORR_OUT_14CH,

    IVAS_TD_DECORR_OUT_15CH,

    IVAS_TD_DECORR_OUT_16CH

};



#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_16CH

#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

+13 −1
Original line number Diff line number Diff line
@@ -326,10 +326,22 @@ static int16_t ivas_get_APD_filt_orders( 
        case IVAS_TD_DECORR_OUT_4CH:

            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;

        case IVAS_TD_DECORR_OUT_9CH:

        case IVAS_TD_DECORR_OUT_10CH:

        case IVAS_TD_DECORR_OUT_11CH:

        case IVAS_TD_DECORR_OUT_12CH:

        case IVAS_TD_DECORR_OUT_13CH:

        case IVAS_TD_DECORR_OUT_14CH:

        case IVAS_TD_DECORR_OUT_15CH:

        case IVAS_TD_DECORR_OUT_16CH:

            num_apd_sections = IVAS_APD_16_SECT;

            break;

        default:

            assert( !"Invalid num out chans" );

            break;