Commit 8f787919 authored by bayers's avatar bayers
Browse files

fix for #1014, #1015, #1016, update info about rendered frames and slots in... 

fix for #1014, #1015, #1016, update info about rendered frames and slots in the TC buffer in the correct way in the discrete ISM renderer
parent 4586a1a3

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF                    /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */

#define NONBE_FIX_1014_OSBA_JBM_STEREO                        /* FhG: issue #1014: fix stereo output for OSBA*/

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO              /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

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



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_ism_renderer.c

+4 −2
Original line number Diff line number Diff line
@@ -279,8 +279,10 @@ void ivas_ism_render_sf( 
        ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_in_subframe );



        n_samples_rendered_loop += n_samples_in_subframe;

#ifdef NONBE_FIX_1014_OSBA_JBM_STEREO

        if ( st_ivas->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_OSBA_STEREO )

#ifdef NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO

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

           then happen in the crend call*/

        if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM )

#else

        if ( st_ivas->renderer_type == RENDERER_TD_PANNING )

#endif