Commit 656acdd7 authored by norvell's avatar norvell
Browse files

Cleanup of NONBE_FIX_1208_DFT_STEREO_PLC_BURST

parent 922a769e

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -1407,7 +1407,9 @@ void stereo_dft_res_ecu( 
    float *pDFT_RES,                                            /* i/o: residual signal                     */

    float *const DFT_PRED_RES,                                  /* i/o: residual prediction signal          */

    const int16_t k,                                            /* i  : Subframe index                      */

#ifndef NONBE_FIX_1208_DFT_STEREO_PLC_BURST

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

#endif

    const int16_t prev_bfi,                                     /* i  : Previous BFI                        */

    const float dmx_nrg,                                        /* i  : Down-mix energy                     */

    int16_t *num_plocs,                                         /* i/o: Number of peak locations            */

lib_dec/ivas_stereo_dft_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1288,7 +1288,11 @@ void stereo_dft_dec( 
                }

                else

                {

#ifdef NONBE_FIX_1208_DFT_STEREO_PLC_BURST

                    stereo_dft_res_ecu( hStereoDft, pDFT_RES, DFT_PRED_RES, k, prev_bfi, dmx_nrg, &num_plocs, plocs, plocsi, input_mem );

#else

                    stereo_dft_res_ecu( hStereoDft, pDFT_RES, DFT_PRED_RES, k, output_frame, prev_bfi, dmx_nrg, &num_plocs, plocs, plocsi, input_mem );

#endif

                }

            }

lib_dec/ivas_stereo_dft_dec_dmx.c

+4 −0
Original line number Diff line number Diff line
@@ -159,7 +159,11 @@ void stereo_dft_unify_dmx( 
                pPredGain = hStereoDft->res_pred_gain + ( k + k_offset ) * STEREO_DFT_BAND_MAX;

                hStereoDft->past_DMX_pos = ( hStereoDft->past_DMX_pos + STEREO_DFT_PAST_MAX - 1 ) % STEREO_DFT_PAST_MAX;

                stereo_dft_generate_res_pred( hStereoDft, samp_ratio, pDFT_DMX, DFT_PRED_RES, pPredGain, k, DFT[1] + k * STEREO_DFT32MS_N_MAX, &stop, st0->bfi );

#ifdef NONBE_FIX_1208_DFT_STEREO_PLC_BURST

                stereo_dft_res_ecu( hStereoDft, pDFT_RES, DFT_PRED_RES, k, prev_bfi, dmx_nrg, &num_plocs, plocs, plocsi, input_mem );

#else

                stereo_dft_res_ecu( hStereoDft, pDFT_RES, DFT_PRED_RES, k, output_frame, prev_bfi, dmx_nrg, &num_plocs, plocs, plocsi, input_mem );

#endif

            }

        }

lib_dec/ivas_stereo_dft_plc.c

+4 −2
Original line number Diff line number Diff line
@@ -64,7 +64,9 @@ void stereo_dft_res_ecu( 
    float *pDFT_RES,                       /* i/o: residual signal                 */

    float *const DFT_PRED_RES,             /* i/o: residual prediction signal      */

    const int16_t k,                       /* i  : Subframe index                  */

#ifndef NONBE_FIX_1208_DFT_STEREO_PLC_BURST

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

#endif

    const int16_t prev_bfi,                /* i  : Previous BFI                    */

    const float dmx_nrg,                   /* i  : Down-mix energy                 */

    int16_t *num_plocs,                    /* i/o: Number of peak locations        */
@@ -110,7 +112,7 @@ void stereo_dft_res_ecu( 
    {

        mvr2r( pDFT_RES, res_buf, L_FRAME8k );

#ifdef NONBE_FIX_1208_DFT_STEREO_PLC_BURST

        time_offs = min( MAX16B_FLT, hStereoDft->time_offs + L_FRAME8k );

        time_offs = min( MAX16B, hStereoDft->time_offs + L_FRAME8k );

        stereo_dft_res_subst_spec( hStereoDft, res_buf, DFT_PRED_RES, time_offs, L_res, L_FRAME8k, k, num_plocs, plocs, plocsi, FALSE );

#else

        stereo_dft_res_subst_spec( hStereoDft, res_buf, DFT_PRED_RES, hStereoDft->time_offs + output_frame, L_res, L_FRAME8k, k, num_plocs, plocs, plocsi, FALSE );
@@ -142,7 +144,7 @@ void stereo_dft_res_ecu( 


        /*in case of burst error*/

#ifdef NONBE_FIX_1208_DFT_STEREO_PLC_BURST

        hStereoDft->time_offs = min( MAX16B_FLT, hStereoDft->time_offs + L_FRAME8k );

        hStereoDft->time_offs = min( MAX16B, hStereoDft->time_offs + L_FRAME8k );

#else

        hStereoDft->time_offs += L_FRAME8k;

#endif