Commit 66f90576 authored by Nicolas Roussin's avatar Nicolas Roussin
Browse files

Optimize.

parent f34e91dd

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -84,3 +84,5 @@ coan_out_* 
/scripts

/tests

/pytest.ini

/build

audio.wav

CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -117,8 +117,12 @@ endif() 


# configuration options for all platforms

set(WMOPS OFF CACHE BOOL "enable WMOPS")

set(WMOPS_DETAIL OFF CACHE BOOL "enable WMOPS detail")

if(WMOPS)

  add_definitions("-DWMOPS=1")

  if(WMOPS_DETAIL)

    add_definitions("-DWMOPS_DETAIL=1")

  endif()

endif()



project(stereo-evs LANGUAGES C)
@@ -216,7 +220,7 @@ target_link_libraries(ISAR_post_rend lib_basop lib_isar lib_util lib_com) 
target_include_directories(ISAR_post_rend PRIVATE lib_basop lib_isar)



add_executable(ambi_converter apps/ambi_converter.c)

target_link_libraries(ambi_converter lib_util lib_com lib_basop)

target_link_libraries(ambi_converter lib_util lib_com lib_basop lib_debug)

if(UNIX)

  target_link_libraries(ambi_converter m)

endif()

lib_com/options.h

+5 −7
Original line number Diff line number Diff line
@@ -56,12 +56,10 @@ 
#define SUPPORT_JBM_TRACEFILE                   /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */



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

#ifdef WMOPS

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

#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 (writes to the file "mem_analysis.csv") */

#endif

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

/*#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 (writes to the file "mem_analysis.csv") */



/*#define DISABLE_LIMITER*/

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+350 −17

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_stat_rend.h

+7 −0
Original line number Diff line number Diff line
@@ -612,6 +612,13 @@ typedef struct ivas_dirac_dec_binaural_data_structure 
    Word16 q_processMtxDec;

    Word16 q_processMtxDecPrev;



    Word64 ChEne[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    Word64 ChEnePrev[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    Word64 ChCrossRe[CLDFB_NO_CHANNELS_MAX];

    Word64 ChCrossRePrev[CLDFB_NO_CHANNELS_MAX];

    Word64 ChCrossIm[CLDFB_NO_CHANNELS_MAX];

    Word64 ChCrossImPrev[CLDFB_NO_CHANNELS_MAX];



    Word32 ChEnePrev_fx[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    Word32 ChCrossRePrev_fx[CLDFB_NO_CHANNELS_MAX];

    Word32 ChCrossImPrev_fx[CLDFB_NO_CHANNELS_MAX];