Commit 3ac4d187 authored by vaclav's avatar vaclav
Browse files

- fix setting of "is_ism_flag" in CPE 

- activate ISM_FB
parent 7f6ff113

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ 
#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */

#define FIX_522_ISM_FIRST_SID                           /* VA: fix ISM decoder crash if first received frame is an SID */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

//#define ISM_FB                                          /* issue 556: change SWB to FB coding in 1ISM at 24.4 kbps */

#define ISM_FB                                          /* issue 556: change SWB to FB coding in 1ISM at 24.4 kbps */

#define FIX_558_PLC_DISCONT                             /* FhG: issue 558: fix discontinuities in DFT Stereo when switching from TCX concealment to ACELP */

#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

#define FIX_566_2DIR_MASA_384K                          /* Nokia: Issued 566:  Bugfix in 384k MASA metadata encoding of second direction */

lib_enc/ivas_cpe_enc.c

+7 −1
Original line number Diff line number Diff line
@@ -990,7 +990,13 @@ ivas_error create_cpe_enc( 
#ifdef IND_LIST_DYN

                                     st_ivas,

#endif

                                     n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK )

                                     n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0,

#ifdef MASA_AND_OBJECTS

                                     ISM_MODE_NONE

#else

                                     st_ivas->ism_mode

#endif

                                     ) ) != IVAS_ERR_OK )

        {

            return error;

        }