Commit f261f2fd authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

parent c52eb6e1

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,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_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

#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 NONBE_1118_EVS_LR_HQ_BITERROR                   /* VA: issue 1118: fix EVS decoder crash in LR-HQ in case of bit errors */

#define FIX_1139_REV_COLORATION_SHORT_T60               /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */

lib_dec/ivas_init_dec_fx.c

+0 −20
Original line number Diff line number Diff line
@@ -1813,16 +1813,6 @@ ivas_error ivas_init_decoder_fx( 
        }

        set16_fx( st_ivas->hSpar->hFbMixer->cldfb_cross_fade_fx, 0, CLDFB_NO_COL_MAX );



#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

        test();

        IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup )

        {

            IF( NE_32( ( error = ivas_sba_get_hoa_dec_matrix_fx( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ), IVAS_ERR_OK ) )

            {

                return error;

            }

        }

#endif

        Word16 hodirac_flag = ivas_get_hodirac_flag_fx( ivas_total_brate, st_ivas->sba_analysis_order );

        IF( hodirac_flag )

        {
@@ -2005,16 +1995,6 @@ ivas_error ivas_init_decoder_fx( 
            return error;

        }



#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

        test();

        IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup )

        {

            IF( NE_32( ( error = ivas_sba_get_hoa_dec_matrix_fx( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ), IVAS_ERR_OK ) )

            {

                return error;

            }

        }

#endif

        Word16 hodirac_flag = ivas_get_hodirac_flag_fx( ivas_total_brate, st_ivas->sba_analysis_order );

        IF( hodirac_flag )

        {

lib_dec/ivas_output_config_fx.c

+0 −24
Original line number Diff line number Diff line
@@ -388,10 +388,6 @@ void ivas_renderer_select( 
        test();

        test();

        test();

#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

        test();

        test();

#endif

        IF( EQ_32( ivas_format, SBA_FORMAT ) && ( NE_32( output_config, IVAS_AUDIO_CONFIG_5_1 ) && NE_32( output_config, IVAS_AUDIO_CONFIG_5_1_2 ) && NE_32( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) && NE_32( output_config, IVAS_AUDIO_CONFIG_7_1 ) && NE_32( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) && NE_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && NE_32( output_config, IVAS_AUDIO_CONFIG_MONO ) && NE_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) ) )

        {

            test();
@@ -405,24 +401,11 @@ void ivas_renderer_select( 
                *internal_config = output_config;

                move16();

            }

#ifdef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

            ELSE

            {

                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

                move16();

            }

#else

            ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )

            {

                *internal_config = IVAS_AUDIO_CONFIG_FOA;

                move16();

            }

            ELSE IF( NE_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

            {

                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

                move16();

            }

#endif

            *renderer_type = RENDERER_SBA_LINEAR_DEC;

            move16();

        }
@@ -447,13 +430,6 @@ void ivas_renderer_select( 
            *renderer_type = RENDERER_DISABLE;

            move16();

        }

#ifndef FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX

        ELSE IF( EQ_32( ivas_format, SBA_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) )

        {

            *renderer_type = RENDERER_SBA_LINEAR_DEC;

            move16();

        }

#endif

        ELSE IF( EQ_32( ivas_format, SBA_ISM_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )

        {

            *renderer_type = RENDERER_OSBA_STEREO;