Commit a18fef49 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents 1591a68e db0c9373

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -298,11 +298,7 @@ int main( 
    if ( arg.hrtfReaderEnabled )

    {

        /* sanity check */

#ifdef NONBE_1293_SR_HRTF

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            arg.hrtfReaderEnabled = false;

            fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -175,11 +175,7 @@ typedef enum 
#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

#define MAX_CLDFB_DIGEST_CHANNELS               3                           /* == maximum of ParamISM TCs and ParamMC TCs */

#else

#define MAX_CLDFB_DIGEST_CHANNELS               (FOA_CHANNELS + MAX_NUM_OBJECTS)

#endif



typedef enum

{

lib_com/ivas_prot.h

+0 −15
Original line number Diff line number Diff line
@@ -868,13 +868,6 @@ void ivas_jbm_dec_get_md_map( 
int16_t ivas_jbm_dec_get_num_tc_channels( 

    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */

);

#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS

void ivas_jbm_dec_copy_tc_no_tsm( 

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                         */

    float *tc[],                                                /* i  : transport channels                                          */

    const int16_t output_frame                                  /* i  : output frame size                                           */

);

#endif



void ivas_jbm_dec_get_md_map_even_spacing(

    const int16_t len,                                          /* i  : length of the modfied frames in metadata slots              */
@@ -1129,14 +1122,6 @@ void ivas_param_ism_dec_prepare_renderer( 
    const uint16_t nCldfbSlots                                  /* i  : number of CLDFB slots in transport channels */

);



#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS

void ivas_ism_param_dec_tc_gain_ajust(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nSamples,                                    /* i  : number of samples to be compensate          */

    const uint16_t nFadeLength,                                 /* i  : length of the crossfade in samples          */

    float *p_data_f[]                                           /* i  : synthesized core-coder transport channels/DirAC output  */

);

#endif

void ivas_param_ism_dec_render(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested             */

lib_com/options.h

+1 −4
Original line number Diff line number Diff line
@@ -160,8 +160,7 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define UNIFIED_DECODING_PATHS_LEFTOVERS                /* VA: issue 880: remove leftovers after NONBE_UNIFIED_DECODING_PATHS */



#define FIX_1314_STEREO_TO_EXT                          /* VA: issue 1314: set RENDERER_DISABLE for stereo to EXT output */



/* #################### End BE switches ################################## */
@@ -172,8 +171,6 @@ 


#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 NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1300_TDREND_LARGE_ITD                     /* Eri: issue 1300: There was a bug feeding 1.25 ms frames to the TD renderer, causing out-of-buffer access. This was resolved. However, it is still possible that modeled HRTF with large ITDs could trigger out-of-buffer access. This adds a check to prevent this.*/

#define NONBE_1293_SR_HRTF                              /* VA: issue 1293: add support of external HRTFs in split rendering */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_ism_param_dec.c

+2 −60
Original line number Diff line number Diff line
@@ -45,14 +45,12 @@ 
#include "wmc_auto.h"





#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

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

 * Local function declarations

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



static void ivas_ism_param_dec_tc_gain_adjust( Decoder_Struct *st_ivas, const int16_t nSamples, const int16_t nFadeLength, float *p_data_f[] );



#endif

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

 * Local function definitions

 *-----------------------------------------------------------------------*/
@@ -804,49 +802,20 @@ void ivas_param_ism_dec_digest_tc( 
    float *p_data_f[]           /* i/o: synthesized core-coder transport channels/DirAC output    */

)

{

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    int16_t ch, slot_idx, output_frame;

    int16_t num_freq_bands, cldfb_ch, n_ch_cldfb;

    float *cldfb_real_buffer, *cldfb_imag_buffer;

#else

    int16_t ch, nchan_transport;

    int16_t slot_idx;

    int16_t output_frame;

    PARAM_ISM_DEC_HANDLE hParamIsmDec;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;

    int16_t fade_len;

#endif



    /* Initialization */

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    num_freq_bands = st_ivas->hSpatParamRendCom->num_freq_bands;

    output_frame = nCldfbSlots * num_freq_bands;

    n_ch_cldfb = st_ivas->hTcBuffer->nchan_transport_jbm - st_ivas->hTcBuffer->nchan_buffer_full;



    cldfb_real_buffer = st_ivas->hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc;

    cldfb_imag_buffer = st_ivas->hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc;

#else

    hParamIsmDec = st_ivas->hParamIsmDec;

    assert( hParamIsmDec );

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;

    assert( hSpatParamRendCom );

    output_frame = nCldfbSlots * hSpatParamRendCom->num_freq_bands;

    fade_len = output_frame / 2;



    nchan_transport = st_ivas->nchan_transport;

#endif



#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    ivas_ism_param_dec_tc_gain_adjust( st_ivas, output_frame, output_frame / 2, p_data_f );

#else

    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {

        /*TODO : FhG to check*/

        ivas_ism_param_dec_tc_gain_ajust( st_ivas, output_frame, fade_len, p_data_f );

    }

#endif



#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    /* CLDFB Analysis */

    for ( ch = 0, cldfb_ch = 0; cldfb_ch < n_ch_cldfb; cldfb_ch++, ch++ )

    {
@@ -858,24 +827,6 @@ void ivas_param_ism_dec_digest_tc( 
                              num_freq_bands, st_ivas->cldfbAnaDec[cldfb_ch] );

        }

    }

#else

    for ( ch = 0; ch < nchan_transport; ch++ )

    {

        /* CLDFB Analysis */

        for ( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )

        {

            if ( st_ivas->hDecoderConfig->Opt_tsm )

            {

                float RealBuffer[CLDFB_NO_CHANNELS_MAX];

                float ImagBuffer[CLDFB_NO_CHANNELS_MAX];



                cldfbAnalysis_ts( &( p_data_f[ch][hSpatParamRendCom->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hSpatParamRendCom->num_freq_bands, st_ivas->cldfbAnaDec[ch] );

                mvr2r( RealBuffer, &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );

                mvr2r( ImagBuffer, &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );

            }

        }

    }

#endif



    return;

}
@@ -1037,19 +988,10 @@ void ivas_param_ism_dec_prepare_renderer( 
 *

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



#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

static void ivas_ism_param_dec_tc_gain_adjust(

#else

void ivas_ism_param_dec_tc_gain_ajust(

#endif

    Decoder_Struct *st_ivas,   /* i/o: IVAS decoder handle                                   */

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    const int16_t nSamples,    /* i  : number of samples to be compensate                    */

    const int16_t nFadeLength, /* i  : length of the crossfade in samples                    */

#else

    const uint16_t nSamples,    /* i  : number of samples to be compensate                    */

    const uint16_t nFadeLength, /* i  : length of the crossfade in samples                    */

#endif

    float *p_data_f[]          /* i  : synthesized core-coder transport channels/DirAC output*/

)