Commit 9faa4a2e authored by emerit's avatar emerit
Browse files

Merge branch '744_step3_code_changes' into 744_step4_hrtf_binary_tests

parents f88d7eeb c8feb725

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -328,11 +328,7 @@ static const CmdLnParser_Option cliOptions[] = { 
      .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" },

    {

        .id = CmdLnOptionId_noDelayCmp,

#ifdef FIX_929_RENDERER_CMDL

        .match = "no_delay_compensation",

#else

        .match = "no_delay_comparison",

#endif

        .matchShort = "no_delay_cmp",

        .description = "[flag] Turn off delay compensation",

    },

lib_com/options.h

+4 −8
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
/* ################### Start DEBUGGING switches ########################### */



#ifndef RELEASE

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

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

#endif

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

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */
@@ -151,11 +151,9 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_SPLITREND_WARNINGS                          /* FhG: fix warnings related to split rendering observed in build jobs */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */

#define FIX_929_RENDERER_CMDL                           /* Nokia: issue #929: renderer command line option */

#define FIX_910_REMOVE_DUPLICATION_TD_REND              /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */

#define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */

#define FIX_WARNING_AS_ERROR



#define FIX_CRASH_LONG_BRIR                             /* Orange : Fix crash when long BRIR is set */

#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange : Missing left/right and coherence late reverb tables in binary format*/
@@ -172,11 +170,9 @@ 
#define NONBE_FIX_BINARY_BINAURAL_READING                     /* Orange: Add support for reading binaural binary file */

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

#define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 908: fix crash in OSBA BR switching with long test vectors */

#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR               /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */

#define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING                 /* Dlb: issue 907: fix for band mapping at VLBR */

#define NONBE_FIX_869_MASA_PREREND_MERGE                      /* Nokia: issue: #869: MASA pre-rend not updating energy */

#define NONBE_FIX_931_IGF_STEREO_DEC_NOISE	                  /* FhG: issue #931: fix noise substitution in the stereo IGF decoder      */



/* ##################### End NON-BE switches ########################### */

lib_dec/igf_dec.c

+16 −0
Original line number Diff line number Diff line
@@ -490,7 +490,11 @@ static void IGF_prepStereo( 
            {

                if ( hPrivateDataL->n_noise_bands_off )

                {

#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE

                    IGF_replaceTCXNoise_2_new( src_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );

#else

                    IGF_replaceTCXNoise_2_new( igf_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );

#endif

                }

                sel_specL = src_specL;

            }
@@ -507,7 +511,11 @@ static void IGF_prepStereo( 
            {

                if ( hPrivateDataR->n_noise_bands_off )

                {

#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE

                    IGF_replaceTCXNoise_2_new( src_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );

#else

                    IGF_replaceTCXNoise_2_new( igf_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );

#endif

                }

                sel_specR = src_specR;

            }
@@ -574,7 +582,11 @@ static void IGF_prepStereo( 
                {

                    if ( hPrivateDataL->n_noise_bands_off )

                    {

#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE

                        IGF_replaceTCXNoise_2_new( src_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );

#else

                        IGF_replaceTCXNoise_2_new( igf_specL, TCXNoiseL, strt_cpy, stop, hPrivateDataL->totalNoiseNrg_off, hPrivateDataL->n_noise_bands_off, hInfoL->nfSeed );

#endif

                    }

                    sel_specL = src_specL;

                }
@@ -591,7 +603,11 @@ static void IGF_prepStereo( 
                {

                    if ( hPrivateDataR->n_noise_bands_off )

                    {

#ifdef NONBE_FIX_931_IGF_STEREO_DEC_NOISE

                        IGF_replaceTCXNoise_2_new( src_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );

#else

                        IGF_replaceTCXNoise_2_new( igf_specR, TCXNoiseR, strt_cpy, stop, hPrivateDataR->totalNoiseNrg_off, hPrivateDataR->n_noise_bands_off, hInfoR->nfSeed );

#endif

                    }

                    sel_specR = src_specR;

                }

lib_dec/ivas_binRenderer_internal.c

+0 −4
Original line number Diff line number Diff line
@@ -1229,11 +1229,7 @@ ivas_error ivas_binRenderer_open( 
    }



    /* Allocate memories needed for reverb module */

#ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

    {

        if ( ( error = ivas_binaural_reverb_open_fastconv( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK )

        {

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2110,11 +2110,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
        {

            num_tc = CPE_CHANNELS;

        }

#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA

        if ( num_tc == 3 )

#else

        if ( ( st_ivas->sba_planar && num_tc >= 3 ) || ( num_tc == 3 ) )

#endif

        {

            num_tc++;

        }