Commit 3d507ef4 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_672_NOKIA_TODO

parent 3bd602cf

lib_com/ivas_masa_com.c

+0 −6
Original line number Diff line number Diff line
@@ -897,10 +897,8 @@ void reconstruct_ism_ratios( 


void ivas_omasa_modify_masa_energy_ratios(

    IVAS_QMETADATA_HANDLE hQMetaData /* i/o: q_metadata handle  */

#ifdef FIX_672_NOKIA_TODO

    ,

    float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_MAXIMUM_CODING_SUBBANDS]

#endif

)

{

    int16_t i, m, d, b;
@@ -920,11 +918,7 @@ void ivas_omasa_modify_masa_energy_ratios( 
        {

            for ( d = 0; d < hQMetaData->no_directions; d++ )

            {

#ifdef FIX_672_NOKIA_TODO

                hQMetaData->q_direction[d].band_data[b].energy_ratio[m] = hQMetaData->q_direction[d].band_data[b].energy_ratio[m] * masa_to_total_energy_ratio[i][b];

#else

                hQMetaData->q_direction[d].band_data[b].energy_ratio[m] = hQMetaData->q_direction[d].band_data[b].energy_ratio[m] * hQMetaData->masa_to_total_energy_ratio[i][b];

#endif

            }

        }

    }

lib_com/ivas_prot.h

+0 −6
Original line number Diff line number Diff line
@@ -6184,11 +6184,7 @@ void ivas_omasa_set_edited_objects( 
);

#endif

void ivas_omasa_encode_masa_to_total(

#ifdef FIX_672_NOKIA_TODO

    float masa_to_total_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],

#else

    IVAS_QMETADATA_HANDLE hQMetaData,

#endif

    BSTR_ENC_HANDLE hMetaData,

    const int16_t low_bitrate_mode,

    const int16_t nbands,
@@ -6205,10 +6201,8 @@ void ivas_omasa_decode_masa_to_total( 


void ivas_omasa_modify_masa_energy_ratios(

    IVAS_QMETADATA_HANDLE hQMetaData                            /* i/o: q_metadata handle                       */

#ifdef FIX_672_NOKIA_TODO

    ,

    float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_MAXIMUM_CODING_SUBBANDS]

#endif

);



#endif

lib_com/ivas_stat_com.h

+0 −7
Original line number Diff line number Diff line
@@ -484,9 +484,7 @@ typedef struct ivas_masa_config_struct 
    uint8_t useCoherence;

    uint8_t coherencePresent;

    uint8_t mergeRatiosOverSubframes;

#ifdef FIX_672_NOKIA_TODO

    IVAS_FORMAT input_ivas_format;

#endif



} MASA_CODEC_CONFIG;
@@ -579,11 +577,6 @@ typedef struct ivas_masa_qmetadata_frame_struct 
    int16_t ec_flag;

    float dir_comp_ratio;

    uint8_t is_masa_ivas_format;

#ifndef FIX_672_NOKIA_TODO

#ifdef MASA_AND_OBJECTS

    float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; /* TODO Nokia: This should be moved to some other place and reserved only when needed. */

#endif

#endif



} IVAS_QMETADATA, *IVAS_QMETADATA_HANDLE;

lib_com/options.h

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






#define FIX_672_NOKIA_TODO                              /* Nokia: Issue #672: Resolve Nokia TODOs */

#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */



#define SBA_AND_OBJECTS

lib_dec/ivas_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -557,11 +557,7 @@ ivas_error ivas_dec( 


        /* Set the number of objects for the parametric rendering */

        dirac_bs_md_write_idx = 0;

#ifdef FIX_672_NOKIA_TODO

        if ( st_ivas->hSpatParamRendCom != NULL )

#else

        if ( st_ivas->hDirAC != NULL ) /* TODO: should this check for st_ivas->hSpatParamRendCom != NULL ? */

#endif

        {

            st_ivas->hSpatParamRendCom->numIsmDirections = 0;

            if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )