Commit 22f5dc16 authored by fotopoulou's avatar fotopoulou
Browse files

fix mapping to cpe channels

parent a748bfe6

lib_dec/ivas_mct_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -286,7 +286,11 @@ ivas_error ivas_mct_dec( 
#endif

    }

    /* move channels after LFE to correct output for multi-channel MCT */

#ifdef MC_PARAMUPMIX_MODE

    if ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) )

#else

    if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )

#endif

    {

        float tmp[L_FRAME48k];

lib_enc/ivas_mct_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -116,7 +116,11 @@ static void map_input_to_cpe_channels( 
        pdata[i] = data[n];

        i++;

    }

#ifdef MC_PARAMUPMIX_MODE

    if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) )

#else

    if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )

#endif

    {

        for ( n = LFE_CHANNEL + 1; n < st_ivas->nchan_transport; n++ )

        {