Commit 85dbab9f authored by vasilache's avatar vasilache
Browse files

fix 1305

parent 0735f93e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -172,4 +172,5 @@ 
#define DOT_PROD_CHOLESKY_64BIT                 /* FhG: Issue 1323, optimized 64 bit implementation of dot_product_cholesky() */

#define OPT_BASOP_ADD_v1                        /* optimizations to avoid usage of BASOP_Util_Add_MantExp */

#define FIX_ISSUE_1327                          /* Ittiam: Fix for issue 1327: Glitch when stereo is switching from TD to FD*/

#define FIX_1305_AUDIBLE_ARTIFACT_OSBA          /* Nokia: Fix for issue 1305, LSF codebook correction */

#endif

lib_com/rom_com.c

+331 −4

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/rom_com.h

+10 −5
Original line number Diff line number Diff line
@@ -543,8 +543,10 @@ extern const Word16 *const lsf_codebook[2][2][TCXLPC_NUMSTAGES]; /* 14Q1*1.28 */ 
extern const Word16 lsf_numbits[TCXLPC_NUMSTAGES];               // Q0

extern const Word16 lsf_dims_ivas[TCXLPC_NUMSTAGES];             // Q0

extern const Word16 lsf_offs_ivas[TCXLPC_NUMSTAGES];             // Q0

#ifndef FIX_1305_AUDIBLE_ARTIFACT_OSBA

extern const Word16 lsf_dims[TCXLPC_NUMSTAGES]; // Q0

extern const Word16 lsf_offs[TCXLPC_NUMSTAGES]; // Q0

#endif



extern const Word16 dico_lsf_abs_8b[]; /* 14Q1*1.28 */
@@ -571,8 +573,11 @@ extern const Word16 lsf_ind_cdk_wb_vc_stg4[]; /* 14Q1*1.28 */ 
extern const Word16 *const lsf_ind_codebook[2][2][TCXLPC_IND_NUMSTAGES]; /* 14Q1*1.28 */

extern const Word16 lsf_ind_numbits[TCXLPC_IND_NUMSTAGES];               // Q0

extern const Word16 lsf_ind_dims_ivas[TCXLPC_IND_NUMSTAGES];             // Q0

#ifndef FIX_1305_AUDIBLE_ARTIFACT_OSBA

extern const Word16 lsf_ind_dims[TCXLPC_IND_NUMSTAGES]; // Q0

#endif

extern const Word16 lsf_ind_offs[TCXLPC_IND_NUMSTAGES]; // Q0



extern const Word16 min_distance_thr[2][2]; /* 14Q1*1.28 */



typedef Word16 lsp_unw_triplet[3]; // Q14

lib_dec/lsf_msvq_ma_dec_fx.c

+14 −0
Original line number Diff line number Diff line
@@ -179,8 +179,13 @@ Word16 D_lsf_tcxlpc( 


    msvq_dec(

        lsf_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

        lsf_dims_ivas,

        lsf_offs_ivas,

#else

        lsf_dims,

        lsf_offs,

#endif

        TCXLPC_NUMSTAGES,

        M,

        M,
@@ -202,7 +207,11 @@ Word16 D_lsf_tcxlpc( 
    {

        msvq_dec(

            lsf_ind_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

            lsf_ind_dims_ivas,

#else

            lsf_ind_dims,

#endif

            lsf_ind_offs,

            TCXLPC_IND_NUMSTAGES,

            M,
@@ -281,8 +290,13 @@ Word16 dec_lsf_tcxlpc( 
    /* Decode independent lsf */

    msvq_dec(

        lsf_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

        lsf_dims_ivas,

        lsf_offs_ivas,

#else

        lsf_dims,

        lsf_offs,

#endif

        TCXLPC_NUMSTAGES,

        M,

        M,

lib_enc/lsf_msvq_ma_enc_fx.c

+36 −0
Original line number Diff line number Diff line
@@ -552,8 +552,13 @@ Word16 Q_lsf_tcxlpc_fx( 


    msvq_enc_fx(

        lsf_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

        lsf_dims_ivas,

        lsf_offs_ivas,

#else

        lsf_dims,

        lsf_offs,

#endif

        lsf,

        lsf_numlevels,

        kMaxC,
@@ -564,8 +569,13 @@ Word16 Q_lsf_tcxlpc_fx( 
        indices + NumIndices );

    msvq_dec(

        lsf_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

        lsf_dims_ivas,

        lsf_offs_ivas,

#else

        lsf_dims,

        lsf_offs,

#endif

        TCXLPC_NUMSTAGES,

        lpcorder,

        lpcorder,
@@ -595,7 +605,11 @@ Word16 Q_lsf_tcxlpc_fx( 
    /* Quantize using extra stage(s) */

    msvq_enc_fx(

        lsf_ind_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

        lsf_ind_dims_ivas,

#else

        lsf_ind_dims,

#endif

        lsf_ind_offs,

        lsf_rem,

        lsf_ind_numlevels,
@@ -611,7 +625,11 @@ Word16 Q_lsf_tcxlpc_fx( 
        /* Decode */

        msvq_dec(

            lsf_ind_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

            lsf_ind_dims_ivas,

#else

            lsf_ind_dims,

#endif

            lsf_ind_offs,

            TCXLPC_IND_NUMSTAGES,

            lpcorder,
@@ -706,8 +724,13 @@ Word16 Q_lsf_tcxlpc_ivas_fx( 


    msvq_enc_fx(

        lsf_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

        lsf_dims_ivas,

        lsf_offs_ivas,

#else

        lsf_dims,

        lsf_offs,

#endif

        lsf,

        lsf_numlevels,

        kMaxC,
@@ -718,8 +741,13 @@ Word16 Q_lsf_tcxlpc_ivas_fx( 
        indices + NumIndices );

    msvq_dec(

        lsf_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

        lsf_dims_ivas,

        lsf_offs_ivas,

#else

        lsf_dims,

        lsf_offs,

#endif

        TCXLPC_NUMSTAGES,

        lpcorder,

        lpcorder,
@@ -750,7 +778,11 @@ Word16 Q_lsf_tcxlpc_ivas_fx( 
    /* Quantize using extra stage(s) */

    msvq_enc_fx(

        lsf_ind_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

        lsf_ind_dims_ivas,

#else

        lsf_ind_dims,

#endif

        lsf_ind_offs,

        lsf_rem,

        lsf_ind_numlevels,
@@ -766,7 +798,11 @@ Word16 Q_lsf_tcxlpc_ivas_fx( 
        /* Decode */

        msvq_dec(

            lsf_ind_codebook[narrowband][cdk],

#ifdef FIX_1305_AUDIBLE_ARTIFACT_OSBA

            lsf_ind_dims_ivas,

#else

            lsf_ind_dims,

#endif

            lsf_ind_offs,

            TCXLPC_IND_NUMSTAGES,

            lpcorder,