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

Merge branch '1616_ref_port_fl1422' into 'float-pc' 

Port MR 1422 into float-pc

See merge request !1639
parents 0bb7c3d0 1878b178

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ 
#define FIX_1008_EXTORIENT_TARGET_INTERPOLATION          /* FhG: issue #1008, external orientation init was wrong for 5ms */

/* #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 FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */

#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER            /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */



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

lib_dec/ivas_jbm_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -1540,8 +1540,12 @@ ivas_error ivas_jbm_dec_flush_renderer( 
    int16_t n_slots_still_available;

    int16_t n_samples_to_render;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;

#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

    float *p_output[MAX_CICP_CHANNELS + MAX_NUM_OBJECTS];

#else

    float output[MAX_CICP_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];

    float *p_output[MAX_CICP_CHANNELS];

#endif



    if ( !st_ivas->hDecoderConfig->Opt_tsm )

    {
@@ -1586,10 +1590,17 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        hTcBuffer->n_samples_flushed = n_samples_to_render;

        hTcBuffer->n_samples_rendered = 0;



#ifdef NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER

        for ( ch_idx = 0; ch_idx < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch_idx++ )

        {

            p_output[ch_idx] = st_ivas->p_output_f[ch_idx];

        }

#else

        for ( ch_idx = 0; ch_idx < MAX_CICP_CHANNELS; ch_idx++ )

        {

            p_output[ch_idx] = output[ch_idx];

        }

#endif



        if ( st_ivas->ivas_format == ISM_FORMAT )

        {