Commit 51345670 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

parent 04c0ba5c

lib_com/options.h

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


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX          /* VA: issue 1249: remove obsolete code around ALLRAD decoder matrix */

#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */



/* #################### End BE switches ################################## */

lib_dec/ivas_init_dec.c

+0 −20
Original line number Diff line number Diff line
@@ -1509,16 +1509,6 @@ ivas_error ivas_init_decoder( 
            return error;

        }



#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

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

        {

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

            {

                return error;

            }

        }



#endif

        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order,

                                              ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ),

                                              st_ivas->ivas_format ) ) != IVAS_ERR_OK )
@@ -1666,16 +1656,6 @@ ivas_error ivas_init_decoder( 
            return error;

        }



#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

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

        {

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

            {

                return error;

            }

        }



#endif

        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order,

                                              ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ),

                                              st_ivas->ivas_format ) ) != IVAS_ERR_OK )

lib_dec/ivas_output_config.c

+0 −14
Original line number Diff line number Diff line
@@ -326,15 +326,7 @@ void ivas_renderer_select( 
            {

                *internal_config = output_config;

            }

#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

            else if ( output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO )

            {

                *internal_config = IVAS_AUDIO_CONFIG_FOA;

            }

            else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

#else

            else

#endif

            {

                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

            }
@@ -357,12 +349,6 @@ void ivas_renderer_select( 
        {

            *renderer_type = RENDERER_DISABLE;

        }

#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

        else if ( ivas_format == SBA_FORMAT && output_config == IVAS_AUDIO_CONFIG_MONO )

        {

            *renderer_type = RENDERER_SBA_LINEAR_DEC;

        }

#endif

        else if ( ivas_format == SBA_ISM_FORMAT && output_config == IVAS_AUDIO_CONFIG_STEREO )

        {

            *renderer_type = RENDERER_OSBA_STEREO;