Commit 5192d1d7 authored by vaclav's avatar vaclav
Browse files

Merge branch '1704_ref_PortFlpMR1487' into 'ivas-float-update' 

Port MR1487 from float to float-pc

See merge request !1789
parents 3626d8f2 42165acf

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ 
#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_init_dec.c

+36 −4
Original line number Diff line number Diff line
@@ -1086,7 +1086,19 @@ 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;

        }

        else if ( st_ivas->ivas_format == MC_FORMAT )

        {

            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;
@@ -1113,7 +1125,19 @@ 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 );

        st_ivas->intern_config = st_ivas->transport_config;

    }

    else

    {

        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 )

    {
@@ -2996,11 +3020,18 @@ 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 */
@@ -3032,6 +3063,7 @@ static ivas_error doSanityChecks_IVAS( 
            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

+4 −0
Original line number Diff line number Diff line
@@ -691,7 +691,11 @@ 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

+11 −0
Original line number Diff line number Diff line
@@ -415,7 +415,11 @@ 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 );

        }
@@ -638,7 +642,11 @@ 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 )

        {
@@ -1071,6 +1079,9 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -148,7 +148,11 @@ 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;

    }