Commit 9296af03 authored by bayers's avatar bayers
Browse files

fix for #1070, rename define and move it to the Non-BE section

parent 9456f4a7

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
#define FIX_NUM_SUBFRAME_UPDATE



#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 



/* #################### End BE switches ################################## */
@@ -170,6 +169,7 @@ 
#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */



#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 



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

lib_dec/ivas_jbm_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -1665,7 +1665,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        {

            if ( mc_mode_old == MC_MODE_MCT )

            {

#ifdef FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

                int16_t crendInPlaceRotation = FALSE;



                if ( st_ivas->transport_config != intern_config_old && ( intern_config_old == IVAS_AUDIO_CONFIG_FOA || intern_config_old == IVAS_AUDIO_CONFIG_HOA2 || intern_config_old == IVAS_AUDIO_CONFIG_HOA3 ) )
@@ -1679,7 +1679,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
#endif

                if ( renderer_type_old == RENDERER_BINAURAL_MIXER_CONV || renderer_type_old == RENDERER_BINAURAL_MIXER_CONV_ROOM )

                {

#ifdef FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

#if defined SPLIT_REND_WITH_HEAD_ROT

                    if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, intern_config_old, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,

                                                                   hIntSetupOld, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output : st_ivas->hTcBuffer->tc, p_output, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs, 0 ) ) != IVAS_ERR_OK )
@@ -2335,7 +2335,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
    const int16_t n_samples_granularity     /* i  : granularity of the renderer/buffer  */

)

{

#ifdef FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

    int32_t nsamp_to_allocate;

#else

    int16_t nsamp_to_allocate;
@@ -2418,7 +2418,7 @@ ivas_error ivas_jbm_dec_tc_buffer_open( 
                {

                    return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM TC Buffer\n" ) );

                }

#ifdef FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

                set_zero_l( hTcBuffer->tc_buffer, nsamp_to_allocate );

#else

                set_zero( hTcBuffer->tc_buffer, nsamp_to_allocate );
@@ -2468,7 +2468,7 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
    const int16_t n_samples_granularity     /* i  : new granularity of the renderer/buffer  */

)

{

#ifdef FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

    int32_t nsamp_to_allocate, offset;

    int16_t n_samp_full, n_samp_residual, nchan_residual;

#else
@@ -2560,7 +2560,7 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure( 
            {

                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM TC Buffer\n" ) );

            }

#ifdef FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

#ifdef NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT

            set_zero_l( hTcBuffer->tc_buffer, nsamp_to_allocate );

#else

            set_zero( hTcBuffer->tc_buffer, nsamp_to_allocate );