Commit f9e0bcf8 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_679_JBM_MC2SBA

parent 7f8c8cf6

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 
#define OSBA_SPLIT_RENDERING

#endif



#define FIX_679_JBM_MC2SBA                              /* FhG: fix issue 679: check for transport vs. internal channel count in JBM prior to ivas_mc2sba() */

#define FIX_591_PARAMISM_JBM_ENER_CORRECTION            /* FhG: fix energy correction in ParamISM rendering */

#define FIX_551_HEADTRACKER_INIT                        /* FhG: move setting of orientation tracking type to earlier    */

lib_dec/ivas_jbm_dec.c

+0 −18
Original line number Diff line number Diff line
@@ -442,11 +442,7 @@ ivas_error ivas_jbm_dec_tc( 
            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) )

            {

                if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe )

#ifdef FIX_679_JBM_MC2SBA

                     >=

#else

                     <=

#endif

                     ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) )

                {

                    ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
@@ -977,21 +973,15 @@ ivas_error ivas_jbm_dec_render( 
    {

        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

#ifdef FIX_679_JBM_MC2SBA

            int16_t crendInPlaceRotation = FALSE;

#endif

            *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) )

            {

#ifdef FIX_679_JBM_MC2SBA

                if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe ) < ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) )

                {

                    crendInPlaceRotation = TRUE;

#endif

                    ivas_mc2sba( st_ivas->hTransSetup, p_tc, p_output, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );

#ifdef FIX_679_JBM_MC2SBA

                }

#endif

            }



            /* Rendering */
@@ -1005,11 +995,7 @@ ivas_error ivas_jbm_dec_render( 
                                                               &st_ivas->hIntSetup,

                                                               st_ivas->hEFAPdata,

                                                               st_ivas->hTcBuffer,

#ifdef FIX_679_JBM_MC2SBA

                                                               crendInPlaceRotation ? p_output : p_tc,

#else

                                                               p_tc,

#endif

                                                               p_output,

                                                               *nSamplesRendered,

                                                               output_Fs ) ) != IVAS_ERR_OK )
@@ -1675,11 +1661,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) )

            {

                if ( ( st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe )

#ifdef FIX_679_JBM_MC2SBA

                     >=

#else

                     >

#endif

                     ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ) )

                {

                    num_tc = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe;

lib_rend/ivas_crend.c

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

    int16_t subframe_idx, subframe_len;

    int16_t nchan_out, nchan_in, ch, first_sf, last_sf, slot_size, slots_to_render;

#ifdef FIX_679_JBM_MC2SBA

    float *tc_local[MAX_OUTPUT_CHANNELS];

#else

    float *tc_local[MAX_TRANSPORT_CHANNELS];

#endif

    float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k];

    float *p_pcm_tmp[BINAURAL_CHANNELS];

    IVAS_REND_AudioConfigType inConfigType;