Commit 229e8358 authored by Adam Mills's avatar Adam Mills
Browse files

More cleanup, removing the 16ch td decorr unused configs.

parent 5e493f12

lib_com/ivas_cnst.h

+2 −13
Original line number Diff line number Diff line
@@ -1095,22 +1095,11 @@ enum 
    IVAS_TD_DECORR_OUT_2CH,

    IVAS_TD_DECORR_OUT_3CH,

    IVAS_TD_DECORR_OUT_4CH,

    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

    IVAS_TD_DECORR_OUT_5CH

};



#define IVAS_SPAR_MAX_DMX_CHS                   4

#define IVAS_MAX_DECORR_CHS                     IVAS_TD_DECORR_OUT_15CH

#define IVAS_MAX_DECORR_CHS                     IVAS_TD_DECORR_OUT_5CH

#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

+0 −13
Original line number Diff line number Diff line
@@ -328,21 +328,8 @@ static int16_t ivas_get_APD_filt_orders( 
            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;

lib_enc/ivas_spar_encoder.c

+4 −0
Original line number Diff line number Diff line
@@ -954,6 +954,10 @@ static ivas_error ivas_spar_enc_process( 
        }

        else

        {

            /* IVAS_fmToDo: This AGC on/off bit should be removed when the command line option to force enable/disable AGC is

             * removed.

             * On the decoder side, ivas_agc_enc_get_flag could be used instead to determine if AGC is on or not. The

             * ivas_agc_enc_get_flag function should be moved to ivas_agc_com.c and renamed when this occurs. */

            push_next_indice( hMetaData, 0, 1 );

        }

    }