Commit 41260095 authored by vasilache's avatar vasilache
Browse files

1716_basop_port

parent a56ff949

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: (no changes needed in BASOP) fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS            /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF   */           /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_dirac_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ ivas_error ivas_dirac_dec_config_fx( 
#endif

            {

#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF

                IF( NE_32( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, &( st_ivas->hHrtfParambin ) ), IVAS_ERR_OK ) )

                IF( NE_32( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, &( st_ivas->hHrtfParambin ) ) ), IVAS_ERR_OK ) ) 

#else

                IF( NE_32( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, st_ivas->hHrtfParambin ) ), IVAS_ERR_OK ) )

#endif

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx( 


#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF

            if (NE_32((error = ivas_binaural_reverb_init(&hDiracDecBin->hReverb, st_ivas->hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &(st_ivas->hRenderConfig->roomAcoustics), output_Fs, (*phHrtfParambin)->parametricReverberationTimes, (*phHrtfParambin)->parametricReverberationEneCorrections)), IVAS_ERR_OK))

                if ( NE_32( ( error = ivas_binaural_reverb_init( &hDiracDecBin->hReverb, st_ivas->hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( st_ivas->hRenderConfig->roomAcoustics ), output_Fs, ( *phHrtfParambin )->parametricReverberationTimes_fx, ( *phHrtfParambin )->parametricReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )

#else

                if ( ( error = ivas_binaural_reverb_init( &hDiracDecBin->hReverb, st_ivas->hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( st_ivas->hRenderConfig->roomAcoustics ), output_Fs, st_ivas->hHrtfParambin->parametricReverberationTimes_fx, st_ivas->hHrtfParambin->parametricReverberationEneCorrections_fx ) ) != IVAS_ERR_OK )

#endif
@@ -5830,8 +5830,8 @@ static void hrtfShGetHrtf_fx( 
{

    Word16 k;

#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF

    Word32( *hrtfShCoeffsReInt_fx )[16][60];

    Word32( *hrtfShCoeffsImInt_fx )[16][60];

    Word16( *hrtfShCoeffsReInt_fx )[16][60];

    Word16( *hrtfShCoeffsImInt_fx )[16][60];

    hrtfShCoeffsReInt_fx = hHrtfParambin->hrtfShCoeffsRe_fx;

    hrtfShCoeffsImInt_fx = hHrtfParambin->hrtfShCoeffsIm_fx;

#endif

lib_rend/lib_rend_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -10290,7 +10290,7 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 
            {

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF

            if (NE_32((error = ivas_binaural_reverb_init(&hDiracDecBin->hReverb, hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &(hRendCfg->roomAcoustics), output_Fs, (*phHrtfParambin)->parametricReverberationTimes, (*phHrtfParambin)->parametricReverberationEneCorrections)), IVAS_ERR_OK))

                if ( NE_32( ( error = ivas_binaural_reverb_init( &hDiracDecBin->hReverb, hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRendCfg->roomAcoustics ), output_Fs, ( *phHrtfParambin )->parametricReverberationTimes_fx, ( *phHrtfParambin )->parametricReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )

#else

                IF( NE_32( ( error = ivas_binaural_reverb_init( &hDiracDecBin->hReverb, hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRendCfg->roomAcoustics ), output_Fs, hHrtfParambin->parametricReverberationTimes_fx, hHrtfParambin->parametricReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )

#endif