Commit e833c7c6 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1052_EXT_OUTPUT

parent 46a554ad

lib_com/options.h

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


/* #################### Start BASOP porting switches ############################ */



#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */ 

#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/

#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

lib_dec/ivas_init_dec.c

+0 −46
Original line number Diff line number Diff line
@@ -1371,7 +1371,6 @@ ivas_error ivas_init_decoder( 


    if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

    {

#ifdef FIX_1052_EXT_OUTPUT

        if ( st_ivas->ivas_format == STEREO_FORMAT )

        {

            hDecoderConfig->nchan_out = CPE_CHANNELS;
@@ -1384,9 +1383,6 @@ ivas_error ivas_init_decoder( 
        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == SBA_FORMAT )

#else

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

#else

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

        {

#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER
@@ -1414,7 +1410,6 @@ ivas_error ivas_init_decoder( 


    st_ivas->intern_config = output_config;



#ifdef FIX_1052_EXT_OUTPUT

    if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->ivas_format == MC_FORMAT )

    {

        ivas_output_init( &( st_ivas->hOutSetup ), st_ivas->transport_config );
@@ -1435,9 +1430,6 @@ ivas_error ivas_init_decoder( 
    {

        ivas_output_init( &( st_ivas->hOutSetup ), output_config );

    }

#else

    ivas_output_init( &( st_ivas->hOutSetup ), output_config );

#endif



    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

    {
@@ -3376,50 +3368,12 @@ static ivas_error doSanityChecks_IVAS( 
    /* Verify stereo output configuration */

    if ( st_ivas->ivas_format == STEREO_FORMAT )

    {

#ifdef FIX_1052_EXT_OUTPUT

        if ( output_config != IVAS_AUDIO_CONFIG_MONO && output_config != IVAS_AUDIO_CONFIG_STEREO && output_config != IVAS_AUDIO_CONFIG_5_1 && output_config != IVAS_AUDIO_CONFIG_7_1 && output_config != IVAS_AUDIO_CONFIG_5_1_2 && output_config != IVAS_AUDIO_CONFIG_5_1_4 && output_config != IVAS_AUDIO_CONFIG_7_1_4 && output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM && output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

#else

        if ( output_config != IVAS_AUDIO_CONFIG_MONO && output_config != IVAS_AUDIO_CONFIG_STEREO && output_config != IVAS_AUDIO_CONFIG_5_1 && output_config != IVAS_AUDIO_CONFIG_7_1 && output_config != IVAS_AUDIO_CONFIG_5_1_2 && output_config != IVAS_AUDIO_CONFIG_5_1_4 && output_config != IVAS_AUDIO_CONFIG_7_1_4 && output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM )

#endif

        {

            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Wrong output configuration specified for Stereo!" );

        }

    }

#ifdef FIX_1052_EXT_OUTPUT

    if ( output_config != IVAS_AUDIO_CONFIG_MONO && output_config != IVAS_AUDIO_CONFIG_STEREO && output_config != IVAS_AUDIO_CONFIG_5_1 && output_config != IVAS_AUDIO_CONFIG_7_1 && output_config != IVAS_AUDIO_CONFIG_5_1_2 && output_config != IVAS_AUDIO_CONFIG_5_1_4 && output_config != IVAS_AUDIO_CONFIG_7_1_4 && output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM && output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

#else

    else if ( st_ivas->ivas_format == ISM_FORMAT )

    {

        /* Verify ISM output configuration */

        if ( output_config == IVAS_AUDIO_CONFIG_INVALID )

        {

            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for ISM" );

        }

    }

    else if ( st_ivas->ivas_format == SBA_FORMAT )

    {

        /* Verify SBA output coniguration */

        if ( output_config == IVAS_AUDIO_CONFIG_INVALID )

        {

            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for SBA" );

        }

    }

    else if ( st_ivas->ivas_format == MASA_FORMAT )

    {

        if ( output_config == IVAS_AUDIO_CONFIG_INVALID )

        {

            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for MASA!" );

        }

    }

    else if ( st_ivas->ivas_format == MC_FORMAT )

    {

        /* Verify MC output configuration */

        if ( output_config == IVAS_AUDIO_CONFIG_INVALID || output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

        {

            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for Multi-channel" );

        }

    }

#endif



        if ( ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) && output_Fs != 48000 )

        {

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -680,11 +680,7 @@ ivas_error ivas_jbm_dec_tc( 
                /* Delay the separated channel to sync with CLDFB delay of the DirAC synthesis, and synthesize the LFE signal. */

                if ( output_config == IVAS_AUDIO_CONFIG_5_1 || output_config == IVAS_AUDIO_CONFIG_7_1 ||

                     output_config == IVAS_AUDIO_CONFIG_5_1_4 || output_config == IVAS_AUDIO_CONFIG_7_1_4 ||

#ifdef FIX_1052_EXT_OUTPUT

                     output_config == IVAS_AUDIO_CONFIG_5_1_2 || ( output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) || output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#else

                     output_config == IVAS_AUDIO_CONFIG_5_1_2 || ( output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) )

#endif

                {

                    ivas_lfe_synth_with_filters( st_ivas->hMasa->hMasaLfeSynth, p_output, output_frame, n, LFE_CHANNEL );

                }

lib_dec/ivas_masa_dec.c

+0 −10
Original line number Diff line number Diff line
@@ -449,11 +449,7 @@ ivas_error ivas_masa_decode( 


        hMasa->config.coherencePresent = !hQMetaData->all_coherence_zero;



#ifdef FIX_1052_EXT_OUTPUT

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) )

#else

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#endif

        {

            index_16bits( hQMetaData, hMasa->data.sph_grid16 );

        }
@@ -672,11 +668,7 @@ ivas_error ivas_masa_dec_open( 
    hMasa->config.joinedSubframes = FALSE;



    /* Create spherical grid only for external output */

#ifdef FIX_1052_EXT_OUTPUT

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) )

#else

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#endif

    {

        if ( ( hMasa->data.sph_grid16 = (SPHERICAL_GRID_DATA *) malloc( sizeof( SPHERICAL_GRID_DATA ) ) ) == NULL )

        {
@@ -1107,9 +1099,7 @@ static ivas_error init_lfe_synth_data( 
         ( output_config == IVAS_AUDIO_CONFIG_5_1 || output_config == IVAS_AUDIO_CONFIG_7_1 ||

           output_config == IVAS_AUDIO_CONFIG_5_1_2 ||

           output_config == IVAS_AUDIO_CONFIG_5_1_4 || output_config == IVAS_AUDIO_CONFIG_7_1_4 ||

#ifdef FIX_1052_EXT_OUTPUT

           output_config == IVAS_AUDIO_CONFIG_EXTERNAL ||

#endif

           output_config == IVAS_AUDIO_CONFIG_FOA || output_config == IVAS_AUDIO_CONFIG_HOA2 ||

           output_config == IVAS_AUDIO_CONFIG_HOA3 ||

           ( output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) ) )

lib_dec/ivas_mc_param_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -148,11 +148,7 @@ ivas_error ivas_param_mc_dec_open( 
    hParamMC->hoa_encoder = NULL;



    /* determine the synthesis config */

#ifdef FIX_1052_EXT_OUTPUT

    if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD || st_ivas->transport_config == output_config || output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#else

    if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD || st_ivas->transport_config == output_config )

#endif

    {

        hParamMC->synthesis_conf = PARAM_MC_SYNTH_DIRECT;

    }