Commit c9dcef1f authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO

parent db85cca9

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR                     /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */

#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO                 /* Eri: Issue 1010: Division by zero in Stereo CNG */

lib_dec/ivas_ism_renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -280,13 +280,9 @@ 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_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

        {

            st_ivas->hTcBuffer->subframes_rendered += 1;

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