Commit acb23597 authored by emerit's avatar emerit
Browse files

Merge branch 'ivas-float-update' into 1963_ref_portFltMR-1568-1471-1690

parents fbc0dad3 a04d8361

lib_com/ivas_prot.h

+5 −0
Original line number Diff line number Diff line
@@ -3735,8 +3735,13 @@ void ivas_dirac_dec_render_sf( 
    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */

    float *output_f[],                                          /* i/o: synthesized core-coder transport channels/DirAC output  */

    const int16_t nchan_transport,                              /* i  : number of transport channels            */

#ifdef FIX_1319_STACK_SBA_DECODER

    float *pppQMfFrame_ts_re[HOA3_CHANNELS][CLDFB_NO_COL_MAX],

    float *pppQMfFrame_ts_im[HOA3_CHANNELS][CLDFB_NO_COL_MAX]

#else

    float *pppQMfFrame_ts_re[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX],

    float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX]

#endif

);



void computeDiffuseness_mdft(

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -159,11 +159,12 @@ 
#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0 */

#define FIX_CREND_SIMPLIFY_CODE   

#ifdef FIX_CREND_SIMPLIFY_CODE

#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

#endif

#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */

#define FIX_1319_STACK_SBA_DECODER                      /* VA: issue 1319: Optimize the definition of buffer lengths in the SBA decoder */

/* #################### End BASOP porting switches ############################ */



/* clang-format on */

lib_com/prot.h

+0 −1
Original line number Diff line number Diff line
@@ -5863,7 +5863,6 @@ ivas_error core_switching_post_dec( 
    float *synth,                        /* i/o: output synthesis                        */

    float *output,                       /* i/o: LB synth/upsampled LB synth             */

    float output_mem[],                  /* i  : OLA memory from last TCX/HQ frame       */

    const IVAS_FORMAT ivas_format,       /* i  : IVAS format                             */

    const int16_t use_cldfb_for_dft,     /* i  : flag to use of CLDFB for DFT Stereo     */

    const int16_t output_frame,          /* i  : frame length                            */

    const int16_t core_switching_flag,   /* i  : ACELP->HQ switching frame flag          */

lib_dec/core_switching_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -557,7 +557,6 @@ ivas_error core_switching_post_dec( 
    float *synth,                        /* i/o: output synthesis                    */

    float *output,                       /* i/o: LB synth/upsampled LB synth         */

    float output_mem[],                  /* i  : OLA memory from last TCX/HQ frame   */

    const IVAS_FORMAT ivas_format,       /* i  : IVAS format                         */

    const int16_t use_cldfb_for_dft,     /* i  : flag to use of CLDFB for DFT Stereo */

    const int16_t output_frame,          /* i  : frame length                        */

    const int16_t core_switching_flag,   /* i  : ACELP->HQ switching flag            */
@@ -679,7 +678,7 @@ ivas_error core_switching_post_dec( 
                    synth[i + delay_comp] = ( synth[i + delay_comp] * i + ( tmpDelta - i ) * st->previoussynth[i + delay_comp] ) / tmpDelta;

                }



                if ( ( st->element_mode == IVAS_CPE_MDCT || ( ivas_format == ISM_FORMAT && st->core == TCX_20_CORE /* <- means TCX in general, TCX10 is forbidden after ACELP */ ) ) && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 )

                if ( ( st->element_mode == IVAS_CPE_MDCT || ( st->is_ism_format && st->core == TCX_20_CORE /* <- means TCX in general, TCX10 is forbidden after ACELP */ ) ) && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 )

                {

                    /* smooth transitions to avoid pops in car noise items */

                    smoothTransitionDtxToTcx( synth, output_frame, delay_comp );

lib_dec/evs_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ ivas_error evs_dec( 
         * Postprocessing for ACELP/MDCT core switching

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



        if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, MONO_FORMAT, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK )

        if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK )

        {

            return error;

        }