Commit e16558d9 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1173_ref_Resolve_OSBA_decoder_crash_with_planar_SBA_input' into 'float-pc' 

patched MR1226 into ref.

See merge request !962
parents 5d68b4d8 8dd2d41a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ 
#define NONBE_FIX_855_JBM_FLUSH_OFFSET                  /* FhG: issue #855: add missing switch here for the code in JBM flushing  */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -2101,7 +2101,11 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
        {

            num_tc = CPE_CHANNELS;

        }

#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA

        if ( num_tc == 3 )

#else

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

#endif

        {

            num_tc++;

        }