Commit cffafd77 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_951_MCMASA_5MS_RENDERING

parent 7696303d

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -3683,9 +3683,7 @@ void generate_masking_noise_lb_dirac( 
    HANDLE_FD_CNG_COM hFdCngCom,                                /* i/o: FD_CNG structure containing all buffers and variables */

    float *tdBuffer,                                            /* i/o: time-domain signal, if NULL no LB-CNA                 */

    const int16_t nCldfbTs,                                     /* i  : number of CLDFB slots that will be rendered           */

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,       /* i  : common spatial rendering parameters handle            */

#endif

    const int16_t cna_flag                                      /* i  : CNA flag for LB and HB                                */

);

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_951_MCMASA_5MS_RENDERING                    /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */

#define NONBE_FIX_979_OSBA_STEREO_5MS                         /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */

#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */

lib_dec/fd_cng_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -1805,9 +1805,7 @@ void generate_masking_noise_lb_dirac( 
    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */

    float *tdBuffer,             /* i/o: time-domain signal, if NULL no LB-CNA                 */

    const int16_t nCldfbTs,      /* i  : number of CLDFB slots that will be rendered           */

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i  : common spatial rendering parameters handle            */

#endif

    const int16_t cna_flag /* i  : CNA flag for LB and HB                                */

)

{
@@ -1860,12 +1858,10 @@ 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 )

        {
@@ -1951,7 +1947,6 @@ void generate_masking_noise_lb_dirac( 
            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 */

        slot_size_cng = hFdCngCom->frameSize / DEFAULT_JBM_CLDFB_TIMESLOTS;
@@ -1972,7 +1967,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

    }

lib_dec/ivas_dirac_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -1943,18 +1943,10 @@ void ivas_dirac_dec_render_sf( 


            generate_masking_noise_dirac( st->hFdCngDec->hFdCngCom,

                                          st_ivas->cldfbAnaDec[1],

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

                                          &st_ivas->hTcBuffer->tc[1][hSpatParamRendCom->num_freq_bands * hSpatParamRendCom->slots_rendered],

#else

                                          st_ivas->hTcBuffer->tc[1],

#endif

                                          Cldfb_RealBuffer[1][0],

                                          Cldfb_ImagBuffer[1][0],

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

                                          slot_idx,

#else

                                          index_slot,

#endif

                                          st->cna_dirac_flag && st->flag_cna,

                                          ( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && st->cng_type == FD_CNG && st->cng_sba_flag );

        }

lib_dec/ivas_sba_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -759,11 +759,7 @@ void ivas_sba_dec_digest_tc( 
         ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC ) && ( nchan_transport == 1 && st_ivas->nchan_transport != 2 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag ) ) )

    {

        Decoder_State *st = st_ivas->hSCE[0]->hCoreCoder[0];

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

        generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[1], nCldfbSlots, st_ivas->hSpatParamRendCom, st->cna_dirac_flag && st->flag_cna );

#else

        generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[1], nCldfbSlots, st->cna_dirac_flag && st->flag_cna );

#endif

    }



    return;