Commit 82603e74 authored by Nicolas Roussin's avatar Nicolas Roussin
Browse files

Merge branch '2142-implement-basop-w_min-and-w_max-functions' into... 

Merge branch '2142-implement-basop-w_min-and-w_max-functions' into 2157-optimize-ivas_dirac_dec_binaural_formulate_input_covariance_matrices
parents 27976ffb 0134533b

apps/decoder.c

+16 −3
Original line number Diff line number Diff line
@@ -1468,6 +1468,18 @@ static bool parseCmdlIVAS_dec( 
        return false;

    }



#ifdef SUPPORT_JBM_TRACEFILE

    /* Validate options that depend on other options */

    if ( arg->jbmTraceFilename != NULL && arg->delayCompensationEnabled

         /* This decMode check should be removed once timestamp sync issues between JBM trace and audio are fixed in EVS */

         && arg->decMode != IVAS_DEC_MODE_EVS )

    {

        fprintf( stderr, "Error: Writing to a JBM trace file requires delay compensation to be disabled with -no_delay_cmp\n\n" );

        usage_dec();

        return false;

    }

#endif



    return true;

}
@@ -1504,7 +1516,8 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      EVS RTP Payload Format. The SDP parameter hf_only is required.\n" );

    fprintf( stdout, "                      Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.\n" );

#ifdef SUPPORT_JBM_TRACEFILE

    fprintf( stdout, "-Tracefile TF       : VoIP mode: Generate trace file named TF\n" );

    fprintf( stdout, "-Tracefile TF       : VoIP mode: Generate trace file named TF. Requires -no_delay_cmp to\n" );

    fprintf( stdout, "                      be enabled so that trace contents remain in sync with audio output.\n" );

#endif

    fprintf( stdout, "-fr L               : render frame size in ms L=(5,10,20), default is 20)\n" );

    fprintf( stdout, "-fec_cfg_file       : Optimal channel aware configuration computed by the JBM   \n" );
@@ -1678,13 +1691,13 @@ static ivas_error initOnFirstGoodFrame( 
        return error;

    }



    int16_t *zeroBuf = malloc( pcmFrameSize * sizeof( int16_t ) );

    /* Write zeros to the output audio buffer */

    int16_t *zeroBuf = calloc( pcmFrameSize, sizeof( int16_t ) );

    if ( zeroBuf == NULL )

    {

        fprintf( stdout, "Error: Unable to allocate memory for output buffer.\n" );

        return IVAS_ERR_FAILED_ALLOC;

    }

    memset( zeroBuf, 0, pcmFrameSize * sizeof( int16_t ) );



    for ( int16_t i = 0; i < numInitialBadFrames; ++i )

    {

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -192,8 +192,13 @@ typedef enum 
#define JBM_CLDFB_SLOTS_IN_SUBFRAME_LOG2        2                           /* To be used for shift operation instead of division */

#define MAX_JBM_CLDFB_TIMESLOTS                 32

#define DEFAULT_JBM_CLDFB_TIMESLOTS             16

#ifdef JBM_MEMORY_OPT

#define MAX_JBM_L_FRAME48k                      ( IVAS_MAX_FRAME_SIZE * 2 ) /* 1920:  max. time-scaled frame buffer length (per channel) in samples */

#define MAX_JBM_L_FRAME_NS                      40000000L                   /* 40 ms: time-scaled frame size in ns, proportional to MAX_JBM_L_FRAME48k  */

#else

#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

#endif

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#define MAX_CLDFB_DIGEST_CHANNELS               3                           /* == maximum of ParamISM TCs and ParamMC TCs */

lib_com/ivas_prot_fx.h

+119 −99

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_tools_fx.c

+68 −0

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#endif



/*#define DISABLE_LIMITER*/

/*#define DEBUG_APA_SILENCE_NON_SCALED*/        /* Switch APA into mode that replaces contents of non-scaled frames with silence. Useful for identifying scaled regions in the audio output of the decoder  */



/* #################### End DEBUGGING switches ############################ */
@@ -109,8 +110,10 @@ 
#define FIX_1288_SPLIT_REND_XSAN                        /* Dlb: Fix asan, msan and usan issues in split rendering mode*/

#define FIX_NCHAN_BUFFERS                               /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */

#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define JBM_MEMORY_OPT                                  /* VA: issue 916: optimization of RAM in the JBM decoder */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */

#define CODE_IMPROVEMENTS





// object-editing feature porting