Commit e81c718b authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin' into... 

Merge remote-tracking branch 'origin' into 2206-assert-in-stereo_switching_enc_fx-for-omasa-rate-switching-input-new-stv
parents ca7ee9f7 7a5743a4

apps/decoder.c

+0 −11
Original line number Diff line number Diff line
@@ -2962,10 +2962,8 @@ static ivas_error decodeVoIP( 


            *phIvasDec = hIvasDec; /* Update for main()' s free */

            ivasRtp.restartNeeded = false;

#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

            bitstreamReadDone = false;

            parametersAvailableForEditing = false;

#endif

        }



        /* reference vector */
@@ -3215,10 +3213,8 @@ static ivas_error decodeVoIP( 
                    }



                    *phIvasDec = hIvasDec; /* Update for main()' s free */

#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

                    bitstreamReadDone = false;

                    parametersAvailableForEditing = false;

#endif

                }



                /* Placeholder for memory reallocation */
@@ -3982,13 +3978,6 @@ static ivas_error restartDecoder( 
        }

    }



#ifndef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }

#endif

    /* ISAR frame size is set from command line, not renderer config file.

     * This will be ignored if output format is not split rendering. */

    if ( renderConfig != NULL )

lib_com/fd_cng_com_fx.c

+0 −3
Original line number Diff line number Diff line
@@ -166,9 +166,6 @@ void initFdCngCom( 


    set16_fx( hFdCngCom->coherence_fx, 16384 /* 0.5 in Q15 */, MDCT_ST_DTX_NUM_COHERENCE_BANDS );



#ifndef FIX_BASOP_REMOVE_SYNTH2_FX

    set32_fx( hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );

#endif

    set32_fx( hFdCngCom->exc_cng_32fx, 0, L_FRAME16k );

    set16_fx( hFdCngCom->exc_cng, 0, L_FRAME16k );

lib_com/fft_fx.c

+0 −498

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/gs_bitallocation_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -77,11 +77,7 @@ static Word32 Find_bit_frac_fx( const Word16 nb_band, const Word16 remaining_bit 
/* _ None                                                                           */

/*==================================================================================*/



#ifdef FIX_2467_RENAME_GSC_FUNCTION

void bands_and_bit_alloc_fx(

#else

void bands_and_bit_alloc_ivas_fx(

#endif

    const Word16 cor_strong_limit, /* i  : HF correlation                                        */

    const Word16 noise_lev,        /* i  : dwn scaling factor                                    */

    const Word32 core_brate,       /* i  : core bit rate                                         */

lib_com/hq_tools_fx.c

+1 −25

File changed.

Preview size limit exceeded, changes collapsed.