Commit e28e0e86 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'FhG/b_20230405_HO-DirAC' of... 

Merge branch 'FhG/b_20230405_HO-DirAC' of gitlab.cc-asp.fraunhofer.de:ivas/ivas_dirac-spar-harmonization into FhG/b_20230405_HO-DirAC
parents 640c651e a587108b

lib_enc/ivas_enc.c

+3 −2
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ ivas_error ivas_enc( 


    n = getNumChanAnalysis( st_ivas );



    /*tyagiri: TODO: looks like HP20 is disabled for high bitrates in SBA. Also, getNumChanAnalysis() is returning (order+1)*(order+1) channels always. is this expected ?*/

#ifndef DEBUG_SPAR_BYPASS_EVS_CODEC

    /* bypass EVS coding in float precision, emulating EVS encoder/decoder delay */

    for ( i = 0; i < n; i++ )

lib_enc/ivas_init_enc.c

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ int16_t getNumChanAnalysis( 
    if ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT )

    {

#ifdef HODIRAC

        /*tyagiri:TODO: best keep it unchanged*/

        n = ( st_ivas->sba_analysis_order + 1 ) * ( st_ivas->sba_analysis_order + 1 );

#else

        n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order );

lib_enc/ivas_sba_enc.c

+4 −4
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ ivas_error ivas_sba_enc_reconfigure( 
            n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order );

#endif



            /*tyagiri:TODO : this should be done based on output of getNumChanAnalysis()*/

            if ( n > n_old )

            {

                /* save old mem_hp_20 pointer */
@@ -256,8 +257,7 @@ ivas_error ivas_sba_enc_reconfigure( 
#else

        if ( nchan_transport_old != st_ivas->nchan_transport

#ifdef HODIRAC

             || ( ivas_total_brate < IVAS_512k && hEncoderConfig->last_ivas_total_brate >= IVAS_512k )

			 || ( ivas_total_brate >= IVAS_512k && hEncoderConfig->last_ivas_total_brate < IVAS_512k )

             || ( ivas_total_brate < IVAS_512k && hEncoderConfig->last_ivas_total_brate >= IVAS_512k ) || ( ivas_total_brate >= IVAS_512k && hEncoderConfig->last_ivas_total_brate < IVAS_512k )

#endif

        )

#endif

lib_enc/ivas_spar_encoder.c

+2 −2
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static ivas_error ivas_spar_enc_process( 
    /*-----------------------------------------------------------------------------------------*

     * DirAC encoding

     *-----------------------------------------------------------------------------------------*/



    /*tyagiri: TODO: HODIRAC should be disabled for 256 kbps and outputs should be BE w.r.t baseline*/

    ivas_dirac_param_est_enc( st_ivas->hDirAC, hQMetaData->q_direction, hQMetaData->useLowerRes, data_f, ppIn_FR_real, ppIn_FR_imag, input_frame, st_ivas->sba_mode

#ifdef HODIRAC

                              ,