Commit 6b78b269 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'main' into split_rendering_masa_and_mc_fixes

parents bf22037f b260a579

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
#define FIX_613_DIRAC_NULL_PTR_USAN                     /* Nokia: Issue #613: USAN in DirAC decoder setup */



#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */



#define FIX_653_BUG_IN_SKIP_MATRIX                      /* Dlb: fix for issue #653, bug in the ivas_spar_get_skip_mat function*/





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

lib_dec/ivas_spar_decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -984,7 +984,11 @@ static void ivas_spar_get_skip_mat( 
                {

                    for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ )

                    {

#ifndef FIX_653_BUG_IN_SKIP_MATRIX

                        if ( hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band + i_ts * MAX_PARAM_SPATIAL_SUBFRAMES] != 0.0f )

#else

                        if ( hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band + i_ts * IVAS_MAX_NUM_BANDS] != 0.0f )

#endif

                        {

                            skip_flag = 0;

                            break;