Commit 200194a7 authored by multrus's avatar multrus
Browse files

[cleanup] accept LBR_SBA_DIRAC_FIX

parent 30ef38b4

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 


#define FIX_439_OTR_PARAMS                              /* Philips: Issue 439: orientation tracking parameter aspects. */



#define LBR_SBA_DIRAC_FIX                               /* DLB: Bug fix for DirAC at low bitrates */



#define FIX_445_SNS_BUGFIXES                            /* FhG: bug fix for spectral tilt in SNS computation + necessary update of codebooks and converison to fixedpoint-compatible tables */

#define FIX_447_PARAMBIN_MASA_REGU_FAC                  /* Nokia: Issue 447: Fix issue by adjusting regularization factor minimum value. */

lib_enc/ivas_dirac_enc.c

+0 −10
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ ivas_error ivas_dirac_enc_reconfigure( 




    /* :TODO: if the number of parameter bands change, do a meaningful mapping of parameter buffers from old to new band setting */

#ifdef LBR_SBA_DIRAC_FIX



    if ( st_ivas->hQMetaData->useLowerRes )

    {
@@ -258,10 +257,6 @@ ivas_error ivas_dirac_enc_reconfigure( 
    {

        mvs2s( DirAC_block_grouping_5ms_MDFT, hDirAC->block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 );

    }

#else



    mvs2s( DirAC_block_grouping, hDirAC->block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 );

#endif



    return error;

}
@@ -766,13 +761,8 @@ void ivas_dirac_param_est_enc( 
                for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ )

#endif

                {

#ifdef LBR_SBA_DIRAC_FIX

                    mvr2r( &pp_fr_real[i][ts * l_ts], Cldfb_RealBuffer[i], l_ts );

                    mvr2r( &pp_fr_imag[i][ts * l_ts], Cldfb_ImagBuffer[i], l_ts );

#else

                    mvr2r( &pp_fr_real[i][block_m_idx * l_ts], Cldfb_RealBuffer[i], l_ts );

                    mvr2r( &pp_fr_imag[i][block_m_idx * l_ts], Cldfb_ImagBuffer[i], l_ts );

#endif

                }

            }

#ifndef HODIRAC