Commit c6da3100 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

fix another incorrect matrix for 5_1_2 to 7_1 conversion (indices should be... 

fix another incorrect matrix for 5_1_2 to 7_1 conversion (indices should be different because of different shape)
parent a788f0da

lib_dec/ivas_rom_dec.c

+21 −0
Original line number Diff line number Diff line
@@ -580,6 +580,23 @@ const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp6[] = 
    {43, 0.849999964f}

};



#ifdef FIX_I54_LS_CONVERSION

const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp12[] =

{

    /* First row indicates the number of non-zero elements */

    {8, 0.0f},

    /* Index of non-zero element, value of non-zero element*/

    {0,  1.000000000f},

    {9,  1.000000000f},

    {18, 1.000000000f},

    {27, 1.000000000f},

    {36, 1.000000000f},

    {45, 1.000000000f},

    {48, 0.849999964f},

    {57, 0.849999964f}

};

#endif



const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp6[] =

{

    /* First row indicates the number of non-zero elements */
@@ -832,7 +849,11 @@ const LS_CONVERSION_MAPPING ls_conversion_mapping[LS_SETUP_CONVERSION_NUM_MAPPIN 
    {AUDIO_CONFIG_7_1,   AUDIO_CONFIG_5_1,   ls_conversion_cicp12_cicp6},



    {AUDIO_CONFIG_5_1_2, AUDIO_CONFIG_5_1,   ls_conversion_cicp14_cicp6},

#ifdef FIX_I54_LS_CONVERSION

    {AUDIO_CONFIG_5_1_2, AUDIO_CONFIG_7_1,   ls_conversion_cicp14_cicp12},

#else

    {AUDIO_CONFIG_5_1_2, AUDIO_CONFIG_7_1,   ls_conversion_cicp14_cicp6},

#endif



    {AUDIO_CONFIG_5_1_4, AUDIO_CONFIG_5_1,   ls_conversion_cicp16_cicp6},

    {AUDIO_CONFIG_5_1_4, AUDIO_CONFIG_7_1,   ls_conversion_cicp16_cicp12},

lib_dec/ivas_rom_dec.h

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ extern const float ls_conversion_cicpX_stereo[12][2]; 
extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp6[];

extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp6[];

extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp6[];

#ifdef FIX_I54_LS_CONVERSION

extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp12[];

#endif

extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp6[];

extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp14[];

extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp6[];