Commit fc7d1ae6 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'main' into b_20230817_jbm-for-osba

parents 90493445 0ec6c4d1

apps/decoder.c

+8 −0
Original line number Diff line number Diff line
@@ -2474,10 +2474,18 @@ static ivas_error decodeG192( 
        if ( vec_pos_update == 0 )

        {

            update_wmops();

#ifdef FIX_RAM_COUNTING_5MS_RENDERING

            update_mem();

#ifdef MEM_COUNT_DETAILS

            export_mem( "mem_analysis.csv" );

#endif

#endif

        }

#ifndef FIX_RAM_COUNTING_5MS_RENDERING

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

#endif

#endif

    }

lib_com/options.h

+10 −5
Original line number Diff line number Diff line
@@ -162,6 +162,10 @@ 
#define FIX_COMBINED_FORMATS_ISM_GAINS



#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */



#define FIX_RAM_COUNTING_5MS_RENDERING                  /* FhG: fix for correct RAM reporting with 5ms rendering */





/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */
@@ -178,10 +182,11 @@ 


#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */

#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/

#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/

#define NONBE_FIX_729_ASAN_2ISM_ACELP                         /* VA: issue 729: fix ASAN ACELP errors with 2 ISM coding using LTV */

#define NONBE_FIX_694_OMASA_ACELP                             /* Nokia: Issue #694: OMASA crash in ACELP with extreme item */

#define NONBE_FIX_770_PLANAR_SBA_JBM                          /* FhG  : Issue #770: Crash in planar FOA decoding with JBM caused by uninitialized value */

#define NONBE_FIX_760_COHERENCE_MASA                          /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */

#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                      /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/



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

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -2026,12 +2026,12 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
        if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            if (

#ifndef FIX_PLANAR_SBA_JBM_RS

#ifndef NONBE_FIX_770_PLANAR_SBA_JBM

                ( st_ivas->sba_planar && num_tc >= 3 ) ||

                (

#endif

                    num_tc == 3

#ifndef FIX_PLANAR_SBA_JBM_RS

#ifndef NONBE_FIX_770_PLANAR_SBA_JBM

                    )

#endif

            )