Commit cb8b2d49 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

add FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM 

- updated variable names to be the same as float code (remove _fx suffix)
- use int16_t for ROM tables (FastConv, ParamBin)
- update scripts from floating point code branch
parent 89f51d0c

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
#define FIX_ISSUE_723_INFO_TCX_NOISE /*FhG: Issue 723: fix for IGF that introduces wrong noise filling behavion*/



#define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */

#define FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM                     /* FhG: issue 1123: update FastConv and ParamBin ROM tables and scripts to generate 16 bit tables instead of float */



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

#define FIX_740_HQ_CORE_OVA // Proposed fix to solve overlap and add issue for HQ_CORE

lib_dec/ivas_binRenderer_internal.c

+200 −13

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_dirac_dec_binaural_functions.c

+30 −6

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_prot_rend.h

+8 −2
Original line number Diff line number Diff line
@@ -1777,8 +1777,14 @@ ivas_error ivas_binaural_reverb_init( 
    const int16_t numCldfbSlotsPerFrame,                  /* i  : number of CLDFB slots per frame      */

    const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *roomAcoustics, /* i/o: room acoustics parameters            */

    const int32_t sampling_rate,                          /* i  : sampling rate                        */

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

    const int16_t *defaultTimes,                            /* i  : default reverberation times          */

    const int16_t *defaultEne

#else

    const int32_t *defaultTimes,                            /* i  : default reverberation times          */

    const int32_t *defaultEne    );

    const int32_t *defaultEne

#endif

    );

#endif

#ifdef IVAS_FLOAT_FIXED

ivas_error ivas_binaural_reverb_open_fastconv_fx(

lib_rend/ivas_reverb.c

+29 −3
Original line number Diff line number Diff line
@@ -4227,8 +4227,13 @@ ivas_error ivas_binaural_reverb_init( 
    const int16_t numCldfbSlotsPerFrame,                  /* i  : number of CLDFB slots per frame      */

    const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *roomAcoustics, /* i/o: room acoustics parameters            */

    const int32_t sampling_rate,                          /* i  : sampling rate                        */

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

    const int16_t *defaultTimes, /* i  : default reverberation times          */

    const int16_t *defaultEne    /* i  : default reverberation energies       */

#else

    const int32_t *defaultTimes, /* i  : default reverberation times          */

    const int32_t *defaultEne    /* i  : default reverberation energies       */

#endif

)

{

    ivas_error error;
@@ -4258,8 +4263,15 @@ ivas_error ivas_binaural_reverb_init( 
    }

    ELSE

    {

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        revTimes = t60;

        revEne = ene;

        Copy_Scale_sig_16_32( defaultTimes, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32( defaultEne, ene, CLDFB_NO_CHANNELS_MAX, 16 );

#else

        revTimes = defaultTimes;

        revEne = defaultEne;

#endif

        preDelay = 10;

        move16();

    }
@@ -4320,8 +4332,15 @@ ivas_error ivas_binaural_reverb_open_fastconv_fx( 
    }

    ELSE

    {

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        revTimes = t60;

        revEne = ene;

        Copy_Scale_sig_16_32( hHrtfFastConv->fastconvReverberationTimes_fx, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32( hHrtfFastConv->fastconvReverberationEneCorrections_fx, ene, CLDFB_NO_CHANNELS_MAX, 16 );

#else

        revTimes = hHrtfFastConv->fastconvReverberationTimes_fx;

        revEne = hHrtfFastConv->fastconvReverberationEneCorrections_fx;

#endif

        preDelay = 10;

        move16();

    }
@@ -4411,8 +4430,15 @@ ivas_error ivas_binaural_reverb_open_parambin( 
    }

    ELSE

    {

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        revTimes = t60;

        revEne = ene;

        Copy_Scale_sig_16_32( hHrtfParambin->parametricReverberationTimes_fx, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32( hHrtfParambin->parametricReverberationEneCorrections_fx, ene, CLDFB_NO_CHANNELS_MAX, 16 );

#else

        revTimes = hHrtfParambin->parametricReverberationTimes_fx;

        revEne = hHrtfParambin->parametricReverberationEneCorrections_fx;

#endif

        preDelay = 10;

        move16();

    }