Commit 2d91a0ba authored by vaclav's avatar vaclav
Browse files

port FIX_1052_EXT_OUTPUT

parent 0b6dbe08

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
#define FIX_998_UNUSED_FUNCTION                         /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */ 

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO              /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#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_fx.c

+43 −0
Original line number Diff line number Diff line
@@ -1232,7 +1232,19 @@ ivas_error ivas_init_decoder_fx( 


    IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

    {

#ifdef FIX_1052_EXT_OUTPUT

        IF( EQ_32( st_ivas->ivas_format, STEREO_FORMAT ) )

        {

            hDecoderConfig->nchan_out = CPE_CHANNELS;

        }

        ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )

        {

            hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->transport_config );

        }

        ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

#else

        IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

#endif

        {

            hDecoderConfig->nchan_out = audioCfg2channels( IVAS_AUDIO_CONFIG_HOA3 );

            move16();
@@ -1260,7 +1272,22 @@ ivas_error ivas_init_decoder_fx( 


    st_ivas->intern_config = output_config;

    move32();



#ifdef FIX_1052_EXT_OUTPUT

    IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && EQ_32( st_ivas->ivas_format, MC_FORMAT ) )

    {

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

        st_ivas->intern_config = st_ivas->transport_config;

        move32();

    }

    ELSE

    {

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

    }

#else

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

#endif



    test();

    IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

    {
@@ -3713,11 +3740,26 @@ static ivas_error doSanityChecks_IVAS( 
        test();

        test();

        test();

#ifdef FIX_1052_EXT_OUTPUT

        test();

        IF( NE_32( output_config, IVAS_AUDIO_CONFIG_MONO ) && NE_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( output_config, IVAS_AUDIO_CONFIG_5_1 ) && NE_32( output_config, IVAS_AUDIO_CONFIG_7_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_4 ) && NE_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && NE_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#else

        IF( NE_32( output_config, IVAS_AUDIO_CONFIG_MONO ) && NE_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( output_config, IVAS_AUDIO_CONFIG_5_1 ) && NE_32( output_config, IVAS_AUDIO_CONFIG_7_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_4 ) && NE_32( 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

    {

        IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_INVALID ) )

        {

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

        }

    }

#else

    ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

    {

        /* Verify ISM output configuration */
@@ -3750,6 +3792,7 @@ static ivas_error doSanityChecks_IVAS( 
            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for Multi-channel" );

        }

    }

#endif



    IF( ( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) && NE_32( output_Fs, 48000 ) )

    {

lib_dec/ivas_jbm_dec_fx.c

+11 −6
Original line number Diff line number Diff line
@@ -1286,11 +1286,16 @@ ivas_error ivas_jbm_dec_tc_fx( 
                test();

                test();

                test();

#ifdef FIX_1052_EXT_OUTPUT

                test();

                /* Delay the separated channel to sync with CLDFB delay of the DirAC synthesis, and synthesize the LFE signal. */

                IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1 ) ||

                    EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) ||

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

                    EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_2 ) || ( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.num_lfe > 0 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#else

                /* Delay the separated channel to sync with CLDFB delay of the DirAC synthesis, and synthesize the LFE signal. */

                IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1 ) ||

                    EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_2 ) || ( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.num_lfe > 0 ) )

#endif

                {

                    ivas_lfe_synth_with_filters_fx( st_ivas->hMasa->hMasaLfeSynth, p_output_fx, output_frame, n, LFE_CHANNEL );

                }

lib_dec/ivas_masa_dec_fx.c

+24 −0
Original line number Diff line number Diff line
@@ -498,7 +498,13 @@ ivas_error ivas_masa_decode_fx( 
        hMasa->config.coherencePresent = !hQMetaData->all_coherence_zero;

        move16();



#ifdef FIX_1052_EXT_OUTPUT

        test();

        test();

        IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && ( EQ_32( ivas_format, MASA_FORMAT ) || EQ_32( ivas_format, MASA_ISM_FORMAT ) ) )

#else

        IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#endif

        {

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

        }
@@ -768,7 +774,13 @@ ivas_error ivas_masa_dec_open_fx( 
    move16();



    /* Create spherical grid only for external output */

#ifdef FIX_1052_EXT_OUTPUT

    test();

    test();

    IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) )

#else

    IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#endif

    {

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

        {
@@ -1297,13 +1309,25 @@ static ivas_error init_lfe_synth_data_fx( 
    test();

    test();

    test();

#ifdef FIX_1052_EXT_OUTPUT

    test();

    IF( st_ivas->hOutSetup.separateChannelEnabled &&

        ( EQ_16( output_config, IVAS_AUDIO_CONFIG_5_1 ) || EQ_16( output_config, IVAS_AUDIO_CONFIG_7_1 ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_5_1_2 ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) || EQ_16( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_FOA ) || EQ_16( output_config, IVAS_AUDIO_CONFIG_HOA2 ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_HOA3 ) ||

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

#else

    IF( st_ivas->hOutSetup.separateChannelEnabled &&

        ( EQ_16( output_config, IVAS_AUDIO_CONFIG_5_1 ) || EQ_16( output_config, IVAS_AUDIO_CONFIG_7_1 ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_5_1_2 ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) || EQ_16( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_FOA ) || EQ_16( output_config, IVAS_AUDIO_CONFIG_HOA2 ) ||

          EQ_16( output_config, IVAS_AUDIO_CONFIG_HOA3 ) ||

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

#endif

    {

        Word16 bufferSize;

        Word16 i;

lib_dec/ivas_mc_param_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -165,7 +165,11 @@ ivas_error ivas_param_mc_dec_open_fx( 
    test();

    test();

    test();

#ifdef FIX_1052_EXT_OUTPUT

    IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) || EQ_32( st_ivas->transport_config, output_config ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#else

    IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) || EQ_32( st_ivas->transport_config, output_config ) )

#endif

    {

        hParamMC->synthesis_conf = PARAM_MC_SYNTH_DIRECT;

        move32();