Commit f99275d4 authored by bayers's avatar bayers
Browse files

Merge branch '827-jbm-crend-early-reflections-are-wrong' into 'main' 

[Non-BE] Resolve "JBM Crend early reflections are wrong"

See merge request !1115
parents f6bbc34d 8e7c83f6

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ 
#define NONBE_FIX_802_PARAMUPMIX_HIGHPASS                     /* Dlb: issue 802: Move HighPass filter operation for ParamUpmix */

#define NONBE_FIX_809_EXTERNAL_TARGET_INTERPOLATION           /* FhG: issue 809: unify external target interpolation inter and intra frame behaviour */

#define NONBE_FIX_775_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 775: fix crash in OSBA with bitrate switching and output order lower than input order */



#define NONBE_FIX_827_JBM_CREND_EARLY_REFLECTIONS             /* FhG: issue #827: Resolve "JBM Crend early reflections are wrong" */

#define JBM_FOR_OSBA                                          /* FhG: implement OSBA format in the JBM path */

#ifdef JBM_FOR_OSBA

#define OSBA_ROOM_IR

lib_rend/ivas_crend.c

+4 −0
Original line number Diff line number Diff line
@@ -1968,7 +1968,11 @@ ivas_error ivas_rend_crendProcessSubframe( 
        {

            if ( hCrend->reflections->use_er == 1 && hCrend->reflections->is_ready == 1 )

            {

#ifdef NONBE_FIX_827_JBM_CREND_EARLY_REFLECTIONS

                if ( ( error = ivas_er_process( hCrend->reflections, subframe_len, 0, tc_local, inConfig ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_er_process( hCrend->reflections, subframe_len, subframe_idx, output, inConfig ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }