Commit 844963d5 authored by vaclav's avatar vaclav
Browse files

rename the buffer name 'transport_channels_f' to 'p_data_f' to keep the buffer... 

rename the buffer name 'transport_channels_f' to 'p_data_f' to keep the buffer name consistent between functions calls and functions bodies.
parent 80e55a37

lib_com/ivas_prot.h

+3 −3
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ void ivas_ism_dec_digest_tc( 
void ivas_param_ism_dec_digest_tc(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nCldfbSlots,                                 /* i  : number of CLDFB slots in transport channels */

    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output  */

    float *p_data_f[]                                           /* i  : synthesized core-coder transport channels/DirAC output  */

);



void ivas_param_ism_dec_dequant_md(
@@ -1134,7 +1134,7 @@ void ivas_ism_param_dec_tc_gain_ajust( 
    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nSamples,                                    /* i  : number of samples to be compensate          */

    const uint16_t nFadeLength,                                 /* i  : length of the crossfade in samples          */

    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output  */

    float *p_data_f[]                                           /* i  : synthesized core-coder transport channels/DirAC output  */

);

#endif

void ivas_param_ism_dec_render(
@@ -3877,7 +3877,7 @@ void ivas_param_mc_dec_read_BS( 
void ivas_param_mc_dec_digest_tc(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                 */

    const uint8_t nCldfbSlots,                                  /* i  : number of CLDFB slots in transport channels         */

    float *transport_channels_f[]                               /* i/o: synthesized core-coder transport channels/DirAC output*/

    float *p_data_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output*/

);



void ivas_param_mc_dec_prepare_renderer(

lib_dec/ivas_ism_param_dec.c

+16 −16
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ void ivas_ism_dec_digest_tc( 
void ivas_param_ism_dec_digest_tc(

    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder handle                                       */

    const uint16_t nCldfbSlots, /* i  : number of CLDFB slots in transport channels               */

    float *transport_channels_f[] /* i/o: synthesized core-coder transport channels/DirAC output    */

    float *p_data_f[]           /* i/o: synthesized core-coder transport channels/DirAC output    */

)

{

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
@@ -837,12 +837,12 @@ void ivas_param_ism_dec_digest_tc( 
#endif



#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    ivas_ism_param_dec_tc_gain_adjust( st_ivas, output_frame, output_frame / 2, transport_channels_f );

    ivas_ism_param_dec_tc_gain_adjust( st_ivas, output_frame, output_frame / 2, p_data_f );

#else

    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {

        /*TODO : FhG to check*/

        ivas_ism_param_dec_tc_gain_ajust( st_ivas, output_frame, fade_len, transport_channels_f );

        ivas_ism_param_dec_tc_gain_ajust( st_ivas, output_frame, fade_len, p_data_f );

    }

#endif
@@ -852,7 +852,7 @@ void ivas_param_ism_dec_digest_tc( 
    {

        for ( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )

        {

            cldfbAnalysis_ts( &( transport_channels_f[ch][num_freq_bands * slot_idx] ),

            cldfbAnalysis_ts( &( p_data_f[ch][num_freq_bands * slot_idx] ),

                              &cldfb_real_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],

                              &cldfb_imag_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],

                              num_freq_bands, st_ivas->cldfbAnaDec[cldfb_ch] );
@@ -869,7 +869,7 @@ void ivas_param_ism_dec_digest_tc( 
                float RealBuffer[CLDFB_NO_CHANNELS_MAX];

                float ImagBuffer[CLDFB_NO_CHANNELS_MAX];



                cldfbAnalysis_ts( &( transport_channels_f[ch][hSpatParamRendCom->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hSpatParamRendCom->num_freq_bands, st_ivas->cldfbAnaDec[ch] );

                cldfbAnalysis_ts( &( p_data_f[ch][hSpatParamRendCom->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hSpatParamRendCom->num_freq_bands, st_ivas->cldfbAnaDec[ch] );

                mvr2r( RealBuffer, &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );

                mvr2r( ImagBuffer, &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );

            }
@@ -1050,7 +1050,7 @@ void ivas_ism_param_dec_tc_gain_ajust( 
    const uint16_t nSamples,    /* i  : number of samples to be compensate                    */

    const uint16_t nFadeLength, /* i  : length of the crossfade in samples                    */

#endif

    float *transport_channels_f[] /* i  : synthesized core-coder transport channels/DirAC output*/

    float *p_data_f[] /* i  : synthesized core-coder transport channels/DirAC output*/

)



{
@@ -1064,8 +1064,8 @@ void ivas_ism_param_dec_tc_gain_ajust( 


    for ( i = 0; i < nSamples; i++ )

    {

        ene_tc += transport_channels_f[0][i] * transport_channels_f[0][i] + transport_channels_f[1][i] * transport_channels_f[1][i];          /* L*L + R*R */

        ene_sum += ( transport_channels_f[0][i] + transport_channels_f[1][i] ) * ( transport_channels_f[0][i] + transport_channels_f[1][i] ); /* (L+R)*(L+R) */

        ene_tc += p_data_f[0][i] * p_data_f[0][i] + p_data_f[1][i] * p_data_f[1][i];          /* L*L + R*R */

        ene_sum += ( p_data_f[0][i] + p_data_f[1][i] ) * ( p_data_f[0][i] + p_data_f[1][i] ); /* (L+R)*(L+R) */

    }

    gain = sqrtf( ene_tc / ( ene_sum + EPSILON ) );

    if ( st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame > 1 )
@@ -1076,21 +1076,21 @@ void ivas_ism_param_dec_tc_gain_ajust( 
        grad = ( gain - last_gain ) / (float) nFadeLength; /* slope between two consecutive gains, 480 samples length */

        for ( i = 0; i < ( nFadeLength ); i++ )

        {

            transport_channels_f[0][i] *= ( last_gain + i * grad );

            transport_channels_f[1][i] *= ( last_gain + i * grad );

            p_data_f[0][i] *= ( last_gain + i * grad );

            p_data_f[1][i] *= ( last_gain + i * grad );

        }

        for ( ; i < nSamples; i++ )

        {

            transport_channels_f[0][i] *= gain;

            transport_channels_f[1][i] *= gain;

            p_data_f[0][i] *= gain;

            p_data_f[1][i] *= gain;

        }

    }

    else

    {

        for ( i = 0; i < nSamples; i++ )

        {

            transport_channels_f[0][i] *= gain;

            transport_channels_f[1][i] *= gain;

            p_data_f[0][i] *= gain;

            p_data_f[1][i] *= gain;

        }

    }

lib_dec/ivas_mc_param_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ void ivas_param_mc_dec_read_BS( 
void ivas_param_mc_dec_digest_tc(

    Decoder_Struct *st_ivas,   /* i/o: IVAS decoder handle                                       */

    const uint8_t nCldfbSlots, /* i  : number of CLDFB slots in transport channels               */

    float *transport_channels_f[] /* i/o: synthesized core-coder transport channels/DirAC output    */

    float *p_data_f[]          /* i/o: synthesized core-coder transport channels/DirAC output    */

)

{

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
@@ -1359,7 +1359,7 @@ void ivas_param_mc_dec_digest_tc( 
    {

        for ( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )

        {

            cldfbAnalysis_ts( &( transport_channels_f[ch][num_freq_bands * slot_idx] ),

            cldfbAnalysis_ts( &( p_data_f[ch][num_freq_bands * slot_idx] ),

                              &cldfb_real_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],

                              &cldfb_imag_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],

                              num_freq_bands, st_ivas->cldfbAnaDec[cldfb_ch] );
@@ -1377,7 +1377,7 @@ void ivas_param_mc_dec_digest_tc( 
            /* CLDFB Analysis*/

            for ( ch = 0; ch < nchan_transport; ch++ )

            {

                cldfbAnalysis_ts( &( transport_channels_f[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch] );

                cldfbAnalysis_ts( &( p_data_f[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer, ImagBuffer, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch] );



                mvr2r( RealBuffer, &hParamMC->Cldfb_RealBuffer_tc[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );

                mvr2r( ImagBuffer, &hParamMC->Cldfb_ImagBuffer_tc[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );