Commit 1165de2e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_505_MASA_SPHGRID_REUSE

parent 0fe671ec

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ 






#define FIX_505_MASA_SPHGRID_REUSE                      /* Nokia: Fix issue #505: MASA spherical grid reuse fix */



#define FIX_481_UNUSED_VARIABLES                        /* Nokia: Fix issue #481: Unused debug variables */

lib_enc/ivas_masa_enc.c

+0 −30
Original line number Diff line number Diff line
@@ -64,10 +64,8 @@ static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_H 
static void average_masa_metadata( MASA_METADATA_FRAME *masaMetadata, float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]

                                   ,

                                   const SPHERICAL_GRID_DATA *sphGrid

#ifdef FIX_505_MASA_SPHGRID_REUSE

                                   ,

                                   const uint8_t useSphGrid

#endif

);



static void copy_masa_metadata_subframe( const MASA_METADATA_HANDLE hMetaFrom, const uint8_t sfFrom, MASA_METADATA_HANDLE hMetaTo, const uint8_t sfTo );
@@ -496,9 +494,6 @@ ivas_error ivas_masa_enc_config( 
    uint8_t maxBand;

    int16_t maxBin, sf;

    ivas_error error;

#ifndef FIX_505_MASA_SPHGRID_REUSE

    SPHERICAL_GRID_DATA *sphGrid;

#endif



    error = IVAS_ERR_OK;
@@ -519,31 +514,12 @@ ivas_error ivas_masa_enc_config( 


        if ( hMasa->data.sync_state.frame_mode == MASA_FRAME_1SF && hMasa->data.sync_state.prev_offset != 0 )

        {

#ifndef FIX_505_MASA_SPHGRID_REUSE

            if ( ( sphGrid = (SPHERICAL_GRID_DATA *) malloc( sizeof( SPHERICAL_GRID_DATA ) ) ) == NULL )

            {

                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA spherical grid\n" ) );

            }



            if ( ivas_total_brate == IVAS_512k )

            {

                generate_gridEq( sphGrid );

            }

            else

            {

                sphGrid->no_theta = 0;

            }

#endif



            /* average over sub-frames */

            average_masa_metadata( &( hMasa->masaMetadata ), hMasa->data.energy

                                   ,

#ifdef FIX_505_MASA_SPHGRID_REUSE

                                   &( hMasa->data.Sph_Grid16 ),

                                   ivas_total_brate == IVAS_512k ? TRUE : FALSE

#else

                                   sphGrid

#endif

            );

        }
@@ -1810,10 +1786,8 @@ static void average_masa_metadata( 
    float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]

    ,

    const SPHERICAL_GRID_DATA *Sph_Grid16

#ifdef FIX_505_MASA_SPHGRID_REUSE

    ,

    const uint8_t useSphGrid

#endif

)

{

    int16_t i, j, k;
@@ -1861,11 +1835,7 @@ static void average_masa_metadata( 
            j = 0;

            hMeta->directional_meta[i].azimuth[j][k] = atan2f( y_sum, x_sum ) / EVS_PI * 180.0f;

            hMeta->directional_meta[i].elevation[j][k] = atan2f( z_sum, sqrtf( x_sum * x_sum + y_sum * y_sum ) ) / EVS_PI * 180.0f;

#ifdef FIX_505_MASA_SPHGRID_REUSE

            if ( useSphGrid == TRUE )

#else

            if ( Sph_Grid16->no_theta > 0 )

#endif

            {

                hMeta->directional_meta[i].spherical_index[j][k] = index_theta_phi_16( &( hMeta->directional_meta[i].elevation[j][k] ),

                                                                                       &( hMeta->directional_meta[i].azimuth[j][k] ), Sph_Grid16 );