Commit 6c0a36dd authored by vaclav's avatar vaclav
Browse files

fix EXT output for McMASA with separated channel

parent 46c8f0c2

lib_dec/ivas_jbm_dec.c

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

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

        {
@@ -1052,6 +1056,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 ) ) )