Commit 634348e8 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch '1917-osba-rendering-room-reverb-wrong-pointer-increment-in-ivas_dirac_dec_render_sf_fx' into 'main'

[non-BE] Resolve "OSBA Rendering Room Reverb - Wrong pointer increment in ivas_dirac_dec_render_sf_fx()"

Closes #1917

See merge request !2089
parents a90c34d3 573e072f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#define ISSUE_1866_replace_overflow_libdec                    /* FhG: BE - Replace BASOPoverflow operators all over the lib_dec module if Overflow result is not used */



#define NONBE_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */

#define FIX_1917_DIRAC_RENDER_PTR_INCR                       /* FhG: fix wrong pointer increment in ivas_dirac_dec_render_sf_fx() for object rendering */



#define FIX_1824

#define FIX_1822

lib_dec/ivas_dirac_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -3796,7 +3796,11 @@ void ivas_dirac_dec_render_sf_fx( 
                                    tc_re_fx++;

                                    Cldfb_ImagBuffer_fx[j2][k][l] = Madd_32_32( Cldfb_ImagBuffer_fx[j2][k][l], g_fx, *tc_im_fx );

                                    move32();

#ifdef FIX_1917_DIRAC_RENDER_PTR_INCR

                                    tc_im_fx++;

#else

                                    tc_re_fx++;

#endif

                                }

                                w1_fx += hSpatParamRendCom->num_freq_bands;

                            }