Commit d120fa08 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix merge error in ivas_td_binaural_renderer

parent 61c172b1

lib_dec/ivas_objectRenderer_internal.c

+6 −6
Original line number Diff line number Diff line
@@ -90,12 +90,12 @@ ivas_error ivas_td_binaural_renderer( 
    int16_t nchan_transport;

#endif



#if defined OSBA_DISC_OBJ_MCT && defined MASA_AND_OBJECTS

    nchan_transport = ( st_ivas->ism_mode == ISM_SBA_MODE_DISC || st_ivas->ism_mode == ISM_SBA_MODE_DISC ) ? st_ivas->nchan_ism : st_ivas->nchan_transport;

#elif defined MASA_AND_OBJECTS

    nchan_transport = ( st_ivas->ism_mode == ISM_MASA_MODE_DISC ) ? st_ivas->nchan_ism : st_ivas->nchan_transport;

#elif defined OSBA_DISC_OBJ_MCT

    nchan_transport = ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) ? st_ivas->nchan_ism : st_ivas->nchan_transport;

#if defined MASA_AND_OBJECTS

    nchan_transport = ( st_ivas->ism_mode == ISM_MASA_MODE_DISC

#if defined OSBA_DISC_OBJ_MCT

		|| st_ivas->ism_mode == ISM_SBA_MODE_DISC

#endif

		) ? st_ivas->nchan_ism : st_ivas->nchan_transport;

#endif



    if ( st_ivas->hDecoderConfig->Opt_delay_comp )