Commit 454febfc authored by Jouni Paulus's avatar Jouni Paulus
Browse files

remove extra inner scope from CNA buffer adjustment

parent 657af803

lib_dec/fd_cng_dec.c

+27 −27
Original line number Diff line number Diff line
@@ -1860,6 +1860,13 @@ void generate_masking_noise_lb_dirac( 
    /* LB CLDFB - CNA from STFT: CNA applied only in channel 0*/

    if ( cna_flag && tdBuffer != NULL )

    {

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

        int16_t cur_subframe;

        int16_t cur_subframe_start_outfs;

        int16_t cur_subframe_start_cngfs;

        int16_t slot_size_cng;

#endif



        while ( n_samples_out > 0 )

        {

            n_samples_out_loop = min( hFdCngCom->frameSize, n_samples_out );
@@ -1943,16 +1950,10 @@ void generate_masking_noise_lb_dirac( 
            n_samples_out -= hFdCngCom->frameSize;

            n_samples_start += hFdCngCom->frameSize;

        }



#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

        {

        /* move generated noise to the 5ms subframe starts in the tc buffer according to the output sampling frequency to avoid

           overwriting it with the synthesis in case of shared tc and synth channel memory, i.e. non-TSM mode */

            int16_t cur_subframe;

            int16_t cur_subframe_start_outfs;

            int16_t cur_subframe_start_cngfs;

            int16_t slot_size_cng;





        slot_size_cng = hFdCngCom->frameSize / DEFAULT_JBM_CLDFB_TIMESLOTS;

        /* move start indices forward to the end of the last subframe */

        cur_subframe_start_outfs = nCldfbTs * hSpatParamRendCom->slot_size;
@@ -1971,7 +1972,6 @@ void generate_masking_noise_lb_dirac( 
            /* set everything else to zero */

            set_zero( tdBuffer + cur_subframe_start_outfs + move_size, subframe_size_outfs - move_size );

        }

        }

#endif

    }