Commit c45e75e3 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'float-pc' into '1746_ref_port_fl1489'

parents 0f3cb040 dbf1b002

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1188,7 +1188,11 @@ enum 
#define MASA_COHERENCE_TOLERANCE                0.1f

#define MASA_COHERENCE_THRESHOLD                0.1f

#define MASA_RATIO_TOLERANCE                    0.1f

#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS

#define MASA_RATIO_THRESHOLD                    0.015f

#else

#define MASA_RATIO_THRESHOLD                    0.1f

#endif

#define MASA_ANGLE_TOLERANCE                    0.5f

#define MASA_SUR_COH_THRESHOLD                  1e-7f

#define MASA_SUR_COH_PRECISION                  1e7f

lib_com/ivas_prot.h

+3 −0
Original line number Diff line number Diff line
@@ -5203,6 +5203,9 @@ void ivas_ism_renderer_close( 


void ivas_ism_render_sf(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    const RENDERER_TYPE renderer_type,                          /* i  : active renderer type                            */

#endif

    float *output_f[],                                          /* i/o: core-coder transport channels/object output     */

    const int16_t n_samples_to_render                           /* i  : output frame length per channel                 */

);

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 


/* ################### Start FIXES switches ########################### */





#define NON_BE_FIX_807_MASA_DTX_BRSW                     /* Nokia: adds fix to check existence of DTX encoder for secondary channel in TD mode */

#define NON_BE_FIX_BASOP_819_THRESHOLD_MASA2TOTAL        /* Nokia: add fix for precision limitation in comparison with masa2total energy ratio threshold */

#define FIX_828_PORT_1152_FROM_FLT_REPO                  /* FhG: fix for issue 828 - fix uninitialized value used in BASOP */
@@ -193,6 +192,9 @@ 
#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT              /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */

#define FIX_1023_REMOVE_PARAMMC_DEC                     /* VA: issue 1023: remove unused function ivas_param_mc_dec() */

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

#define NONBE_FIX_1034_DRY_MASA_RATIOS                  /* Nokia: Fix issue 1034, use of wrong numDir state. */

#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/

#define FIX_1035_HT_OSBA                                /* Dlb: issue 1035: Issue with headtracking in OSBA*/



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

lib_dec/ivas_binRenderer_internal.c

+4 −0
Original line number Diff line number Diff line
@@ -1069,7 +1069,11 @@ ivas_error ivas_binRenderer_open( 


    /* Define of head rotation has to be done in binRendeder in CLDFB*/

    hBinRenderer->rotInCldfb = 0;

#ifdef FIX_1035_HT_OSBA

    if ( st_ivas->ivas_format == MC_FORMAT || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )

#else

    if ( st_ivas->ivas_format == MC_FORMAT || st_ivas->ivas_format == SBA_FORMAT )

#endif

    {

        hBinRenderer->rotInCldfb = 1;

    }

lib_dec/ivas_ism_renderer.c

+12 −2
Original line number Diff line number Diff line
@@ -141,6 +141,9 @@ void ivas_ism_renderer_close( 


void ivas_ism_render_sf(

    Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure                      */

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    const RENDERER_TYPE renderer_type, /* i  : active renderer type                        */

#endif

    float *output_f[],                /* i/o: core-coder transport channels/object output */

    const int16_t n_samples_to_render /* i  : output frame length per channel             */

)
@@ -168,17 +171,20 @@ void ivas_ism_render_sf( 
        slots_to_render -= st_ivas->hTcBuffer->subframe_nbslots[last_sf];

        last_sf++;

    }



#ifdef DEBUGGING

    assert( slots_to_render == 0 );

    assert( last_sf <= st_ivas->hTcBuffer->nb_subframes );

#endif



#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

    num_objects = st_ivas->nchan_ism;

#else

    num_objects = st_ivas->nchan_transport;

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

        num_objects = st_ivas->nchan_ism;

    }

#endif



    nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;
@@ -283,7 +289,11 @@ void ivas_ism_render_sf( 
        n_samples_rendered_loop += n_samples_in_subframe;

        /* update rendered subframe and slots info for all cases apart from a following crend call, the update will

           then happen in the crend call*/

#ifdef NONBE_FIX_1021_ISM_BRIR_RS_FLUSH

        if ( renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM )

#else

        if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM )

#endif

        {

            st_ivas->hTcBuffer->subframes_rendered += 1;

            st_ivas->hTcBuffer->slots_rendered += st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];