Commit 3e3a924d authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

refactoring of ind_list allocation mechanism based on long buffer

parent d9c1c08f

apps/encoder.c

+2 −0
Original line number Diff line number Diff line
@@ -760,10 +760,12 @@ int main( 
        }



        frame++;

#ifndef DEBUG_IND_LIST

        if ( !arg.quietModeEnabled )

        {

            fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

        }

#endif



#ifdef WMOPS

        update_mem();

lib_com/bitstream.c

+603 −146

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -180,7 +180,10 @@ typedef enum 
#define MAX_NUM_METADATA                        max( 2, MAX_NUM_OBJECTS )   /* number of max. metadata (now only 2 for DirAC) */

#endif

#ifdef IND_LIST_DYN

#define MIN_NUM_IND                             10                          /* minimum number of indices in the core coder */

#define MAX_NUM_IND_LFE                         100                         /* maximum number of indices in the LFE encoder */

#define MAX_NUM_IND_TEMP_LIST                   10                          /* maximum number of indices in the temporary list */

#define MAX_IND_TDM_TMP                         10                          /* maximum number of indices in the temporary list of TD stereo spatial parameters */

#endif



#define IVAS_ENC_DELAY_NS                       ACELP_LOOK_NS

lib_com/ivas_prot.h

+0 −3
Original line number Diff line number Diff line
@@ -2094,9 +2094,6 @@ void InternalTCXDecoder( 


void stereo_mdct_core_enc(

    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                   */

#ifdef IND_LIST_DYN

    const int16_t ivas_format,                                  /* i  : IVAS format               */ 

#endif

    float new_samples[CPE_CHANNELS][L_INP],                     /* i  : new samples                             */

    float old_wsp[CPE_CHANNELS][L_WSP],                         /* i  : 12.8kHz weighted speech (for LTP        */

    float pitch_buf[CPE_CHANNELS][NB_SUBFR16k]                  /* o  : floating pitch for each subframe        */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ 


#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

#define IND_LIST_DYN                                    /* VA: Issue 18: Dynamic allocation of ind_list[] and ind_list_metadata[] based on # of transport channels */

//#define DEBUG_IND_LIST



#define LSF_RE_USE_SECONDARY_CHANNEL                    /* TD stereo Secondary channel LSF Q improvement */

#ifdef LSF_RE_USE_SECONDARY_CHANNEL