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

enable ISM gain calculation for LS output

parent 24d62793

lib_dec/ivas_ism_param_dec.c

+8 −2
Original line number Diff line number Diff line
@@ -1075,6 +1075,7 @@ void ivas_ism_dec_digest_tc( 
#ifdef JBM_FOR_OSBA

         || st_ivas->renderer_type == RENDERER_OSBA_STEREO

		 || st_ivas->renderer_type == RENDERER_OSBA_AMBI

		 || st_ivas->renderer_type == RENDERER_OSBA_LS

#endif 

		)

    {
@@ -1129,8 +1130,13 @@ void ivas_ism_dec_digest_tc( 
                azimuth = (int16_t) floorf( st_ivas->hIsmMetaData[i]->azimuth + 0.5f );

                elevation = (int16_t) floorf( st_ivas->hIsmMetaData[i]->elevation + 0.5f );



                if ( ( st_ivas->renderer_type == RENDERER_TD_PANNING || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) &&

                     st_ivas->hCombinedOrientationData == NULL )

                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

#endif

					) &&

                     st_ivas->hCombinedOrientationData == NULL 

					)

                {

                    if ( st_ivas->hIntSetup.is_planar_setup )

                    {

lib_dec/ivas_jbm_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,6 @@ ivas_error ivas_jbm_dec_render( 
                    p_output_ism[n] = &output_ism[n][0];

                }



                //ivas_osba_render_jbm( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

                ivas_ism_render_sf( st_ivas, p_output_ism, nSamplesAsked );

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

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