Commit 9c69d838 authored by multrus's avatar multrus
Browse files

Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec into new-osba-baseline

parents f4bc412c 4a1c0153

lib_enc/ivas_osba_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -136,17 +136,11 @@ ivas_error ivas_osba_enc_open( 
    }

#endif

#endif

    set_zero( hOSba->broadband_energy_sm, MAX_NUM_OBJECTS + FOA_CHANNELS );

    set_zero( hOSba->broadband_energy_prev, MAX_NUM_OBJECTS + FOA_CHANNELS );

    hOSba->prev_selected_object = 0;

    hOSba->changing_object = 0;



    input_frame = (int16_t) ( st_ivas->hEncoderConfig->input_Fs / FRAMES_PER_SEC );

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

    {

        hOSba->interpolator[i] = ( (float) i ) / ( (float) input_frame );

        hOSba->fade_out_gain[i] = ( 1.0f + cosf( ( (float) i ) / ( (float) input_frame ) * EVS_PI ) ) / 2.0f;

        hOSba->fade_in_gain[i] = 1.0f - hOSba->fade_out_gain[i];

    }



    st_ivas->hOSba = hOSba;

lib_enc/ivas_stat_enc.h

+1 −7
Original line number Diff line number Diff line
@@ -946,14 +946,8 @@ typedef struct ivas_osba_enc_data_structure 
    float interpolator[L_FRAME48k];



    float prev_object_dm_gains[MAX_NUM_OBJECTS][MAX_INPUT_CHANNELS];

    float broadband_energy_sm[MAX_NUM_OBJECTS + FOA_CHANNELS];

    float broadband_energy_prev[MAX_NUM_OBJECTS + FOA_CHANNELS];

    int16_t prev_selected_object;

    uint8_t changing_object;

    float fade_out_gain[L_FRAME48k];

    float fade_in_gain[L_FRAME48k];



    float energy_ism[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; /* TODO Nokia: Make an own struct for these, and reserve it only when needed. */

    float energy_ism[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; 

    float energy_ratio_ism[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS];

    int16_t nchan_ism;