Commit afa1b0bb authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

parent 43290a10

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

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

#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */

#define FIX_1369_HQ_LR_OVERFLOW                         /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */

#define NONBE_1118_EVS_LR_HQ_BITERROR                   /* VA: issue 1118: fix EVS decoder crash in LR-HQ in case of bit errors */

lib_dec/ivas_init_dec.c

+0 −18
Original line number Diff line number Diff line
@@ -1521,15 +1521,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 )
@@ -1676,15 +1667,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 −17
Original line number Diff line number Diff line
@@ -326,21 +326,10 @@ void ivas_renderer_select( 
            {

                *internal_config = output_config;

            }

#ifdef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

            else

            {

                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

            }

#else

            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 )

            {

                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

            }

#endif

            *renderer_type = RENDERER_SBA_LINEAR_DEC;

        }

        else if ( ( ivas_format == MASA_FORMAT && output_config == IVAS_AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ||
@@ -360,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;