Commit 2fd2cf58 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1172_ref_CR_FIX_JBM_FLUSH_OFFSET_switches' into 'float-pc' 

patched merge request MR1251 [Non-BE] Resolve "CR_FIX_JBM_FLUSH_OFFSET switch leftovers" into ref.

See merge request !956
parents 23f1ecad bd55924f

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif



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



/* #################### End BASOP porting switches ############################ */



/* clang-format on */

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1577,7 +1577,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;
@@ -1733,7 +1733,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

    }