Commit 700c0e98 authored by sagnowski's avatar sagnowski
Browse files

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' into... 

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' into 68-ensure-5ms-framing-capability-in-ivas-rend
parents ed872446 1a9fd9fa

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -421,8 +421,12 @@ int main( 
    {

#ifdef API_5MS

        if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, 60, arg.inputFormat ) ) != IVAS_ERR_OK )

#else

#ifndef VARIABLE_SPEED_DECODING

        if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, 60, arg.inputFormat ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, IVAS_DEC_VOIP_MODE_VOIP, 100, 60, arg.inputFormat ) ) != IVAS_ERR_OK )

#endif

#endif

        {

            fprintf( stderr, "\nCould not enable VOIP: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

lib_com/ivas_error.h

+5 −5
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ typedef enum 
    IVAS_ERR_ISM_INVALID_METADATA_VALUE,

    IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE,

    IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED,

#ifdef API_5MS

    IVAS_ERR_TSM_NOT_ENABLED,

    IVAS_ERR_FETCH_SIZE_NO_MULTIPLE_OF_5MS,

    IVAS_ERR_NEED_NEW_FRAME,

#endif

#ifdef DEBUGGING

    IVAS_ERR_INVALID_FORCE_MODE,

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
@@ -94,11 +99,6 @@ typedef enum 
#ifdef VARIABLE_SPEED_DECODING

    IVAS_ERR_VS_FRAME_NEEDED,

#endif

#ifdef API_5MS

    IVAS_ERR_TSM_NOT_ENABLED,

    IVAS_ERR_FETCH_SIZE_NO_MULTIPLE_OF_5MS,

    IVAS_ERR_NEED_NEW_FRAME,

#endif

#endif



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

lib_com/ivas_prot.h

+16 −0
Original line number Diff line number Diff line
@@ -827,6 +827,13 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */

);



#ifdef API_5MS

void ivas_jbm_dec_copy_tc_no_tsm( 

    Decoder_Struct *st_ivas, 

    float *tc[], 

    const int16_t output_frame );

#endif



#ifdef FIX_470_MASA_JBM_EXT

void ivas_jbm_dec_get_md_map_even_spacing(

    const int16_t default_len,  /* i  : default frame length in metadata slots         */
@@ -1067,6 +1074,15 @@ void ivas_param_ism_dec_digest_tc( 
    float *transport_channels_f[]                               /* i : synthesized core-coder transport channels/DirAC output  */

);



#ifdef API_5MS

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 *transport_channels_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

+5 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
#define DEBUG_JBM_CMD_OPTION                    /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */



#define VARIABLE_SPEED_DECODING                 /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */



/*#define DISABLE_LIMITER*/

#endif



/* #################### End DEBUGGING switches ############################ */
@@ -166,12 +166,15 @@ 
#define FIX_558_PLC_DISCONT                             /* FhG: issue 558: fix discontinuities in DFT Stereo when switching from TCX concealment to ACELP */

#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

#define FIX_566_2DIR_MASA_384K                          /* Nokia: Issued 566:  Bugfix in 384k MASA metadata encoding of second direction */

#define FIX_XXX_JITTER_SBA_BINAURAL_GAIN

#define FIX_XXX_HEADTRACKER_INIT

#define FIX_XXX_TDOBJRENDERER_INPUT

#define FIX_XXX_ISM_SBA_ASAN

#define NONBE_FIX_589_JBM_TC_OFFSETS

#define API_5MS

#ifdef API_5MS

#define JITTER_MEM_OPTIM_RENDERING

#define LIB_REND_API_5MS                            /* FhG: Adds 5ms framing capability to lib_rend */

#endif

#define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK

#define SGI_DBG

lib_dec/ivas_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -721,8 +721,9 @@ ivas_error ivas_dec( 
     *   - compensation for saturation

     *   - float to integer conversion

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



#ifndef DISABLE_LIMITER

    ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out, output_frame, st_ivas->BER_detect );

#endif



#ifdef DEBUGGING

    st_ivas->noClipping +=