Commit 38c9b804 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1724_fix' into 'main' 

Fix for 3GPP issue 1724: Renderer MASA output metadata difference

See merge request !1753
parents b450c9d1 9c90a862

lib_com/ivas_dirac_com_fx.c

+18 −19
Original line number Diff line number Diff line
@@ -782,7 +782,6 @@ void computeDirectionVectors_fx( 
 *

 *

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



void computeDiffuseness_fixed(

    Word32 *buffer_intensity[DIRAC_NUM_DIMS][DIRAC_NO_COL_AVG_DIFF], // i: Q(q_factor_intensity)

    const Word32 *buffer_energy,                                     // i: Q(q_factor_energy)
@@ -795,10 +794,10 @@ void computeDiffuseness_fixed( 
{

    Word32 intensity_slow[DIRAC_NUM_DIMS * CLDFB_NO_CHANNELS_MAX];

    Word32 intensity_slow_abs[CLDFB_NO_CHANNELS_MAX];

    Word64 tmp_intensity_slow_abs[CLDFB_NO_CHANNELS_MAX];

    Word16 intensity_slow_abs_exp[CLDFB_NO_CHANNELS_MAX];

    Word64 intensity_slow_abs_64[CLDFB_NO_CHANNELS_MAX];

    Word16 intensity_slow_abs_q[CLDFB_NO_CHANNELS_MAX];

    Word32 energy_slow[CLDFB_NO_CHANNELS_MAX];

    Word16 i, j, k, tmp16;

    Word16 i, j, k;

    Word32 tmp = 0;

    move32();

    Word32 *p_tmp;
@@ -808,10 +807,8 @@ void computeDiffuseness_fixed( 


    /* Compute Intensity slow and energy slow buffer_intensity and buffer_energy */



    set_zero_fx( intensity_slow, DIRAC_NUM_DIMS * CLDFB_NO_CHANNELS_MAX );

    set_zero_fx( intensity_slow, i_mult( DIRAC_NUM_DIMS, CLDFB_NO_CHANNELS_MAX ) );

    set_zero_fx( intensity_slow_abs, CLDFB_NO_CHANNELS_MAX );

    set16_fx( intensity_slow_abs_exp, 0, CLDFB_NO_CHANNELS_MAX );

    set64_fx( tmp_intensity_slow_abs, 0, CLDFB_NO_CHANNELS_MAX );

    set_zero_fx( energy_slow, CLDFB_NO_CHANNELS_MAX );



    /* Calculate max possible shift for the buffer buffer_energy and buffer_intensity */
@@ -895,27 +892,31 @@ void computeDiffuseness_fixed( 
        q_intensity = s_min( q_intensity, q_tmp );

    }



    scale_sig32( intensity_slow, i_mult( DIRAC_NUM_DIMS, num_freq_bands ), -2 );

    q_intensity = sub( q_intensity, 2 );

    min_q_shift1 = getScaleFactor32( intensity_slow, i_mult( DIRAC_NUM_DIMS, num_freq_bands ) );

    min_q_shift1 = sub( min_q_shift1, idiv1616( add( find_guarded_bits_fx( DIRAC_NUM_DIMS ), 1 ), 2 ) );

    scale_sig32( intensity_slow, i_mult( DIRAC_NUM_DIMS, num_freq_bands ), min_q_shift1 );

    q_intensity = add( q_intensity, min_q_shift1 );

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

    {

        intensity_slow_abs_64[k] = 0;

        move64();

    }



    /* intensity_slow.^2 + intensity_slow_abs*/

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

    {

        p_tmp = intensity_slow + j * num_freq_bands;



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

        {

            tmp_intensity_slow_abs[k] = W_mac_32_32( tmp_intensity_slow_abs[k], p_tmp[k], p_tmp[k] );

            move64();

            intensity_slow_abs_64[k] = W_add( intensity_slow_abs_64[k], W_mult_32_32( p_tmp[k], p_tmp[k] ) ); // 2*q_intensity+1

        }

    }



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

    {

        tmp16 = W_norm( tmp_intensity_slow_abs[k] );

        intensity_slow_abs[k] = W_extract_h( W_shl( tmp_intensity_slow_abs[k], tmp16 ) );

        Word16 shift = W_norm( intensity_slow_abs_64[k] );

        intensity_slow_abs[k] = W_extract_h( W_shl( intensity_slow_abs_64[k], shift ) );

        move32();

        intensity_slow_abs_exp[k] = sub( 31, sub( add( add( shl( q_intensity, 1 ), 1 ), tmp16 ), 32 ) );

        intensity_slow_abs_q[k] = sub( add( add( q_intensity, q_intensity ), shift ), 31 );

        move16();

    }
@@ -925,8 +926,7 @@ void computeDiffuseness_fixed( 
    move16();

    FOR( i = 0; i < num_freq_bands; ++i )

    {

        exp1 = intensity_slow_abs_exp[i];

        move16();

        exp1 = sub( 31, intensity_slow_abs_q[i] );

        tmp = Sqrt32( p_tmp[i], &exp1 );



        tmp = BASOP_Util_Divide3232_Scale_newton( tmp, L_add( energy_slow[i], EPSILLON_FX ), &exp2 );
@@ -965,7 +965,6 @@ void computeDiffuseness_fixed( 
    return;

}





Word32 deindex_azimuth_fx(                             /* o  : output Q22                              */

                           Word16 id_phi,              /* i  : index                                   */

                           const Word16 no_bits,       /* i  : number of bits for the spherical grid   */

lib_rend/ivas_dirac_ana_fx.c

+15 −2
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ ivas_error ivas_dirac_ana_open_fx( 
            {

                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for OMASA data\n" ) );

            }

            set16_fx( hDirAC->direction_vector_e[i][j], 31, MASA_FREQUENCY_BANDS );

        }

    }
@@ -257,6 +258,7 @@ void ivas_dirac_ana_fx( 
    /* Estimate MASA parameters from the SBA signals */

    ivas_dirac_param_est_ana_fx( hDirAC, data_fx, elevation_m_values, azimuth_m_values, energyRatio, spreadCoherence, surroundingCoherence, input_frame );

    /* Create MASA metadata buffer from the estimated values */



    ivas_create_masa_out_meta_fx( hDirAC->hMasaOut, hDirAC->sph_grid16, nchan_transport, elevation_m_values, azimuth_m_values, energyRatio, spreadCoherence, surroundingCoherence, Q31, Q31, Q31 );



    /* Downmix */
@@ -334,13 +336,22 @@ static void ivas_dirac_param_est_ana_fx( 
            move32();

            hDirAC->direction_vector_m_fx[2][block_m_idx][band_m_idx] = 0;

            move32();



            hDirAC->direction_vector_e[0][block_m_idx][band_m_idx] = 0;

            move16();

            hDirAC->direction_vector_e[1][block_m_idx][band_m_idx] = 0;

            move16();

            hDirAC->direction_vector_e[2][block_m_idx][band_m_idx] = 0;

            move16();

        }



        /* Need to initialize renormalization_factors, and variables to be normalized */

        set32_fx( renormalization_factor_diff_fx, 0, hDirAC->nbands );

        set16_fx( renormalization_factor_diff_e, 31, hDirAC->nbands );

        set32_fx( diffuseness_m_fx, 0, hDirAC->nbands );

        set16_fx( diffuseness_e, 0, hDirAC->nbands );

        set32_fx( hDirAC->energy_fx[block_m_idx], 0, MASA_FREQUENCY_BANDS );

        set32_fx( hDirAC->energy_fx[block_m_idx], 0, MASA_FREQUENCY_BANDS );

        set16_fx( hDirAC->energy_e[block_m_idx], 0, MASA_FREQUENCY_BANDS );



        FOR( ts = mrange[0]; ts < mrange[1]; ts++ )

        {
@@ -351,7 +362,9 @@ static void ivas_dirac_param_est_ana_fx( 
            move16();

            FOR( i = 0; i < numAnalysisChannels; i++ )

            {

                cldfbAnalysis_ts_fx_fixed_q( &( data_fx[i][( l_ts * ts )] ), Foa_RealBuffer_fx[i], Foa_ImagBuffer_fx[i], l_ts, hDirAC->cldfbAnaEnc[i], &inp_q );

                inp_q = Q7;

                move16();

                cldfbAnalysis_ts_fx_var_q( &( data_fx[i][l_ts * ts] ), Foa_RealBuffer_fx[i], Foa_ImagBuffer_fx[i], l_ts, hDirAC->cldfbAnaEnc[i], &inp_q );

                cr_q = s_min( cr_q, getScaleFactor32( Foa_RealBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

                ci_q = s_min( ci_q, getScaleFactor32( Foa_ImagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

            }

lib_rend/ivas_mcmasa_ana_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ void ivas_mcmasa_param_est_ana_fx( 
            {

                inp_q = q_data;

                move16();

                cldfbAnalysis_ts_fx_fixed_q( &( data_fx[i][i_mult( l_ts, ts )] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hMcMasa->cldfbAnaEnc[i], &inp_q );

                cldfbAnalysis_ts_fx_var_q( &( data_fx[i][i_mult( l_ts, ts )] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hMcMasa->cldfbAnaEnc[i], &inp_q );

                cr_q = s_min( cr_q, getScaleFactor32( Chnl_ImagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

                ci_q = s_min( ci_q, getScaleFactor32( Chnl_RealBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

            }

lib_rend/ivas_omasa_ana_fx.c

+13 −9
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "ivas_rom_com.h"

#include "wmc_auto.h"





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

 * Local function prototypes

 *------------------------------------------------------------------------*/
@@ -170,6 +169,7 @@ ivas_error ivas_omasa_ana_open( 
            {

                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for OMASA data\n" ) );

            }

            set16_fx( hOMasa->direction_vector_e[i][j], 0, MASA_FREQUENCY_BANDS );

        }

    }
@@ -319,11 +319,11 @@ void ivas_omasa_ana_fx( 
    ivas_omasa_param_est_ana_fx( hOMasa, data_in_f_fx, *data_in_q, elevation_m_values_fx, azimuth_m_values_fx, energyRatio_fx, &energyRatio_q, spreadCoherence_fx, &spreadCoherence_q, surroundingCoherence_fx, &sorroundingCoherence_q, input_frame, nchan_ism );



    /* Create MASA metadata buffer from the estimated values */



    ivas_create_masa_out_meta_fx( hOMasa->hMasaOut, hOMasa->sph_grid16, nchan_transport, elevation_m_values_fx, azimuth_m_values_fx, energyRatio_fx, spreadCoherence_fx, surroundingCoherence_fx, Q31, Q31, Q31 );



    /* Downmix */

    ivas_omasa_dmx_fx( data_in_f_fx, data_in_q, input_frame, nchan_transport, nchan_ism, hOMasa->ism_azimuth_fx, hOMasa->ism_elevation_fx, hOMasa->prev_object_dm_gains_fx, hOMasa->interpolator_fx );



    return;

}
@@ -372,7 +372,6 @@ static void ivas_omasa_param_est_ana_fx( 
    Word32 renormalization_factor_diff_fx[MASA_FREQUENCY_BANDS];

    Word16 renormalization_factor_diff_e[MASA_FREQUENCY_BANDS];

    Word32 norm_tmp_fx;

    Word16 tmp_ener_e[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];



    Word32 dir_v_fx[DIRAC_NUM_DIMS] /*, L_tmp1, L_tmp2*/;

    Word16 dir_v_q /*, norm_tmp_q*/;
@@ -422,15 +421,23 @@ static void ivas_omasa_param_est_ana_fx( 
            move32();

            hOMasa->direction_vector_m_fx[2][block_m_idx][band_m_idx] = 0;

            move32();



            hOMasa->direction_vector_e[0][block_m_idx][band_m_idx] = 0;

            move16();

            hOMasa->direction_vector_e[1][block_m_idx][band_m_idx] = 0;

            move16();

            hOMasa->direction_vector_e[2][block_m_idx][band_m_idx] = 0;

            move16();

        }



        /* Need to initialize renormalization_factors, and variables to be normalized */



        set_zero_fx( renormalization_factor_diff_fx, hOMasa->nbands );

        set16_fx( renormalization_factor_diff_e, 0, hOMasa->nbands );

        set_zero_fx( diffuseness_m_fx, hOMasa->nbands );

        set16_fx( diffuseness_e, 0, hOMasa->nbands );

        set_zero_fx( hOMasa->energy_fx[block_m_idx], MASA_FREQUENCY_BANDS );



        set16_fx( tmp_ener_e[block_m_idx], 0, MASA_FREQUENCY_BANDS );

        set16_fx( hOMasa->energy_e[block_m_idx], 0, MASA_FREQUENCY_BANDS );



        FOR( ts = mrange[0]; ts < mrange[1]; ts++ )

        {
@@ -441,10 +448,8 @@ static void ivas_omasa_param_est_ana_fx( 
            move16();

            FOR( i = 0; i < nchan_ism; i++ )

            {



                inp_q = data_f_q;

                move16();

                cldfbAnalysis_ts_fx_fixed_q( &( data_f_fx[i][i_mult( l_ts, ts )] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hOMasa->cldfbAnaEnc[i], &inp_q );

                cldfbAnalysis_ts_fx_var_q( &( data_f_fx[i][i_mult( l_ts, ts )] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hOMasa->cldfbAnaEnc[i], &inp_q );



                cr_q = s_min( cr_q, getScaleFactor32( Chnl_ImagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

                ci_q = s_min( ci_q, getScaleFactor32( Chnl_RealBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );
@@ -554,7 +559,6 @@ static void ivas_omasa_param_est_ana_fx( 
            FOR( band_m_idx = 0; band_m_idx < hOMasa->nbands; band_m_idx++ )

            {

                norm_tmp_fx = L_shl( Mult_32_32( reference_power_fx[ts][band_m_idx], L_sub( ONE_IN_Q30, diffuseness_vector_fx[band_m_idx] ) ), 1 ); /*2*inp_q-30*/



                hOMasa->direction_vector_m_fx[0][block_m_idx][band_m_idx] = BASOP_Util_Add_Mant32Exp( hOMasa->direction_vector_m_fx[0][block_m_idx][band_m_idx], hOMasa->direction_vector_e[0][block_m_idx][band_m_idx], Mult_32_32( norm_tmp_fx, direction_vector_fx[0][band_m_idx] ), shl( c_e, 1 ), &hOMasa->direction_vector_e[0][block_m_idx][band_m_idx] );

                move32();

                hOMasa->direction_vector_m_fx[1][block_m_idx][band_m_idx] = BASOP_Util_Add_Mant32Exp( hOMasa->direction_vector_m_fx[1][block_m_idx][band_m_idx], hOMasa->direction_vector_e[1][block_m_idx][band_m_idx], Mult_32_32( norm_tmp_fx, direction_vector_fx[1][band_m_idx] ), shl( c_e, 1 ), &hOMasa->direction_vector_e[1][block_m_idx][band_m_idx] );