Commit 05fabca9 authored by bayers's avatar bayers
Browse files

merged main into 126-hfbmixer-handle-at-the-encoder

parents ec3b686a 141816b3

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ external-renderer-pytest-on-merge-request: 
    - *print-common-info



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[rend(erer)*[ -]*non[ -]*be\]") || true

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[rend\(erer\)*[ -]*non[ -]*be\]") || true

    # TODO: needs splitting the test between reference and cut generation

    #- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

apps/decoder.c

+10 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,11 @@ static ivas_error decodeG192( 
        }

#ifdef WMOPS

        update_wmops();

#endif

#ifdef DEBUGGING

#ifdef RAM_ANALYSIS

        mem_analyze();

#endif

#endif

    }
@@ -1840,6 +1845,11 @@ static ivas_error decodeVoIP( 


#ifdef WMOPS

        update_wmops();

#endif

#ifdef DEBUGGING

#ifdef RAM_ANALYSIS

        mem_analyze();

#endif

#endif

    }

apps/encoder.c

+5 −0
Original line number Diff line number Diff line
@@ -765,6 +765,11 @@ int main( 


#ifdef WMOPS

        update_wmops();

#endif

#ifdef DEBUGGING

#ifdef RAM_ANALYSIS

        mem_analyze();

#endif

#endif

    }

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
/*#define WMOPS_PER_FRAME*/                     /* Output complexity in WMOPS per frame to the file "res/wmops" (one float value per frame) */

/*#define WMOPS_DETAIL*/                        /* Activate complexity detail printout for every function. Increases runtime overhead */

/*#define WMOPS_WC_FRAME_ANALYSIS*/             /* Output WMOPS analysis for worst case frame */

/*#define RAM_ANALYSIS*/                        /* Output memory allocated with count_malloc each frame. Can be parsed and plotted with scripts/mem_analysis.m */



#ifdef DEBUGGING

lib_debug/mem_count.c

+24 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ typedef INT64 int64_t; 
#define FALSE 0

#endif



#ifdef RAM_ANALYSIS

#include "debug.h"

#endif



/* How to use the tool notes

   =========================
@@ -906,4 +910,24 @@ size_t mem_count_summary( Counting_Size cnt_size ) 
    return size;

}



#ifdef DEBUGGING

#ifdef RAM_ANALYSIS

void mem_analyze( void )

{

    unsigned int i;

    char buffer[1024];



    for ( i = 0; i < Num_Records_Cur_RAM; i++ )

    {

        sprintf( buffer, "%s:%d,%ld;", Current_Allocations[i].name, Current_Allocations[i].lineno, Current_Allocations[i].block_size );

        dbgwrite( buffer, sizeof( char ), strlen( buffer ), 1, "mem_analysis.csv" );

    }

    sprintf( buffer, "\n" );

    dbgwrite( buffer, sizeof( char ), strlen( buffer ), 1, "mem_analysis.csv" );



    return;

}

#endif

#endif



#endif