Commit d052db7e authored by vaclav's avatar vaclav
Browse files

formal improvements + formatting

parent 209e4ed0

lib_enc/ivas_masa_enc.c

+7 −1
Original line number Diff line number Diff line
@@ -539,8 +539,10 @@ ivas_error ivas_masa_enc_config( 
#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

        masa_metadata_direction_alignment( hMasa );

#endif



#ifdef FIX_382_MASA_META_FRAMING_ASYNC

        detect_framing_async( hMasa ); /* detect the offset, set 1sf/4sf mode based on this. potentially also shift the metadata using a history buffer */



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

        {

            /* average over sub-frames */
@@ -2213,6 +2215,7 @@ static void detect_framing_async( 
}

#endif





#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

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

 * masa_metadata_direction_alignment()
@@ -2220,7 +2223,8 @@ static void detect_framing_async( 
 * In 2dir MASA metadata, determine the ordering of the directional

 * fields such that the azi/ele change across time is minimized.

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

void masa_metadata_direction_alignment(



static void masa_metadata_direction_alignment(

    MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder handle */

)

{
@@ -2371,5 +2375,7 @@ void masa_metadata_direction_alignment( 
            }

        } /* sf */

    }     /* band */



    return;

}

#endif

lib_enc/ivas_stat_enc.h

+3 −0
Original line number Diff line number Diff line
@@ -748,6 +748,7 @@ typedef struct ivas_masa_dir_align_struct 


    float previous_azi_dir2[MASA_FREQUENCY_BANDS];

    float previous_ele_dir2[MASA_FREQUENCY_BANDS];



} MASA_DIR_ALIGN_STATE, *MASA_DIR_ALIGN_HANDLE;

#endif
@@ -759,6 +760,7 @@ typedef struct ivas_masa_sync_struct 
    uint8_t prev_sim_stop;

    uint8_t prev_offset;

    MASA_FRAME_MODE frame_mode;



} MASA_SYNC_STATE, *MASA_SYNC_HANDLE;

#endif
@@ -788,6 +790,7 @@ typedef struct ivas_masa_encoder_data_struct 
#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

    MASA_DIR_ALIGN_STATE dir_align_state;

#endif



} MASA_ENCODER_DATA;



typedef struct ivas_masa_encoder_struct