Commit c176ef3e authored by vaillancour's avatar vaillancour
Browse files

Merge remote-tracking branch 'origin/ivas-float-update' into 1563_ref_PortFlpMR1475

parents ff5b595e 5522d6c1

lib_com/nelp.c

+4 −0
Original line number Diff line number Diff line
@@ -121,7 +121,11 @@ void generate_nelp_excitation( 


        for ( j = 0; j < len; j++ )

        {

#ifdef FIX_970_USAN_IN_NELP_SEED

            tmp[j] = ( ( *seed ) = (int16_t) ( 521 * ( *seed ) + 259 ) ) / PCM16_TO_FLT_FAC;

#else

            tmp[j] = ( ( *seed ) = 521 * ( *seed ) + 259 ) / PCM16_TO_FLT_FAC;

#endif

            tmp1[j] = ABSVAL( tmp[j] );

            I[j] = j;

        }

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -187,6 +187,10 @@ 
#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  )*/

#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */

#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define FIX_970_USAN_IN_NELP_SEED

#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */

#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB     /* FhG: fix bug in TD MDCT-Stereo concealment */



#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

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

lib_dec/er_dec_tcx.c

+4 −0
Original line number Diff line number Diff line
@@ -567,7 +567,11 @@ void con_tcx( 


            alpha_inv = 1.0f - alpha_delayed;



#ifdef NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB

            a2lsp_stab( A_local, lsp_local, st->lspold_cng );

#else

            a2lsp_stab( A_local, lsp_local, lsp_local );

#endif



            for ( i = 0; i < M; i++ )

            {

lib_dec/ivas_init_dec.c

+19 −0
Original line number Diff line number Diff line
@@ -2007,6 +2007,15 @@ ivas_error ivas_init_decoder( 
            {

                return error;

            }

#ifdef NONBE_FIX_1075

            if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

            }

#endif



            /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

            if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
@@ -2077,6 +2086,16 @@ ivas_error ivas_init_decoder( 
            {

                return error;

            }

#ifdef NONBE_FIX_1075

            if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

            }



#endif

        }

    }

lib_dec/ivas_ism_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -126,7 +126,12 @@ static ivas_error ivas_ism_bitrate_switching_dec( 


    {

/* transfer subframe info from DirAC or ParamMC to central tc buffer */

#ifdef NONBE_FIX_1056_ISM_RATE_SWITCH

        /* only do this if we are not having done everything already in the TC decoding part and having only played out from the TC buffer */

        if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hSpatParamRendCom != NULL && st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )

#else

        if ( last_ism_mode == ISM_MODE_PARAM && st_ivas->hSpatParamRendCom != NULL && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE ) )

#endif

        {

            st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;

            st_ivas->hTcBuffer->subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;