Commit 281ffdd6 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

disable interpolator workaround for split-rendering modes

parent 3ac03523

lib_dec/ivas_dirac_dec.c

+10 −11
Original line number Diff line number Diff line
@@ -2232,28 +2232,21 @@ void ivas_dirac_dec_render_sf( 
                int16_t az1, el1;

                int16_t n_slots_to_render;

                int16_t n_samples_to_render;

#ifndef NONBE_FIX_1141_OSBA_ROOM_RENDERING

                int16_t interp_offset;

#endif



                float gain, prev_gain;



                num_objects = st_ivas->nchan_ism;

                nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;

                n_slots_to_render = st_ivas->hSpar->subframe_nbslots[st_ivas->hSpar->subframes_rendered];

                n_samples_to_render = hSpatParamRendCom->num_freq_bands * n_slots_to_render;

#ifndef NONBE_FIX_1141_OSBA_ROOM_RENDERING

                interp_offset = st_ivas->hTcBuffer->n_samples_rendered;

#endif



                if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[0] )

                {

                    ivas_jbm_dec_get_adapted_linear_interpolator( n_samples_to_render, n_samples_to_render, st_ivas->hIsmRendererData->interpolator );

#ifdef NONBE_FIX_1141_OSBA_ROOM_RENDERING

                    st_ivas->hIsmRendererData->interp_offset = 0;

#else



                    interp_offset = 0;

#endif

                }



                for ( i = 0; i < num_objects; i++ )
@@ -2283,10 +2276,16 @@ void ivas_dirac_dec_render_sf( 
                            float *tc_re, *tc_im;

                            float *w1, w2;

#ifdef NONBE_FIX_1141_OSBA_ROOM_RENDERING

                            if ( !st_ivas->hSplitBinRend )

                            {

                                w1 = &st_ivas->hIsmRendererData->interpolator[st_ivas->hIsmRendererData->interp_offset];

#else

                            w1 = &st_ivas->hIsmRendererData->interpolator[interp_offset];

                            }

                            else

#endif

                            {

                                w1 = &st_ivas->hIsmRendererData->interpolator[interp_offset];

                            }



                            tc_re = pppQMfFrame_ts_re[nchan_transport + i][0];

                            tc_im = pppQMfFrame_ts_im[nchan_transport + i][0];