Commit e0245426 authored by norvell's avatar norvell
Browse files

Merge branch 'float-pc' into 1741_ref_enable-new-hrtf-format

parents 6ee403d2 1eaec7f4

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ stages: 
  - git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" # Add currently used branch

  - git remote set-branches --add origin main # Add main to be able to load new format HRTFs

  - git fetch

  - git restore --staged . # Needed if HRTF model files were updated.

  - git restore . # Just as a precaution

  - git checkout "$BASOP_CI_BRANCH_PC_REPO"

  - git reset --hard origin/"$BASOP_CI_BRANCH_PC_REPO"

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ 
#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: 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 FIX_1008_EXTORIENT_TARGET_INTERPOLATION          /* FhG: issue #1008, external orientation init was wrong for 5ms */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF */             /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/



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

lib_dec/ivas_dirac_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -883,7 +883,11 @@ ivas_error ivas_dirac_dec_config( 
            if ( st_ivas->hDiracDecBin == NULL )

#endif

            {

#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF

                if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, &( st_ivas->hHrtfParambin ) ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }

lib_dec/ivas_init_dec.c

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

        }



#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF

        if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, &( st_ivas->hHrtfParambin ) ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }

lib_dec/ivas_ism_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -280,7 +280,11 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
                return error;

            }



#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF

            if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, &( st_ivas->hHrtfParambin ) ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -311,7 +315,11 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
                return error;

            }



#ifdef NONBE_FIX_991_PARAMBIN_BINARY_HRTF

            if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, &( st_ivas->hHrtfParambin ) ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }