Commit 709339e8 authored by bayers's avatar bayers
Browse files

temp fix for #846, fix MASA DTX with first frame being a SID frame

parent bcd91693

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ 
#define FIX_XXX_JBM_PARAMUPMIX_HEADROT

#define FIX_XXX_MC_RS_BINAURAL

#define FIX_XXX_PMC_RS

#define FIX_XXX_JBM_MASA_SIDSTART

#endif



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

lib_dec/ivas_jbm_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -2264,7 +2264,11 @@ 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 && 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 &&

#ifdef FIX_XXX_JBM_MASA_SIDSTART

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

#endif

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

        {

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

        }