Commit 6d8749c5 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

fix difference between 5/10/20 ms frames in 13.2kbps McMASA binaural... 

fix difference between 5/10/20 ms frames in 13.2kbps McMASA binaural rendering. switch: NONBE_FIX_951_MCMASA_5MS_RENDERING
parent b726dd64

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 


#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA                 /* Nokia: issue 944: fix FEC error in OMASA */

#define NONBE_FIX_951_MCMASA_5MS_RENDERING                    /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */



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

lib_dec/ivas_jbm_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -1372,8 +1372,11 @@ ivas_error ivas_jbm_dec_render( 
        else if ( st_ivas->mc_mode == MC_MODE_MCMASA )

        {

            int16_t offset = hSpatParamRendCom->slots_rendered * hSpatParamRendCom->slot_size;

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

            nchan_remapped = st_ivas->hTcBuffer->nchan_buffer_full;

#else

            nchan_remapped = st_ivas->nchan_transport;



#endif

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

            {

                ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, nchan_remapped, p_output );