Commit a90ac799 authored by malenov's avatar malenov
Browse files

Merge branch 'va/wmc_tool' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into va/wmc_tool

parents ee5e18f9 53c20512

lib_com/options.h

+4 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 
#ifndef RELEASE

#define DEBUGGING                               /* Activate debugging part of the code */

#endif

/*#define WMOPS*/                               /* Activate complexity and memory analysis */

/*#define WMOPS_PER_FRAME*/                     /* Write per-frame complexity to the file "wmops_analysis" (one float value per frame) */

#define WMOPS                               /* Activate complexity and memory counters */

/*#define WMOPS_PER_FRAME*/                     /* Output complexity in WMOPS per frame to the file "res/wmops" (one float value per frame) */

/*#define WMOPS_DETAIL*/                        /* Output detailed complexity printout for every function. Increases runtime overhead */

/*#define WMOPS_WC_FRAME_ANALYSIS*/             /* Output detailed complexity analysis for the worst-case frame */

/*#define MEM_COUNT_DETAILS*/                   /* Output detailed memory analysis for the worst-case frame (write to the file "mem_analysis.csv") */
@@ -174,6 +174,8 @@ 
/* NTT switches */

#define NTT_REDUC_COMP_POC                              /* Contribution  : Complexity reduction of phase spectrum in stereo downmix*/



#define INTRAFRAME_HEAP_MANAGEMENT



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_dec/ivas_dirac_dec.c

+13 −0
Original line number Diff line number Diff line
@@ -774,6 +774,7 @@ ivas_error ivas_dirac_dec_config( 
    /* output synthesis */

    ivas_dirac_dec_output_synthesis_init( hDirAC, nchan_out_woLFE );



#ifndef INTRAFRAME_HEAP_MANAGEMENT

    /* Allocate stack memory */

    if ( flag_config != DIRAC_OPEN )

    {
@@ -783,6 +784,7 @@ ivas_error ivas_dirac_dec_config( 
    ivas_dirac_alloc_mem( hDirAC, st_ivas->renderer_type, &( hDirAC->stack_mem ) );

#else

    ivas_dirac_alloc_mem( hDirAC, &( hDirAC->stack_mem ) );

#endif

#endif



    mvs2s( DirAC_block_grouping, hDirAC->block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 );
@@ -1114,7 +1116,9 @@ void ivas_dirac_dec_close( 
        hDirAC->masa_stereo_type_detect = NULL;

    }



#ifndef INTRAFRAME_HEAP_MANAGEMENT

    ivas_dirac_free_mem( &( hDirAC->stack_mem ) );

#endif



    free( hDirAC );
@@ -1883,7 +1887,12 @@ void ivas_dirac_dec( 


    /* Initialize aux buffers */

    hDirAC = st_ivas->hDirAC;



#ifdef INTRAFRAME_HEAP_MANAGEMENT

    ivas_dirac_alloc_mem( hDirAC, st_ivas->renderer_type, &DirAC_mem );

#else

    DirAC_mem = st_ivas->hDirAC->stack_mem;

#endif



    reference_power = DirAC_mem.reference_power;

    reference_power_smooth = DirAC_mem.reference_power + hDirAC->num_freq_bands;
@@ -2551,6 +2560,10 @@ void ivas_dirac_dec( 
        }

    }



#ifdef INTRAFRAME_HEAP_MANAGEMENT

    ivas_dirac_free_mem( &DirAC_mem );

#endif



    pop_wmops();



    return;

lib_dec/ivas_stat_dec.h

+2 −1
Original line number Diff line number Diff line
@@ -698,8 +698,9 @@ typedef struct ivas_dirac_dec_data_structure 
    float *proto_frame_f;

    float *proto_frame_dec_f;



#ifndef INTRAFRAME_HEAP_MANAGEMENT

    DIRAC_DEC_STACK_MEM stack_mem;



#endif

    MASA_STEREO_TYPE_DETECT *masa_stereo_type_detect;



    int16_t num_ele_spk_no_diffuse_rendering;

lib_enc/ivas_agc_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -360,7 +360,8 @@ void ivas_agc_enc_process( 
#ifndef CLEANUP_185_NO_AGC_EXCEPTION

                pState->gain_data[i].gainException = FALSE;

#endif

                pState->gain_state[i].gainExpVal = (int16_t) ceilf( -logf( actualMaxAbsVal * MDFT_NORM_SCALING ) / logf( pState->agc_com.winFunc[min( offset - 1, MaxAbsValIdx )] ) );

                idx = min( offset - 1, MaxAbsValIdx );

                pState->gain_state[i].gainExpVal = (int16_t) ceilf( -logf( actualMaxAbsVal * MDFT_NORM_SCALING ) / logf( pState->agc_com.winFunc[idx] ) );



                while ( !isCompensated )

                {

lib_rend/ivas_rotation.c

+1 −0
Original line number Diff line number Diff line
@@ -939,6 +939,7 @@ static float SHrot_w( 
    return 0.0;

}





#ifdef EXT_RENDERER

void SHrotmatgen(

#else

lib_dec/ivas_dirac_dec_binaural_functions.c

+14 −14

File changed.

Contains only whitespace changes.