Commit 1ac5c3fc authored by vaclav's avatar vaclav
Browse files

Merge branch '1428-port-basop-issue-2179-jbm-16khz-decoding-issue' into 'main' 

[non-BE] Port BASOP issue 2179 - JBM 16kHz decoding bug

See merge request !2341
parents 2b722909 bde427df

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ 
#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS    /* FhG: fix non-BE in DFT stereo encoder between optimization levels */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2  /* FhG: fix even more non-BEnesses */

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

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

#define NONBE_1380_OMASA_BUILD_DIFF                     /* Nokia: Fix for issue #1380: Large differences in OMASA output between Debug and Release builds */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_jbm_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -791,6 +791,9 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
            for ( ch = 0; ch < max( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full ); ch++ )

            {

                hTcBuffer->tc[ch] = &hTcBuffer->tc_buffer[offset];

#ifdef FIX_1330_JBM_MEMORY_FIX

                st_ivas->p_output_f[ch] = hTcBuffer->tc[ch];

#endif

                offset += len_offset;

            }

        }