Commit 248d09ee authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_I54_LS_CONVERSION

parent 5e73fea8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 




#define DIRAC_DRCT_GAIN_TUNING                          /* issue 64: tuning of DirAC energy-compensation gains */

#define FIX_I54_LS_CONVERSION                           /* FhG: fix incorrect downmix matrix for 5_1_4 to 5_1_2 and upmix matrix for 7_1 to 7_1_4 */

#define FIX_I25_FBE_FB_BITS                             /* issue 25: properly skip reading of TBE FB bits when decoder output sampling rate is not 48 kHz */

#define ORDER_BITS_ADDITION                             /* issue 14: Transmit SBA order and planar bits at all bitrates */

lib_dec/ivas_rom_dec.c

+0 −25
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ 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 */
@@ -595,7 +594,6 @@ const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp12[] = 
    {48, 0.849999964f},

    {57, 0.849999964f}

};

#endif



const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp6[] =

{
@@ -637,7 +635,6 @@ 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_CONVERSION

    {0,  1.000000000f},

    {9,  1.000000000f},

    {18, 1.000000000f},
@@ -648,18 +645,6 @@ const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp14[] = 
    {63, 1.000000000f},

    {68, 0.849999964f},

    {77, 0.849999964f},

#else

    {0,  1.000000000f},

    {11, 1.000000000f},

    {22, 1.000000000f},

    {33, 1.000000000f},

    {44, 1.000000000f},

    {48, 0.849999964f},

    {55, 1.000000000f},

    {59, 0.849999964f},

    {66, 1.000000000f},

    {77, 1.000000000f},

#endif

};



const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp6[] =
@@ -777,7 +762,6 @@ const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp16[] = 
    {75, 1.0f}

};



#ifdef FIX_I54_LS_CONVERSION

const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp19[] =

{

    /* First row indicates the number of non-zero elements */
@@ -792,7 +776,6 @@ const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp19[] = 
    {76, 1.0f},

    {89, 1.0f}

};

#endif



const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp19[] =

{
@@ -849,11 +832,7 @@ 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},
@@ -878,11 +857,7 @@ const LS_CONVERSION_MAPPING ls_conversion_mapping[LS_SETUP_CONVERSION_NUM_MAPPIN 


    {AUDIO_CONFIG_7_1, AUDIO_CONFIG_5_1_2, ls_conversion_cicp12_cicp14},

    {AUDIO_CONFIG_7_1, AUDIO_CONFIG_5_1_4, ls_conversion_cicp12_cicp16},

#ifdef FIX_I54_LS_CONVERSION

    {AUDIO_CONFIG_7_1, AUDIO_CONFIG_7_1_4, ls_conversion_cicp12_cicp19},

#else

    {AUDIO_CONFIG_7_1, AUDIO_CONFIG_7_1_4, NULL},

#endif



    {AUDIO_CONFIG_5_1_2, AUDIO_CONFIG_5_1_4, NULL},

    {AUDIO_CONFIG_5_1_2, AUDIO_CONFIG_7_1_4, ls_conversion_cicp14_cicp19},

lib_dec/ivas_rom_dec.h

+0 −4
Original line number Diff line number Diff line
@@ -120,9 +120,7 @@ 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[];
@@ -133,9 +131,7 @@ extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp16[]; 
/* Upmix matrices */

extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp14[];

extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp16[];

#ifdef FIX_I54_LS_CONVERSION

extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp19[];

#endif

extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp19[];

extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp19[];