Commit 1c14d249 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1611_basop_external_target_interpolation_different_between_framesizes
parents 799da60a 7ae27c06

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ stages: 
  - sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links

  - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO # Add currently used branch

  - 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 pull origin $BASOP_CI_BRANCH_PC_REPO

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 


#endif





//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */
@@ -137,6 +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 (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */



#define FIX_1008_EXTORIENT_TARGET_INTERPOLATION          /* FhG: issue #1008, external orientation init was wrong for 5ms */

lib_dec/ivas_dirac_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1150,7 +1150,11 @@ ivas_error ivas_dirac_dec_config_fx( 
            IF( st_ivas->hDiracDecBin == NULL )

#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 ) )

#else

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

#endif

                {

                    return error;

                }

lib_dec/ivas_init_dec_fx.c

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

        }



#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 ) )

#else

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

#endif

        {

            return error;

        }

lib_dec/ivas_ism_dec_fx.c

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

            }



#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 ) )

#else

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

#endif

            {

                return error;

            }
@@ -334,7 +338,11 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
                return error;

            }



#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 ) )

#else

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

#endif

            {

                return error;

            }