Commit 1182bf45 authored by bayers's avatar bayers
Browse files

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

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 500-head-tracking-api-causes-extra-15ms-of-delay
parents 64d54c3c d91dc84b

apps/renderer.c

+5 −1
Original line number Diff line number Diff line
@@ -1907,7 +1907,11 @@ int main( 
        if ( audioWriter != NULL )

        {

#endif

#ifdef API_5MS

            if ( ( delayNumSamples * num_out_channels ) < outBufferSize ) /* TODO tmu2sgi : needs verification */

#else

        if ( delayNumSamples < outBufferSize )

#endif

            {

                if ( AudioFileWriter_write( audioWriter, &outInt16Buffer[delayNumSamples * num_out_channels], outBufferSize - ( delayNumSamples * num_out_channels ) ) != IVAS_ERR_OK )

                {

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ 
#define API_5MS_BASELINE                                /* FhG: baseline with 20ms rendering and split rendering through 20ms branch */

#endif

#define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK

#define FIX_CQMFPREDDEC_FREE                            /* FhG: avoid double free / free of NULL in DeletePredictionDecoder() */

// 5 ms branch switches end

#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_571_REVERB_NOT_ACTIVATED_ISM                /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */
@@ -209,6 +210,7 @@ 
#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PRED_QUANT_63_PNTS

#define SPLIT_REND_WITH_HEAD_ROT_PARAMBIN               /* Nokia: Issue 623: Split rendering support for parambin renderer */

#define FIX_658_SPLIT_REND_MASA                         /*Dlb : Fix for issue 658, uninitialized memory access in MASA in Split rendering 0DOF mode*/                 

#endif

#define FIX_594_STL_INCLUDE                             /* FhG: issue 594: Missing include of stl.h */

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -581,6 +581,10 @@ ivas_error ivas_jbm_dec_tc( 
        st_ivas->ini_active_frame++;

    }



#ifdef MASA_AND_OBJECTS

    st_ivas->last_ivas_format = st_ivas->ivas_format;

#endif



#ifdef DEBUG_MODE_INFO

    dbgwrite( &st_ivas->bfi, sizeof( int16_t ), 1, output_frame, "res/bfi" );

    dbgwrite( &st_ivas->BER_detect, sizeof( int16_t ), 1, output_frame, "res/BER_detect" );

lib_dec/ivas_omasa_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmc_auto.h"





#ifdef MASA_AND_OBJECTS

lib_dec/lib_dec.c

+4 −2
Original line number Diff line number Diff line
@@ -1152,6 +1152,7 @@ ivas_error IVAS_DEC_GetSplitBinaural( 
        IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend;

        int16_t max_band;

        int16_t pcm_out;

        int16_t td_input;

        int16_t numPoses;



        hSplitBinRend = &st_ivas->splitBinRend;
@@ -1185,6 +1186,7 @@ ivas_error IVAS_DEC_GetSplitBinaural( 


        max_band = (int16_t) ( ( BINAURAL_MAXBANDS * output_Fs ) / 48000 );

        pcm_out = ( output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0;

        td_input = st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC;



        /* TODO(jbm): need to wait 20ms before writing split bitstream in 5ms mode */

        error = ivas_renderMultiBinToSplitBinaural( &hSplitBinRend->splitrend,
@@ -1195,7 +1197,7 @@ ivas_error IVAS_DEC_GetSplitBinaural( 
                                                    hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural,

                                                    hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural,

                                                    max_band, output, 1,

                                                    st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV,

                                                    td_input,

                                                    pcm_out );

        if ( error != IVAS_ERR_OK )

        {