Commit ec0bef41 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1052_EXT_OUTPUT

parent 382a52d2

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ 
//#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

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



#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

lib_dec/ivas_init_dec.c

+0 −46
Original line number Diff line number Diff line
@@ -1009,7 +1009,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;
@@ -1019,9 +1018,6 @@ ivas_error ivas_init_decoder( 
            hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->transport_config );

        }

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

#else

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

        {

            hDecoderConfig->nchan_out = audioCfg2channels( IVAS_AUDIO_CONFIG_HOA3 );

            hDecoderConfig->nchan_out += st_ivas->nchan_ism;
@@ -1044,7 +1040,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 );
@@ -1054,9 +1049,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 )

    {
@@ -3006,16 +2998,11 @@ 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

    /* Verify output configuration for other formats */

    else

    {
@@ -3024,39 +3011,6 @@ static ivas_error doSanityChecks_IVAS( 
            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified!" );

        }

    }

#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



#ifdef SPLIT_REND_WITH_HEAD_ROT

    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
@@ -681,11 +681,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
@@ -447,11 +447,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 );

        }
@@ -671,11 +667,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 )

        {
@@ -1106,9 +1098,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;

    }