Commit 061cc32a authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'ivas_stereo_tcx_core' into 'main' 

stereo_tcx_core_dec updates

See merge request !226
parents 6aad3441 ce6edaf7

lib_com/float_to_fix_ops.c

+1185 −2

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ void stereo_tcx_core_enc( 
    const int16_t vad_hover_flag                                /* i  : VAD hangover flag                       */

);



#ifndef IVAS_FLOAT_FIXED

void stereo_tcx_core_dec(

    Decoder_State *st,                                          /* i/o: decoder state structure                 */

    const FRAME_MODE frameMode,                                 /* i  : Decoder frame mode                      */
@@ -570,6 +571,7 @@ void stereo_tcx_core_dec( 
    const int16_t nchan_out,                                    /* i  : number of output channels               */

    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                             */

);

#endif // !IVAS_FLOAT_FIXED



void stereo_tcx_init_dec(

    Decoder_State *st,                                          /* i/o: decoder state structure                 */

lib_com/ivas_prot_fx.h

+18 −0
Original line number Diff line number Diff line
@@ -1733,4 +1733,22 @@ UWord32 ivas_syn_output_fx( 
    const Word16 n_channels,   /* i  : number of output channels           */

    Word16 *synth_out          /* o  : integer 16 bits synthesis signal    */

);



#ifdef IVAS_FLOAT_FIXED

void stereo_tcx_core_dec_fx(

    Decoder_State *st,                   /* i/o: decoder state structure            */

    const FRAME_MODE frameMode,          /* i  : Decoder frame mode                 */

    Word16 *signal_out,                  /* o  : synthesis @internal_Fs, Q0             */

    Word16 *signal_outFB,                /* o  : synthesis @output_Fs, Q0               */

    Word32 pitch_buf[],                  /* o  : floating pitch for each subframe, Q6   */

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

    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle           */

    const Word16 last_element_mode,      /* i  : last element mode                  */

    const Word16 flag_sec_CNA,           /* i  : CNA flag for secondary channel     */

    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : Stereo CNG handle                  */

    const Word16 nchan_out,              /* i  : number of output channels          */

    const IVAS_FORMAT ivas_format        /* i  : IVAS format                        */

);

#endif // IVAS_FLOAT_FIXED



#endif

lib_com/prot_fx2.h

+9 −0
Original line number Diff line number Diff line
@@ -68,6 +68,15 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed( 
    Word16 tofix,

    Word16 last_element_mode );



void stereo_tcx_dec_mode_switch_reconf_To_fixed_2(

    Decoder_State *st,

    Word16 tofix,

    Word16 last_element_mode);



void fixed_to_float_stereo_tcx_core_dec(

  Decoder_State *st,

  float *signal_out

);

// Float to Word32

Word32 float_to_fix( float number, Word32 Q );

// Word32 to Float

lib_dec/TonalComponentDetection_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,8 @@ static void findTonalComponents( 
                        }

                        /* Side lobe increase must be 2 times smaller than the decrease to the foot */

                        /* Eq. to 2.0f*powerSpectrum[lowerIdx-1]/powerSpectrum[lowerIdx] > powerSpectrum[lowerIdx]/powerSpectrum[j] */

                        IF (GT_32(  Mpy_32_32(L_shl(powerSpectrum[upperIdx+1], 1), powerSpectrum[j]),    Mpy_32_32(powerSpectrum[upperIdx], powerSpectrum[upperIdx])))

                        /*IF (GT_32(  Mpy_32_32(L_shl(powerSpectrum[upperIdx+1], 1), powerSpectrum[j]),    Mpy_32_32(powerSpectrum[upperIdx], powerSpectrum[upperIdx])))*/

                        IF( GT_64( W_mult_32_32( L_shl( powerSpectrum[upperIdx + 1], 1 ), powerSpectrum[j] ), W_mult_32_32( powerSpectrum[upperIdx], powerSpectrum[upperIdx] ) ) )

                        {

                            BREAK;

                        }