Commit 46029f25 authored by malenovsky's avatar malenovsky
Browse files

Merge branch '18-allocation-of-memory-for-the-buffers-of-bitstream-indices-7' into 'main' 

[BE] Resolve 18: Dynamic allocation of intermediate buffer of indices

See merge request !494
parents 0e7d0ef5 d58fa178

.gitignore

+12 −0
Original line number Diff line number Diff line
@@ -72,3 +72,15 @@ Externals/ 


# coan output files that are created when cleaning out switches

coan_out_*

/COMPLEXITY

/res

/tv

/wmops

/Workspace_msvc/renderer.args.json

/Workspace_msvc/encoder.args.json

/Workspace_msvc/decoder.args.json

/scripts/mem_analysis_enc_VBR_5k9.csv

/scripts/mem_analysis_enc_STEREO_sw.png

/scripts/mem_analysis_enc_STEREO_sw.csv

/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv

*.pwv

lib_com/bitstream.c

+1096 −82

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -447,7 +447,9 @@ enum 
    IND_STEREO_2ND_CODER_T,



    IND_UNUSED,

#ifndef IND_LIST_DYN

    MAX_NUM_INDICES = IND_UNUSED + 772 /* Total 2640 in line with MAX_BITS_METADATA */

#endif

};



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

lib_com/ivas_cnst.h

+8 −1
Original line number Diff line number Diff line
@@ -192,8 +192,15 @@ typedef enum 
#define MAX_CPE                                 ( MAX_TRANSPORT_CHANNELS / CPE_CHANNELS )    /* max. number of CPEs */



#define MAX_BITS_METADATA                       2640                        /* max. bit-budget of metadata, one channel */ /* IVAS_fmToDo: to be confirmed for final value once mature */

#ifndef IND_LIST_DYN

#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

#define IVAS_DEC_DELAY_NS                       3250000L                    /* 3.25 ms: IVAS decoder delay (without renderer delay) */

lib_com/ivas_prot.h

+7 −3
Original line number Diff line number Diff line
@@ -275,9 +275,11 @@ void ivas_initialize_handles_enc( 
);



ivas_error ivas_init_encoder(

    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */

    Indice ind_list[][MAX_NUM_INDICES],                         /* i  : indices list                            */

    Indice ind_list_metadata[][MAX_BITS_METADATA]               /* i  : indices list metadata                   */

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

#ifndef IND_LIST_DYN

    ,Indice ind_list[][MAX_NUM_INDICES]                         /* i  : indices list                            */

    ,Indice ind_list_metadata[][MAX_BITS_METADATA]               /* i  : indices list metadata                   */

#endif

);



void destroy_core_enc(
@@ -3235,7 +3237,9 @@ void ivas_qmetadata_close( 
void restore_metadata_buffer(

    BSTR_ENC_HANDLE hMetaData,

    const int16_t next_ind_start,

#ifndef IND_LIST_DYN

    const int16_t last_ind_start,

#endif

    const int16_t bit_pos_start 

);