Commit 004a6482 authored by vaclav's avatar vaclav
Browse files

Remove leftovers in renderer_type logic in SBA DirAC decoder; under SBA_DIRAC_RENDERER_TYPE_CLEANUP

parent 1c3972f0

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -3112,10 +3112,11 @@ 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

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int16_t ivas_sba_get_analysis_order( 
    return sba_analysis_order;

}





#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP

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

 * ivas_sba_get_order_transport()

 *
@@ -249,7 +249,7 @@ int16_t ivas_sba_get_order_transport( 


    return ( sba_order );

}



#endif



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

 * ivas_sba_get_nchan()

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -175,9 +175,9 @@ 
#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

#define NTT_REDUC_COMP_POC                              /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */





#define FIX_ITD_CNG                                     /* Eri: Fix for CNG ITD */

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





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

/* clang-format on */

lib_dec/ivas_init_dec.c

+3 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ ivas_error ivas_init_decoder( 
                                             st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );

                }

            }

            else

            else /* SBA_MODE_DIRAC */

            {

                if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK )

                {
@@ -835,6 +835,7 @@ 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;
@@ -856,6 +857,7 @@ ivas_error ivas_init_decoder( 
                        return error;

                    }

                }

#endif

            }

        }

lib_dec/ivas_sba_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ 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;
@@ -349,6 +350,7 @@ ivas_error ivas_sba_dec_reinit( 
                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 )