Commit 50db9351 authored by vaclav's avatar vaclav
Browse files

accept SBA_DIRAC_RENDERER_TYPE_CLEANUP

parent 8d49b4f5

lib_com/ivas_prot.h

+0 −5
Original line number Diff line number Diff line
@@ -3181,11 +3181,6 @@ int16_t ivas_sba_get_analysis_order( 
    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

);



#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP

int16_t ivas_sba_get_order_transport(

    const int16_t nchan_transport                               /* i  : Number of transport channels            */

);

#endif

/*! r: number of Ambisonic channels */

int16_t ivas_sba_get_nchan(

    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */

lib_com/ivas_sba_config.c

+0 −27
Original line number Diff line number Diff line
@@ -246,33 +246,6 @@ int16_t ivas_sba_get_analysis_order( 
    return sba_analysis_order;

}



#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP

/*-------------------------------------------------------------------*

 * ivas_sba_get_order_transport()

 *

 * Get effective Ambisonic order from number of transport channels

 *-------------------------------------------------------------------*/



int16_t ivas_sba_get_order_transport(

    const int16_t nchan_transport /* i  : Number of transport channels     */

)

{

    int16_t sba_order;



    sba_order = SBA_FOA_ORDER;



    if ( nchan_transport > 6 )

    {

        sba_order = SBA_HOA3_ORDER;

    }

    else if ( nchan_transport > 4 )

    {

        sba_order = SBA_HOA2_ORDER;

    }



    return ( sba_order );

}

#endif



/*-------------------------------------------------------------------*

 * ivas_sba_get_nchan()

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ 
#define SBA_BR_SWITCHING_2                              /* Issue 114: Changes for sba bit rate switching with reconfigurations*/

#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define SBA_DIRAC_RENDERER_TYPE_CLEANUP                 /* Remove leftovers in renderer_type logic in SBA DirAC decoder */

#define FIX_I59_LFE_TD_DELAY                            /* Issue 59: correcting delay of LFE for TD renderer */

#define FIX_I59_LFE_CLDFB                               /* Issue 59: correcting LFE handling for fastconv binaural rendering */

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

lib_dec/ivas_init_dec.c

+0 −24
Original line number Diff line number Diff line
@@ -850,30 +850,6 @@ ivas_error ivas_init_decoder( 
                }



                st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO );



#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP

                if ( ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup )

                {

                    int16_t ambisonics_order;



                    ambisonics_order = ivas_sba_get_order_transport( st_ivas->nchan_transport ); // VE: is it needed ?



                    if ( ( error = ivas_sba_get_hoa_dec_matrix( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, ambisonics_order ) ) != IVAS_ERR_OK )

                    {

                        return error;

                    }

                }

                else if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) && !st_ivas->hIntSetup.is_loudspeaker_setup )

                {

                    IVAS_OUTPUT_SETUP out_setup;



                    ivas_output_init( &out_setup, AUDIO_CONFIG_7_1_4 );

                    if ( ( error = ivas_sba_get_hoa_dec_matrix( out_setup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK )

                    {

                        return error;

                    }

                }

#endif

            }

        }

lib_dec/ivas_sba_dec.c

+0 −24
Original line number Diff line number Diff line
@@ -333,30 +333,6 @@ ivas_error ivas_sba_dec_reinit( 
        }



        st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO );



#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP

        if ( ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup )

        {

            int16_t ambisonics_order;



            ambisonics_order = ivas_sba_get_order_transport( st_ivas->nchan_transport ); // VE: is it needed ?



            if ( ( error = ivas_sba_get_hoa_dec_matrix( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, ambisonics_order ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

        else if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) && !st_ivas->hIntSetup.is_loudspeaker_setup )

        {

            IVAS_OUTPUT_SETUP out_setup;



            ivas_output_init( &out_setup, AUDIO_CONFIG_7_1_4 );

            if ( ( error = ivas_sba_get_hoa_dec_matrix( out_setup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

#endif

    }

    if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM &&

         st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR )