Commit 388defee authored by det's avatar det
Browse files

merged MR1251 into basop.

parent 7847d456

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -101,5 +101,6 @@ 
#define FIX_1109_OPTIM_MCT_STEREO_IGF_DEC       /* FhG: optimize mctStereoIGF_dec_fx() */

#define FIX_1110_OPTIM_DIRAC_DECORR_PROC        /* FhG: optimize ivas_dirac_dec_decorr_process() */

#define FIX_1100_REMOVE_LPC_RESCALING           /* VA: Remove the rescaling of LPC coefficient to Q12 as residu and syn-filt are already taking care of it*/

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



#endif

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -2669,7 +2669,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        hTcBuffer->n_samples_buffered = add( 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;
@@ -2855,7 +2855,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        {

            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

    }