Commit a70b76c5 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_DTX_428

parent a421d715

lib_com/ivas_dirac_com.c

+0 −16
Original line number Diff line number Diff line
@@ -528,22 +528,6 @@ ivas_error ivas_dirac_sba_config( 
            {

                return error;

            }

#if !defined( FIX_DTX_428 )

            {

                int16_t dir, j;

                for ( dir = 0; dir < hQMetaData->no_directions; dir++ )

                {

                    for ( j = 0; j < nbands_coded; j++ )

                    {

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

                        {

                            hQMetaData->q_direction[dir].band_data[j].energy_ratio_index[i] = 0;

                            hQMetaData->q_direction[dir].band_data[j].energy_ratio_index_mod[i] = 0;

                        }

                    }

                }

            }

#endif

        }

        ivas_get_dirac_sba_max_md_bits(

            sba_total_brate,

lib_com/options.h

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


/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/



#define FIX_DTX_428                                     /* FhG: fix for issue 428, crash with DTX and bitrate switching */

#define FIX_STEREO_474                                  /* FhG fix for issue 574, crash with SBA to stereo output at 512 kbps */

#define FIX_MDCT_ST_PLC_FADEOUT_DELAY

#define FIX_DIRAC_LS_SYNTHESIS_CONFIG_479               /* FhG: fix for issue 479, broken LS output with DirAC at high BRs */

lib_enc/ivas_sba_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -121,10 +121,8 @@ ivas_error ivas_sba_enc_reconfigure( 
        SPAR_ENC_HANDLE hSpar;

        int16_t analysis_order_old;

        int16_t spar_reconfig_flag;

#ifdef FIX_DTX_428

        int16_t nbands_old;

        int16_t ndir_old;

#endif



        spar_reconfig_flag = 0;

        nchan_transport_old = st_ivas->nchan_transport;
@@ -132,10 +130,8 @@ ivas_error ivas_sba_enc_reconfigure( 
        nSCE_old = st_ivas->nSCE;

        st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, hEncoderConfig->sba_order );

        analysis_order_old = ivas_sba_get_analysis_order( hEncoderConfig->last_ivas_total_brate, hEncoderConfig->sba_order );

#ifdef FIX_DTX_428

        nbands_old = st_ivas->hQMetaData->q_direction->cfg.nbands;

        ndir_old = st_ivas->hQMetaData->no_directions;

#endif



        if ( analysis_order_old != st_ivas->sba_analysis_order )

        {
@@ -250,7 +246,6 @@ ivas_error ivas_sba_enc_reconfigure( 
        {

            return error;

        }

#ifdef FIX_DTX_428

        if ( st_ivas->hQMetaData->q_direction->cfg.nbands != nbands_old || st_ivas->hQMetaData->no_directions != ndir_old )

        {

            int16_t dir, j, i;
@@ -267,7 +262,6 @@ ivas_error ivas_sba_enc_reconfigure( 
                }

            }

        }

#endif

#ifndef SBA_MODE_CLEAN_UP

        mvs2s( hDirAC->dirac_to_spar_md_bands, hSpar->dirac_to_spar_md_bands, DIRAC_MAX_NBANDS );

#endif