Commit 6001b7ae authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

fix for 5_1_4 to 5_1_2 downmix matrix

parent d87e63eb

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ 


#define REFACTOR_REVERB_INIT_ADD_CFG_CHECKS             /* Simplify and improve reverb initialization + add range checks on config parameter values */ 



#define FIX_I54_LS_DMX                                  /* FhG: fix incorrect downmix matrix for 5_1_4 to 5_1_2 */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_dec/ivas_rom_dec.c

+13 −0
Original line number Diff line number Diff line
@@ -620,6 +620,18 @@ const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp14[] = 
    /* First row indicates the number of non-zero elements */

    {10, 0.0f},

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

#ifdef FIX_I54_LS_DMX

    {0,  1.000000000f},

    {9,  1.000000000f},

    {18, 1.000000000f},

    {27, 1.000000000f},

    {36, 1.000000000f},

    {45, 1.000000000f},

    {54, 1.000000000f},

    {63, 1.000000000f},

    {68, 0.849999964f},

    {77, 0.849999964f},

#else

    {0,  1.000000000f},

    {11, 1.000000000f},

    {22, 1.000000000f},
@@ -630,6 +642,7 @@ const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp14[] = 
    {59, 0.849999964f},

    {66, 1.000000000f},

    {77, 1.000000000f},

#endif

};



const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp6[] =