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

wrap changes realted to ROOM_IR output into the new define OSBA_ROOM_IR (disabled for now)

parent 4d99621d

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ 


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



#ifdef JBM_FOR_OSBA

//#define OSBA_ROOM_IR

#endif



/* ##################### End NON-BE switches ############################# */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ ivas_error ivas_init_decoder( 


    ivas_output_init( &( st_ivas->hOutSetup ), output_config );



#ifdef JBM_FOR_OSBA

#ifdef OSBA_ROOM_IR

	if ( st_ivas->ivas_format == SBA_ISM_FORMAT && output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR )

    {

        st_ivas->hOutSetup.ambisonics_order = SBA_HOA3_ORDER;
@@ -2936,7 +2936,7 @@ void ivas_init_dec_get_num_cldfb_instances( 
                    {

                        *numCldfbSyntheses = MAX_OUTPUT_CHANNELS;

                    }

#ifdef JBM_FOR_OSBA

#ifdef OSBA_ROOM_IR

					if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

                    {

                        *numCldfbAnalyses = st_ivas->nchan_ism + st_ivas->hSpar->hFbMixer->fb_cfg->num_in_chans;

lib_dec/ivas_ism_param_dec.c

+3 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,9 @@ void ivas_ism_dec_digest_tc( 
                if ( ( st_ivas->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM

#ifdef JBM_FOR_OSBA

                       || st_ivas->renderer_type == RENDERER_OSBA_LS

#ifdef OSBA_ROOM_IR

				       || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM

#endif

#endif

                       ) &&

                     st_ivas->hCombinedOrientationData == NULL )

lib_dec/ivas_jbm_dec.c

+26 −22
Original line number Diff line number Diff line
@@ -1213,14 +1213,18 @@ ivas_error ivas_jbm_dec_render( 
                }



                ivas_sba_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

#ifdef OSBA_ROOM_IR

                if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

                {

                    ivas_ism_render_sf( st_ivas, p_output_ism, *nSamplesRendered );

                }



                for ( n = 0; n < nchan_out; n++ )

                {

#ifdef OSBA_ROOM_IR

                    if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

                    {

                        v_add( p_output[n], p_output_ism[n], p_output[n], *nSamplesRendered );

                    }

lib_dec/ivas_output_config.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void ivas_renderer_select( 
            {

                *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;

            }

 #ifdef JBM_FOR_OSBA

#ifdef OSBA_ROOM_IR

			if ( st_ivas->ivas_format == SBA_ISM_FORMAT && *renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

            {

                *internal_config = AUDIO_CONFIG_7_1_4;