Commit 85586f63 authored by bayers's avatar bayers
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 578-parammc-center-ild-not-transmitted-when-lfe-is-active-in-the-lowest-parameter-band-in-3tc-modes
parents 41d27e2a a4785365

lib_com/ivas_prot.h

+20 −0
Original line number Diff line number Diff line
@@ -5447,6 +5447,26 @@ void ivas_lfe_synth_with_filters( 
    const int16_t lfeChannelIndex                               /* i  : LFE channel index                               */

);



#ifdef FIX_572_LFE_LPF_ENC

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

 * LFE encoder low pass filter prototypes

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



ivas_error ivas_create_lfe_lpf_enc(

    ivas_filters_process_state_t **ph_lfe_lpf_filter_state, /* o  : IVAS LFE encoder structure   */

    const int32_t input_Fs                                  /* i  : input sampling rate          */

);



void ivas_lfe_lpf_enc_close(

    ivas_filters_process_state_t **ph_lfe_lpf_filter_state /* i/o: LFE encoder handle */

);



void ivas_lfe_lpf_enc_apply(

    ivas_filters_process_state_t *h_lfe_lpf_filter_state, /* i/o: LFE encoder handle */

    float data_lfe_ch[],       /* i  : input LFE signal                         */

    const int16_t input_frame  /* i  : input frame length per channel           */

);

#endif



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

 * LFE Coding prototypes

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ 
#define FIX_565_SBA_BURST_IN_FEC                        /* VA: Issue 565: Fix noise burst during FEC, due to wrong total_brate initialization */

#define FIX_562_ISM2_64KBPS                             /* VA: issue 562: fix ISM2 at 64kbps issue */

#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

#define FIX_572_LFE_LPF_ENC                             /* FhG: issue 572: always apply the low pass filter to the LFE channel */



#define FIX_QMETA_SID_5k2                               /* Nokia: Issue 137: enable using full 5.2k bitrate in MASA SID */

#define FIX_578_PARAMMC_ILD_BS                          /* FhG: Issue 578: transmitt also center ILD in band 0 when LFE is active in 3TC ParamMC */

lib_dec/ivas_dirac_dec.c

+1 −5
Original line number Diff line number Diff line
@@ -422,11 +422,7 @@ ivas_error ivas_dirac_dec_config( 
    }





    if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC

#ifdef FIX_DIRAC_LS_SYNTHESIS_CONFIG

         && !hodirac_flag

#endif

    )

    if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC && !hodirac_flag )

    {

        hDirAC->synthesisConf = DIRAC_SYNTHESIS_PSD_LS;

        hDirAC->panningConf = DIRAC_PANNING_VBAP;

lib_enc/ivas_enc.c

+5 −0
Original line number Diff line number Diff line
@@ -276,6 +276,11 @@ ivas_error ivas_enc( 


        hMetaData = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData : st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData;



#ifdef FIX_572_LFE_LPF_ENC

        /* LFE low pass filter */

        ivas_lfe_lpf_enc_apply( st_ivas->lfe_lpf_state, data_f[LFE_CHANNEL], input_frame );

#endif



        /* LFE channel encoder */

        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

lib_enc/ivas_init_enc.c

+14 −0
Original line number Diff line number Diff line
@@ -314,6 +314,11 @@ void ivas_initialize_handles_enc( 
    /* LFE  handle */

    st_ivas->hLFE = NULL;



#ifdef FIX_572_LFE_LPF_ENC

    /* LFE low pass filter state */

    st_ivas->lfe_lpf_state = NULL;

#endif



    return;

}
@@ -543,6 +548,10 @@ ivas_error ivas_init_encoder( 


        hEncoderConfig->nchan_inp = ivas_mc_ls_setup_get_num_channels( hEncoderConfig->mc_input_setup );



#ifdef FIX_572_LFE_LPF_ENC

        ivas_create_lfe_lpf_enc( &st_ivas->lfe_lpf_state, hEncoderConfig->input_Fs );

#endif



        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

            st_ivas->nSCE = 0;
@@ -944,6 +953,11 @@ void ivas_destroy_enc( 
    /* LFE handle */

    ivas_lfe_enc_close( &( st_ivas->hLFE ) );



#ifdef FIX_572_LFE_LPF_ENC

    /* LFE low pass filter state */

    ivas_lfe_lpf_enc_close( &( st_ivas->lfe_lpf_state ) );

#endif



    /* Param-Upmix MC handle */

    ivas_mc_paramupmix_enc_close( &( st_ivas->hMCParamUpmix ), st_ivas->hEncoderConfig->input_Fs );