Commit eb6c67f4 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '2054-ref-mr2140-from-float-keep-tsm-memory-in-jbm-bitrate-switching-2' into 'ivas-float-update'

[non-BE] Port MR2140 from float to FLP-ref - Keep TSM memory in JBM bitrate switching 2

See merge request !2509
parents 35d3db79 3890d839

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
#define FIX_NCHAN_BUFFERS                               /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */

#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define JBM_MEMORY_OPT                                  /* VA: issue 916: optimization of RAM in the JBM decoder */

/*#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP*/           /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */

#define FIX_1330_JBM_MEMORY                             /* VA: issue 1330: memory savings in the JBM decoder */