Commit 0b8342c6 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '854-mismatch-of-definition-and-declaration-of-output-signal-in-ivas_core_dec' into 'main'

Resolve "Mismatch of definition and declaration of output signal in ivas_core_dec()"

See merge request !1159
parents c649e5f2 2261cd34

lib_com/ivas_prot.h

+28 −2
Original line number Diff line number Diff line
@@ -430,6 +430,26 @@ ivas_error ivas_core_enc( 
    CPE_ENC_HANDLE hCPE,                                                     /* i/o: CPE encoder structure                   */

    MCT_ENC_HANDLE hMCT,                                                     /* i/o: MCT encoder structure                   */

    const int16_t n_CoreChannels,                                            /* i  : number of core channels to be coded     */

#ifdef FIX_854_ARRAY_SIZE_MISMATCH

    float old_inp_12k8[][L_INP_12k8],                            /* i  : buffer of old input signal              */

    float old_inp_16k[][L_INP],                                  /* i  : buffer of old input signal              */

    float ener[],                                                /* i  : residual energy from Levinson-Durbin    */

    float A[][NB_SUBFR16k * ( M + 1 )],                          /* i  : A(z) unquantized for the 4 subframes    */

    float Aw[][NB_SUBFR16k * ( M + 1 )],                         /* i  : weighted A(z) unquantized for subframes */

    float epsP[][M + 1],                                         /* i  : LP prediction errors                    */

    float lsp_new[][M],                                          /* i  : LSPs at the end of the frame            */

    float lsp_mid[][M],                                          /* i  : LSPs in the middle of the frame         */

    const int16_t vad_hover_flag[],                              /* i  : VAD hanglover flag                      */

    int16_t attack_flag[],                                       /* i  : attack flag (GSC or TC)                 */

    float realBuffer[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer                             */

    float imagBuffer[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer                             */

    float old_wsp[][L_WSP],                                      /* i  : weighted input signal buffer            */

    const int16_t loc_harm[],                                    /* i  : harmonicity flag                        */

    const float cor_map_sum[],                                   /* i  : speech/music clasif. parameter          */

    const int16_t vad_flag_dtx[],                                /* i  : HE-SAD flag with additional DTX HO      */

    float enerBuffer[][CLDFB_NO_CHANNELS_MAX],                   /* i  : energy buffer                           */

    float fft_buff[][2 * L_FFT],                                 /* i  : FFT buffer                              */

#else

    float old_inp_12k8[CPE_CHANNELS][L_INP_12k8],                            /* i  : buffer of old input signal              */

    float old_inp_16k[CPE_CHANNELS][L_INP],                                  /* i  : buffer of old input signal              */

    float ener[CPE_CHANNELS],                                                /* i  : residual energy from Levinson-Durbin    */
@@ -448,6 +468,7 @@ ivas_error ivas_core_enc( 
    const int16_t vad_flag_dtx[CPE_CHANNELS],                                /* i  : HE-SAD flag with additional DTX HO      */

    float enerBuffer[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX],                   /* i  : energy buffer                           */

    float fft_buff[CPE_CHANNELS][2 * L_FFT],                                 /* i  : FFT buffer                              */

#endif

    const int16_t tdm_SM_flag,                                               /* i  : channel combination scheme flag         */

    const int16_t ivas_format,                                               /* i  : IVAS format                             */

    const int16_t flag_16k_smc                                               /* i  : flag to indicate if the OL SMC is run at 16 kHz */
@@ -459,8 +480,13 @@ ivas_error ivas_core_dec( 
    CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure                   */

    MCT_DEC_HANDLE hMCT,                                        /* i/o: MCT decoder structure                   */

    const int16_t n_channels,                                   /* i  : number of channels to be decoded        */

#ifdef FIX_854_ARRAY_SIZE_MISMATCH

    float *output[],                                            /* o  : output synthesis signal                 */

    float outputHB[][L_FRAME48k],                               /* o  : output HB synthesis signal              */

#else

    float *output[CPE_CHANNELS],                                /* o  : output synthesis signal                 */

    float outputHB[CPE_CHANNELS][L_FRAME48k],                   /* o  : output HB synthesis signal              */

#endif

    float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX],                /* o  : DFT buffers                             */

    const int16_t sba_dirac_stereo_flag                         /* i  : signal stereo output for SBA DirAC      */

);

lib_com/options.h

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


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT*/                    /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_854_ARRAY_SIZE_MISMATCH                     /* VA: issue 854: correct the mismatch between definition and declaration of `ivas_core_dec() */

#define FIX_785_REMOVE_DEAD_CODE                        /* VA: issue 785: remove dead code */

lib_dec/ivas_core_dec.c

+12 −7
Original line number Diff line number Diff line
@@ -60,8 +60,13 @@ ivas_error ivas_core_dec( 
    CPE_DEC_HANDLE hCPE,      /* i/o: CPE decoder structure              */

    MCT_DEC_HANDLE hMCT,      /* i/o: MCT decoder structure              */

    const int16_t n_channels, /* i  : number of channels to be decoded   */

#ifdef FIX_854_ARRAY_SIZE_MISMATCH

    float *output[],              /* o  : output synthesis signal            */

    float hb_synth[][L_FRAME48k], /* o  : output HB synthesis signal         */

#else

    float *output[L_FRAME48k],                /* o  : output synthesis signal            */

    float hb_synth[CPE_CHANNELS][L_FRAME48k], /* o  : output HB synthesis signal         */

#endif

    float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o  : DFT buffers                        */

    const int16_t sba_dirac_stereo_flag          /* i  : signal stereo output for SBA DirAC */

)

lib_enc/ivas_core_enc.c

+28 −7
Original line number Diff line number Diff line
@@ -59,6 +59,26 @@ ivas_error ivas_core_enc( 
    CPE_ENC_HANDLE hCPE,          /* i/o: CPE encoder structure                   */

    MCT_ENC_HANDLE hMCT,          /* i/o: MCT encoder structure                   */

    const int16_t n_CoreChannels, /* i  : number of core channels to be coded     */

#ifdef FIX_854_ARRAY_SIZE_MISMATCH

    float old_inp_12k8[][L_INP_12k8],                            /* i  : buffer of old input signal              */

    float old_inp_16k[][L_INP],                                  /* i  : buffer of old input signal              */

    float ener[],                                                /* i  : residual energy from Levinson-Durbin    */

    float A[][NB_SUBFR16k * ( M + 1 )],                          /* i  : A(z) unquantized for the 4 subframes    */

    float Aw[][NB_SUBFR16k * ( M + 1 )],                         /* i  : weighted A(z) unquantized for subframes */

    float epsP[][M + 1],                                         /* i  : LP prediction errors                    */

    float lsp_new[][M],                                          /* i  : LSPs at the end of the frame            */

    float lsp_mid[][M],                                          /* i  : LSPs in the middle of the frame         */

    const int16_t vad_hover_flag[],                              /* i  : VAD hanglover flag                      */

    int16_t attack_flag[],                                       /* i  : attack flag (GSC or TC)                 */

    float realBuffer[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer                             */

    float imagBuffer[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer                             */

    float old_wsp[][L_WSP],                                      /* i  : weighted input signal buffer            */

    const int16_t loc_harm[],                                    /* i  : harmonicity flag                        */

    const float cor_map_sum[],                                   /* i  : speech/music clasif. parameter          */

    const int16_t vad_flag_dtx[],                                /* i  : HE-SAD flag with additional DTX HO      */

    float enerBuffer[][CLDFB_NO_CHANNELS_MAX],                   /* i  : energy buffer                           */

    float fft_buff[][2 * L_FFT],                                 /* i  : FFT buffer                              */

#else

    float old_inp_12k8[CPE_CHANNELS][L_INP_12k8],                            /* i  : buffer of old input signal              */

    float old_inp_16k[CPE_CHANNELS][L_INP],                                  /* i  : buffer of old input signal              */

    float ener[CPE_CHANNELS],                                                /* i  : residual energy from Levinson-Durbin    */
@@ -77,7 +97,8 @@ ivas_error ivas_core_enc( 
    const int16_t vad_flag_dtx[CPE_CHANNELS],                                /* i  : HE-SAD flag with additional DTX HO      */

    float enerBuffer[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX],                   /* i  : energy buffer                           */

    float fft_buff[CPE_CHANNELS][2 * L_FFT],                                 /* i  : FFT buffer                              */

    const int16_t tdm_SM_or_LRTD_Pri,                                        /* i  : channel combination scheme flag in TD stereo OR LRTD primary channel */

#endif

    const int16_t tdm_SM_or_LRTD_Pri, /* i  : channel combination scheme flag         */

    const int16_t ivas_format,        /* i  : IVAS format                             */

    const int16_t flag_16k_smc        /* i  : flag to indicate if the OL SMC is run at 16 kHz */

)