Commit 01319e9f authored by bayers's avatar bayers
Browse files

fix EVS decoding

parent ba524608

lib_com/ivas_prot.h

+7 −0
Original line number Diff line number Diff line
@@ -827,6 +827,13 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */

);



#ifdef API_5MS

void ivas_jbm_dec_copy_tc_no_tsm( 

    Decoder_Struct *st_ivas, 

    float *tc[], 

    const int16_t output_frame );

#endif



#ifdef FIX_470_MASA_JBM_EXT

void ivas_jbm_dec_get_md_map_even_spacing(

    const int16_t default_len,  /* i  : default frame length in metadata slots         */

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ static void ivas_jbm_dec_copy_masa_meta_to_buffer( Decoder_Struct *st_ivas ); 
static void ivas_jbm_masa_sf_to_slot_map( Decoder_Struct *st_ivas, const int16_t nCldfbTs );

#endif



#ifdef API_5MS

static void ivas_jbm_dec_copy_tc_no_tsm( Decoder_Struct *st_ivas, float *tc[], const int16_t output_frame );

#endif



/*--------------------------------------------------------------------------*

 * ivas_jbm_dec_tc()

 *

lib_dec/lib_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -3259,6 +3259,14 @@ static ivas_error evs_dec_main( 
        v_multc( output[0], mixer_left, output[0], nOutSamples );

    }





#ifdef API_5MS

    if ( !st_ivas->hDecoderConfig->tsm_active )

    {

        ivas_jbm_dec_copy_tc_no_tsm( st_ivas, p_output, nOutSamples );

    }

    else

#endif

    if ( floatBuf != NULL )

    {

        /* BE workaround */