Commit 531fa54e authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_986_MC_BW_SWITCHING

parent a4a9865e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ 
#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif                                                                                     

#define NONBE_FIX_986_MC_BW_SWITCHING                         /* FhG: fix crash in bw and br switching with MC */

#define NONBE_FIX_975_JBM_USAN                                /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS                    /* FhG : issue #982 : 5ms and 20ms output different for OMASA */

lib_enc/bw_detect.c

+0 −16
Original line number Diff line number Diff line
@@ -713,7 +713,6 @@ int16_t set_bw_mct( 
    }



    bw_changed = 0;

#ifdef NONBE_FIX_986_MC_BW_SWITCHING

    if ( mct_bwidth != last_mct_bwidth )

    {

        bw_changed = 1;
@@ -732,21 +731,6 @@ int16_t set_bw_mct( 
            st->bwidth = mct_bwidth;

        }

    }

#else

    if ( mct_bwidth != last_mct_bwidth )

    {

        bw_changed = 1;



        for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )

        {

            for ( ch = 0; ch < CPE_CHANNELS; ch++ )

            {

                st = hCPE[cpe_id]->hCoreCoder[ch];

                st->bwidth = mct_bwidth;

            }

        }

    }

#endif



    return bw_changed;

}

lib_enc/ivas_cpe_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -546,14 +546,10 @@ ivas_error ivas_cpe_enc( 
        if ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->element_mode != hCPE->last_element_mode || ( hCPE->element_mode == IVAS_CPE_TD && sts[0]->bits_frame_nominal != last_bits_frame_nominal ) || sts[n]->last_bwidth != sts[n]->bwidth ) && ( n == 0 || hCPE->element_mode == IVAS_CPE_MDCT ) )

        {

            int16_t igf;

#ifdef NONBE_FIX_986_MC_BW_SWITCHING

            int16_t bw;



            bw = ( hCPE->element_mode == IVAS_CPE_MDCT ) ? sts[n]->bwidth : sts[n]->max_bwidth;

            igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, bw, sts[n]->rf_mode );

#else

            igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->rf_mode );

#endif

            if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )

            {

                return error;

lib_enc/ivas_mct_enc.c

+0 −10
Original line number Diff line number Diff line
@@ -172,9 +172,6 @@ ivas_error ivas_mct_enc( 
    float orig_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS][L_FRAME48k];

    int16_t switch_bw;

    IVAS_FORMAT ivas_format;

#ifndef NONBE_FIX_986_MC_BW_SWITCHING

    int16_t max_bwidth;

#endif

    int32_t ivas_total_brate;

    ivas_error error;

    float *pdata[MAX_INPUT_CHANNELS];
@@ -188,9 +185,6 @@ ivas_error ivas_mct_enc( 
    hMCT->hBstr = st_ivas->hCPE[0]->hCoreCoder[0]->hBstr; /* pointer to write MCT side bits */



    ivas_format = st_ivas->hEncoderConfig->ivas_format;

#ifndef NONBE_FIX_986_MC_BW_SWITCHING

    max_bwidth = st_ivas->hEncoderConfig->max_bwidth;

#endif

    ivas_total_brate = st_ivas->hEncoderConfig->ivas_total_brate;



#ifdef DEBUG_FORCE_MCT_CP
@@ -234,11 +228,7 @@ ivas_error ivas_mct_enc( 


        for ( n = 0; n < (int16_t) ( hMCT->nchan_out_woLFE * 0.5 ); n++ )

        {

#ifdef NONBE_FIX_986_MC_BW_SWITCHING

            initMdctStereoEncData( hMCT->hBlockData[n]->hStereoMdct, ivas_format, IVAS_CPE_MDCT, cp_bitrate, st_ivas->hCPE[0]->hCoreCoder[0]->bwidth, st_ivas->hCPE[0]->hCoreCoder[0]->igf, st_ivas->hCPE[0]->hCoreCoder[0]->igf ? st_ivas->hCPE[0]->hCoreCoder[0]->hIGFEnc->igfData.igfInfo.grid : NULL, 0 );

#else

            initMdctStereoEncData( hMCT->hBlockData[n]->hStereoMdct, ivas_format, IVAS_CPE_MDCT, cp_bitrate, max_bwidth, st_ivas->hCPE[0]->hCoreCoder[0]->igf, st_ivas->hCPE[0]->hCoreCoder[0]->igf ? st_ivas->hCPE[0]->hCoreCoder[0]->hIGFEnc->igfData.igfInfo.grid : NULL, 0 );

#endif

        }

    }