Commit db229008 authored by sagnowski's avatar sagnowski
Browse files

Add issue number to TMP_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR switch

parent 514658b5

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 


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

#define FIX_1119_SPLIT_RENDERING_VOIP                   /* FhG: Add split rendering support to decoder in VoIP mode */

#define TMP_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR           /* FhG: Workaround for incorrect implementation of decoder flush with split rendering */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1335_EXTREND_RETCODE                        /* FhG: Add modification of returncode for external renderer when an error occurs */

lib_dec/ivas_jbm_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ ivas_error ivas_jbm_dec_render( 
    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

        nchan_out_syn_output = BINAURAL_CHANNELS * st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses;

#ifdef TMP_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

#ifdef TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

        if ( st_ivas->flushing )

        {

            nchan_out_syn_output = BINAURAL_CHANNELS;

lib_dec/ivas_stat_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ typedef struct Decoder_Struct 
    int16_t ism_extmeta_active;                                /* Extended metadata active in decoder */

    int16_t ism_extmeta_cnt;                                   /* Change frame counter for extended metadata */



#ifdef TMP_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

#ifdef TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

    int16_t flushing;

#endif

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -4134,7 +4134,7 @@ ivas_error IVAS_DEC_Flush( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#ifdef TMP_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

#ifdef TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

    hIvasDec->st_ivas->flushing = 1;

#endif
@@ -4153,7 +4153,7 @@ ivas_error IVAS_DEC_Flush( 
        *nSamplesFlushed = 0;

    }



#ifdef TMP_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

#ifdef TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

    hIvasDec->st_ivas->flushing = 0;

#endif