Commit 27750da1 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1483_basop_cleanup' into 'main-pc' 

1483 basop cleanup

See merge request !1400
parents e32c5a0d e9025c6e

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -323,11 +323,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

+0 −6
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ 
#define FIX_1300_ICA_SHIFT_QUANT_IMPROV         /* VA: Fix to 1300 to improve precision of the lag quantizer */

#define FIX_1301_CORRECT_TD_CNST                /* VA: Fix 1301, correct wrong constant in TD stereo */

#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: FLP issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */

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

//#define OPT_STEREO_32KBPS_V1                    /* Optimization made in stereo decoding path for 32kbps decoding */

#define DOT_PROD_CHOLESKY_64BIT                 /* FhG: Issue 1323, optimized 64 bit implementation of dot_product_cholesky() */

#define OPT_BASOP_ADD_v1                        /* optimizations to avoid usage of BASOP_Util_Add_MantExp */
@@ -183,11 +182,6 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#define FIX_1372_ISAR_POST_REND

#endif

#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 NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

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

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

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#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 */

lib_dec/ivas_binRenderer_internal_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1512,11 +1512,7 @@ ivas_error ivas_binRenderer_open_fx( 


    /* Allocate memories needed for reverb module */

    test();

#ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR

    IF( ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

    {

        IF( NE_32( ( error = ivas_binaural_reverb_open_fastconv_fx( &( 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_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -3419,13 +3419,7 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx( 
            move16();

        }



#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA

        if ( EQ_16( num_tc, 3 ) )

#else

        test();

        test();

        if ( ( st_ivas->sba_planar && GE_16( num_tc, 3 ) ) || EQ_16( num_tc, 3 ) )

#endif

        {

            num_tc = add( num_tc, 1 );

        }

lib_dec/ivas_sba_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -361,12 +361,8 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
        test();

        test();

        test();

#ifdef NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH

        test();

        IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && ( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) )

#else

        IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && EQ_32( st_ivas->ivas_format, SBA_FORMAT ) )

#endif

        {

            IF( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL )

            {