Commit 0efc2511 authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_846_JBM_MASA_SIDSTART

parent 3c598f99

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_846_JBM_MASA_SIDSTART                       /* FhG: Issue #846: fix JBM for MASA DTX when the first frame is a SID frame */

#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER                    /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */

#define NONBE_FIX_840_PARAMMC_RS                              /* FhG: Issue #840: Resolve "MC RS ParamMC hoa encoder wrongly set to zero" */

#define NONBE_FIX_826_JBM_MASA_CNA_CNG                        /* FhG: issue #826:  Resolve "JBM MASA: CNA and CNG not in sync with non-JBM decoding" */

lib_dec/ivas_jbm_dec.c

+1 −5
Original line number Diff line number Diff line
@@ -1945,11 +1945,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
        {

            num_tc = CPE_CHANNELS;

        }

        else if ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE && ( ivas_total_brate > IVAS_SID_5k2 || ( ivas_total_brate <= IVAS_SID_5k2 && st_ivas->nCPE > 0 &&

#ifdef NONBE_FIX_846_JBM_MASA_SIDSTART

                                                                                                                                              st_ivas->hCPE[0] != NULL &&

#endif

                                                                                                                                              st_ivas->hCPE[0]->nchan_out == 1 ) ) )

        else if ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE && ( ivas_total_brate > IVAS_SID_5k2 || ( ivas_total_brate <= IVAS_SID_5k2 && st_ivas->nCPE > 0 && st_ivas->hCPE[0] != NULL && st_ivas->hCPE[0]->nchan_out == 1 ) ) )

        {

            num_tc = 1; /* Only one channel transported */

        }