Commit 01ecfff2 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into... 

Merge branch 'main' into float-1516-split-rendering-rtp-dump-output-file-strlen-needed-instead-of-sizeof
parents 2e5f3bd5 7dcf3817

lib_com/cldfb_evs_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -996,10 +996,8 @@ ivas_error openCldfb( 
        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );

    }



#ifdef FIX_2319_CLDFB_INIT_FLAGS

    hs->flags = 0;

    move16();

#endif



    hs->type = type;

    move16();

lib_com/gs_noisefill_fx.c

+0 −24
Original line number Diff line number Diff line
@@ -751,19 +751,11 @@ void highband_exc_dct_in_fx( 
    test();

    IF( bfi || LT_32( core_brate, 6000 ) || ( LT_32( core_brate, 8600 ) && EQ_16( coder_type, UNVOICED ) ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 13107, MBANDS_GN ); /*0.4 in Q15 */

#else

        set16_fx( noisepb, 13107, last_bin ); /*0.4 in Q15 */

#endif

    }

    ELSE IF( EQ_16( GSC_IVAS_mode, 3 ) || ( GSC_IVAS_mode > 0 && EQ_16( GSC_noisy_speech, 1 ) ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 13107 /*0.4f*/, MBANDS_GN16k );

#else

        set16_fx( noisepb, 13107 /*0.4f*/, last_bin );

#endif

    }

    ELSE

    {
@@ -780,11 +772,7 @@ void highband_exc_dct_in_fx( 
    test();

    IF( GSC_IVAS_mode == 0 && GSC_noisy_speech && !bfi && LE_16( element_mode, IVAS_SCE ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 3277, MBANDS_GN );

#else

        set16_fx( noisepb, 3277, last_bin );

#endif

    }

    test();

    IF( LT_32( core_brate, 6000 ) && LE_16( coder_type, UNVOICED ) )
@@ -1150,19 +1138,11 @@ void highband_exc_dct_in_ivas_fx( 
    test();

    IF( bfi || LT_32( core_brate, 6000 ) || ( LT_32( core_brate, 8600 ) && EQ_16( coder_type, UNVOICED ) ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 13107, MBANDS_GN ); /*0.4 in Q15 */

#else

        set16_fx( noisepb, 13107, last_bin ); /*0.4 in Q15 */

#endif

    }

    ELSE IF( EQ_16( GSC_IVAS_mode, 3 ) || ( GSC_IVAS_mode > 0 && EQ_16( GSC_noisy_speech, 1 ) ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 13107 /*0.4f*/, MBANDS_GN16k );

#else

        set16_fx( noisepb, 13107 /*0.4f*/, last_bin );

#endif

    }

    ELSE

    {
@@ -1179,11 +1159,7 @@ void highband_exc_dct_in_ivas_fx( 


    IF( GSC_IVAS_mode == 0 && GSC_noisy_speech && !bfi && LE_16( element_mode, IVAS_SCE ) )

    {

#ifndef FIX_1478_UNINIT_ON_BFI

        set16_fx( noisepb, 3277, MBANDS_GN );

#else

        set16_fx( noisepb, 3277, last_bin );

#endif

    }



    test();

lib_com/ivas_prot_fx.h

+22 −11
Original line number Diff line number Diff line
@@ -1359,20 +1359,10 @@ void stereo_tcx_init_dec_fx( 


void stereo_icBWE_enc_fx(

    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                */

#ifdef REMOVE_SCALING_SHB_SPEECH

    const Word16 shb_speech_ref_fx16[],                         /* i  : SHB speech ref channel             Q0*/

    Word16 shb_speech_nonref_fx_16[],                           /* i/o: SHB speech non-ref channel         shb_speech_nonref_e*/

#else

    const Word32 shb_speech_ref_fx[],                           /* i  : SHB speech ref channel               */

    const Word16 shb_speech_ref_e,                              /* i  : SHB speech ref channel               */

    Word32 shb_speech_nonref_fx[],                              /* i/o: SHB speech non-ref channel           */

#endif

    Word16 shb_speech_nonref_e,                                 /* i/o: SHB speech non-ref channel           */

#ifdef REMOVE_SCALING_SHB_SPEECH

    const Word16 *voice_factors_fx                              /* i  : voicing factors                  Q15 */

#else

    const Word32 *voice_factors_fx                              /* i  : voicing factors                     Q31 */

#endif

);



void initMdctStereoDecData_fx(
@@ -1601,6 +1591,7 @@ void ivas_hq_core_dec_fx( 
    Word16 *Q_output 

);



#ifndef HARMONIZE_TBE

void ivas_HQ_FEC_Mem_update_fx(

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

    Word32 *t_audio_q_fx,                                       /*Q12*/
@@ -1616,6 +1607,7 @@ void ivas_HQ_FEC_Mem_update_fx( 
    Word16 hq_core_type,                                        /* i : normal or low-rate MDCT(HQ) core         */

    Word16 output_frame 

);

#endif

/* o  : Consumed bits  Q0 */

Word16 ivas_hq_classifier_dec_fx(                          

    Decoder_State *st_fx,                                       /* i/o: decoder state structure                 */
@@ -1865,6 +1857,7 @@ void stereoFdCngCoherence_fx( 
    Word16 fft_exp 

);



#ifndef HARMONIZE_TBE

void ivas_wb_tbe_dec_fx(

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

    const Word16 coder_type,                                    /* i  : coding type                             */
@@ -1893,7 +1886,7 @@ void GenShapedWBExcitation_ivas_fx( 
    const Word16 uv_flag,                                       /* i : unvoiced flag                            */

    const Word16 igf_flag 

);



#endif

/* o : Q_syn_hb*/

Word16 ivas_wb_bwe_dec_fx(

    Decoder_State *st_fx,                                       /* i/o: decoder state structure                 */
@@ -2060,19 +2053,37 @@ UWord32 ivas_syn_output_fx( 
    Word16 *synth_out                                           /* o  : integer 16 bits synthesis signal            */

);



#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

void ivas_buffer_interleaved_to_deinterleaved_fx(

    Word32 *audio_in,                                           /* i  : interleaved audio buffer                                */

    Word32 *audio_out[],                                        /* o  : pointers to each channel of deinterleaved audio buffer  */

    const Word16 n_channels,                                    /* i  : number of channels                                      */

    const Word16 frame_length                                   /* i  : frame length (one channel)                              */

);

#else

void ivas_buffer_interleaved_to_deinterleaved_fx(

    Word32 *audio,                                              /* i/o: audio buffer                                */

    const Word16 n_channels,                                    /* i  : number of channels                          */

    const Word16 frame_length,                                  /* i  : frame length (one channel)                  */

    const Word16 n_samp_full                                    /* i  : full frame length (one channel)             */

);

#endif



#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

void ivas_buffer_deinterleaved_to_interleaved_fx(

    Word32 *audio_in[],                                         /* i  : pointers to each channel of deinterleaved audio buffer  */

    Word32 *audio_out,                                          /* o  : interleaved audio buffer                                */

    const Word16 n_channels,                                    /* i  : number of channels                                      */

    const Word16 frame_length                                   /* i  : frame length (one channel)                              */

);

#else

void ivas_buffer_deinterleaved_to_interleaved_fx(

    Word32 *audio[],                                            /* i  : deinterleaved audio buffer                  */

    const Word16 n_channels,                                    /* i  : number of channels                          */

    const Word16 frame_length,                                  /* i  : frame length (one channel)                  */

    Word32 *audio_out                                           /* o  : interleaved audio buffer                    */

);

#endif



void stereo_tcx_core_dec_fx(

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

lib_com/ivas_rotation_com_fx.c

+16 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void Copy_Quat_fx( 




/*-------------------------------------------------------------------------

 * Scale_Quat_fx()

 * modify_Quat_q_fx()

 *

 * Quaternion q factor modification

 *------------------------------------------------------------------------*/
@@ -124,10 +124,18 @@ void modify_Quat_q_fx( 
    Word16 q_new                    /* i  : quaternion describing the rotation             */

)

{

#ifdef FIX_BASOP_2361_OTR

    Word16 shift = sub( q_new, in_quat->q_fact );

    out_quat->w_fx = L_shl_sat( in_quat->w_fx, shift ); // q_new

    out_quat->x_fx = L_shl_sat( in_quat->x_fx, shift ); // q_new

    out_quat->y_fx = L_shl_sat( in_quat->y_fx, shift ); // q_new

    out_quat->z_fx = L_shl_sat( in_quat->z_fx, shift ); // q_new

#else

    out_quat->w_fx = L_shl_sat( in_quat->w_fx, sub( q_new, in_quat->q_fact ) ); // q_new

    out_quat->x_fx = L_shl_sat( in_quat->x_fx, sub( q_new, in_quat->q_fact ) ); // q_new

    out_quat->y_fx = L_shl_sat( in_quat->y_fx, sub( q_new, in_quat->q_fact ) ); // q_new

    out_quat->z_fx = L_shl_sat( in_quat->z_fx, sub( q_new, in_quat->q_fact ) ); // q_new

#endif

    out_quat->q_fact = q_new;

    return;

}
@@ -147,12 +155,19 @@ void modify_Rmat_q_fx( 
)

{

    Word16 j, k;

#ifdef FIX_BASOP_2361_OTR

    Word16 shift = sub( q_new, q_cur );

#endif



    FOR( j = 0; j < 3; j++ )

    {

        FOR( k = 0; k < 3; k++ )

        {

#ifdef FIX_BASOP_2361_OTR

            Rmat_out[j][k] = L_shl( Rmat_in[j][k], shift );

#else

            Rmat_out[j][k] = L_shl( Rmat_in[j][k], sub( q_new, q_cur ) );

#endif

            move32();

        }

    }

lib_com/ivas_tools_fx.c

+66 −0
Original line number Diff line number Diff line
@@ -160,6 +160,38 @@ UWord32 ivas_syn_output_fx( 
 * Convert an interleaved buffer of audio channels to deinterleaved one

 *-------------------------------------------------------------------*/



#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

void ivas_buffer_interleaved_to_deinterleaved_fx(

    Word32 *audio_in,         /* i  : interleaved audio buffer                                */

    Word32 *audio_out[],      /* o  : pointers to each channel of deinterleaved audio buffer  */

    const Word16 n_channels,  /* i  : number of channels                                      */

    const Word16 frame_length /* i  : frame length (one channel)                              */

)

{

    Word16 ch, s;

    Word32 buffer[MAX_TRANSPORT_CHANNELS][MAX_JBM_L_FRAME48k]; /* temp buffer needed when "*audio_in" and "*audio_out[]" point to the same memory */



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( s = 0; s < frame_length; s++ )

        {

            buffer[ch][s] = audio_in[s * n_channels + ch];

            move32();

        }

    }



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( s = 0; s < frame_length; s++ )

        {

            audio_out[ch][s] = buffer[ch][s];

            move32();

        }

    }



    return;

}

#else

void ivas_buffer_interleaved_to_deinterleaved_fx(

    Word32 *audio,             /* i/o: audio buffer                    */

    const Word16 n_channels,   /* i  : number of channels              */
@@ -189,6 +221,7 @@ void ivas_buffer_interleaved_to_deinterleaved_fx( 


    return;

}

#endif





/*-------------------------------------------------------------------*
@@ -197,6 +230,38 @@ void ivas_buffer_interleaved_to_deinterleaved_fx( 
 * Convert a deinterleaved buffer of audio channels to interleaved one

 *-------------------------------------------------------------------*/



#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

void ivas_buffer_deinterleaved_to_interleaved_fx(

    Word32 *audio_in[],       /* i  : pointers to each channel of deinterleaved audio buffer  */

    Word32 *audio_out,        /* o  : interleaved audio buffer                                */

    const Word16 n_channels,  /* i  : number of channels                                      */

    const Word16 frame_length /* i  : frame length (one channel)                              */

)

{

    Word16 ch, s;

    Word32 buffer[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k]; /* temp buffer needed when "*audio_in[]" and "*audio_out" point to the same memory */



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( s = 0; s < frame_length; s++ )

        {

            buffer[ch][s] = audio_in[ch][s];

            move32();

        }

    }



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( s = 0; s < frame_length; s++ )

        {

            audio_out[s * n_channels + ch] = buffer[ch][s];

            move32();

        }

    }



    return;

}

#else

void ivas_buffer_deinterleaved_to_interleaved_fx(

    Word32 *audio[],           /* i/o: deinterleaved audio buffer      */

    const Word16 n_channels,   /* i  : number of channels              */
@@ -224,6 +289,7 @@ void ivas_buffer_deinterleaved_to_interleaved_fx( 


    return;

}

#endif





/*-------------------------------------------------------------------*