Commit 1827f9c7 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept NONBE_FIX_855_JBM_FLUSH_OFFSET

parent c693b7cb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ 
#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#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  */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

lib_dec/ivas_jbm_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -1577,11 +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 NONBE_FIX_855_JBM_FLUSH_OFFSET

        hTcBuffer->n_samples_rendered = 0;

#else

        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;

#endif



        for ( ch_idx = 0; ch_idx < MAX_CICP_CHANNELS; ch_idx++ )

        {
@@ -1733,9 +1729,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        {

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

        }

#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET

        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;

#endif

    }



    /* update global combined orientation start index */