Commit 44c939b9 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix compile errors

parent 2bcd9508

lib_dec/ivas_dirac_output_synthesis_dec.c

+0 −11
Original line number Diff line number Diff line
@@ -730,17 +730,6 @@ void ivas_dirac_dec_output_synthesis_process_slot( 
#ifdef HODIRAC

                                                      ,

                                                      hodirac_flag

        );

#else

        ivas_dirac_dec_compute_directional_responses( hDirAC,

                                                      hVBAPdata,

                                                      NULL,

                                                      NULL,

                                                      2,

                                                      p_Rmat

#ifdef HODIRAC

                                                      ,

                                                      0

#endif

        );

#endif

lib_dec/ivas_sba_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        else if ( st_ivas->sba_mode == SBA_MODE_SPAR )

        {

            tc_nchan_to_allocate = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order

#ifdef SPAR_TUNING

#ifdef HODIRAC

                                                                ,

                                                                st_ivas->hDecoderConfig->ivas_total_brate

#endif
@@ -498,7 +498,7 @@ void ivas_sba_dec_render( 


    hSpar = st_ivas->hSpar;

    nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order

#ifdef SPAR_TUNING

#ifdef HODIRAC

                                                  ,

                                                  st_ivas->hDecoderConfig->ivas_total_brate

#endif

lib_dec/ivas_spar_decoder.c

+17 −18
Original line number Diff line number Diff line
@@ -78,12 +78,12 @@ ivas_error ivas_spar_dec_open( 


    error = IVAS_ERR_OK;

    sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER );

    num_channels_internal = ivas_sba_get_nchan_metadata( sba_order_internal

#ifdef HODIRAC

                                                         ,

                                                         st_ivas->hDecoderConfig->ivas_total_brate



#ifndef HODRIAC

    num_channels_internal = ivas_sba_get_nchan_metadata( sba_order_internal );

#else

    num_channels_internal = ivas_sba_get_nchan_metadata( sba_order_internal,  st_ivas->hDecoderConfig->ivas_total_brate );

#endif

    );



    hSpar = st_ivas->hSpar;
@@ -1150,7 +1150,7 @@ void ivas_spar_dec_agc_pca( 
    if ( hSpar->hMdDec->td_decorr_flag )

    {

        num_in_ingest = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order

#ifdef SPAR_TUNING

#ifdef HODIRAC

                                                     ,

                                                     st_ivas->hDecoderConfig->ivas_total_brate

#endif
@@ -1225,7 +1225,7 @@ void ivas_spar_dec_set_render_params( 
    nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport;

    num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands;

    ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, st_ivas->bfi

#ifdef SPAR_TUNING

#ifdef HODIRAC

                               ,

                               ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate )

#endif
@@ -1257,7 +1257,7 @@ void ivas_spar_dec_digest_tc( 
        default_frame = ( int16_t )( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC );

        nSamplesLeftForTD = nSamplesForRendering;

        nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order

#ifdef SPAR_TUNING

#ifdef HODIRAC

                                                      ,

                                                      st_ivas->hDecoderConfig->ivas_total_brate

#endif
@@ -1272,7 +1272,7 @@ void ivas_spar_dec_digest_tc( 
        {

            int16_t nSamplesToDecorr = min( nSamplesLeftForTD, default_frame );

            ivas_td_decorr_process( hSpar->hTdDecorr, p_tc, pPcm_tmp, nSamplesToDecorr );

#ifdef SPAR_TUNING

#ifdef HODIRAC

            if ( hSpar->hTdDecorr->num_apd_outputs >= ( nchan_internal - nchan_transport ) )

            {

                for ( ch = 0; ch < nchan_internal - nchan_transport; ch++ )
@@ -1349,7 +1349,7 @@ void ivas_spar_dec_upmixer( 
    if ( hSpar->hMdDec->td_decorr_flag )

    {

        ivas_td_decorr_process( hSpar->hTdDecorr, st_ivas->hTcBuffer->tc, pPcm_tmp, output_frame );

#ifdef SPAR_TUNING

#ifdef HODIRAC

        if ( hSpar->hTdDecorr->num_apd_outputs >= ( nchan_internal - nchan_transport ) )

        {

            for ( i = 0; i < nchan_internal - nchan_transport; i++ )
@@ -1502,8 +1502,7 @@ void ivas_spar_dec_upmixer( 
            for ( i = 0; i < nchan_transport; i++ )

            {

                tmp = roundf( output[i][j] * PCM16_TO_FLT_FAC );

                pcm = ( tmp > MAX16B_FLT ) ? MAX16B : ( tmp < MIN16B_FLT ) ? MIN16B

                                                                           : (short) tmp;

                pcm = ( tmp > MAX16B_FLT ) ? MAX16B : ( tmp < MIN16B_FLT ) ? MIN16B : (short) tmp;

                dbgwrite( &pcm, sizeof( int16_t ), 1, 1, "dmx_dec.raw" );

            }

        }
@@ -1831,7 +1830,7 @@ void ivas_spar_dec_upmixer( 
                /* we have crossed an unadapted parameter sf border, update previous mixing matrices */

                int16_t md_sf = md_idx / JBM_CLDFB_SLOTS_IN_SUBFRAME;

                split_band = SPAR_DIRAC_SPLIT_START_BAND;

#ifdef SPAR_TUNING

#ifdef HODIRAC

                md_sf = ( num_md_sub_frames == MAX_PARAM_SPATIAL_SUBFRAMES ) ? md_sf : 0;

#endif

                if ( split_band < IVAS_MAX_NUM_BANDS )