Commit 924b04b3 authored by vaclav's avatar vaclav
Browse files

Merge branch '2179-basop-non-be-difference-in-basop-of-be-port-376' into 'main' 

[non-BE] Non-BE difference in BASOP of BE port 376 to BASOP main

Closes #2179

See merge request !2503
parents 6c176696 c66e4854

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ 
#define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING         /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */

#define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */

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

#define FIX_1330_JBM_MEMORY_FIX                         /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */

#define FIX_1411_IGF_CRASH_BW_SWITCHING                 /* FhG: Fix for issue 1411: fixes crash that can happen for IGF with BW switching and DTX*/

#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG       /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */

#define NONBE_1344_REND_MASA_LOW_FS                     /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */

lib_dec/ivas_jbm_dec_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -1576,6 +1576,9 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx( 
            FOR( ch = 0; ch < s_max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ); ch++ )

            {

                hTcBuffer->tc_fx[ch] = &hTcBuffer->tc_buffer_fx[offset];

#ifdef FIX_1330_JBM_MEMORY_FIX

                st_ivas->p_output_fx[ch] = hTcBuffer->tc_fx[ch];

#endif

                offset = add( offset, len_offset );

            }

        }