Commit 99b8440f authored by bayers's avatar bayers
Browse files

reintroduce and rename a missing switch for a fix in the JBM flushing (fix for #855)

parent 3bab5d2b

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
#define NONBE_FIX_904_JBM_SBA_RS_FOA                          /* FhG: issue #904: fix JBM SBA RS to FOA decoding */

#define NONBE_FIX_898_ISM_BRATE_CRASH                         /* VA: issue 898: fix decoder crash in ISM bitrate switching with DTX and binaural output */

#define NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC                /* DLB: issue 862 : UBSAN: out-of-bound error in SPAR for OSBA bitrate switching with PLC*/



#define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */

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



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1706,7 +1706,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        hTcBuffer->n_samples_buffered = hTcBuffer->n_samples_granularity + n_samples_still_available;

        hTcBuffer->n_samples_available = 0;

        hTcBuffer->n_samples_flushed = n_samples_to_render;

#ifdef CR_FIX_JBM_FLUSH_OFFSET

#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET

        hTcBuffer->n_samples_rendered = 0;

#else

        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
@@ -1865,7 +1865,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        {

            return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );

        }

#ifdef CR_FIX_JBM_FLUSH_OFFSET

#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET

        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;

#endif

    }