Commit b1dab20a authored by bayers's avatar bayers
Browse files

fix #827, use correct buffers and subframing for CREND early reflections in the JBM path

parent 21b21cfa

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ 
#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ                 /* VA: issue 797:  fix of crash when the separated object is inactive and the MASA metadata is using very few bits */

#define NONBE_FIX_798_OSBA_MC_DEC_CRASH

#define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX             /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */



#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

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;

                }