Commit 1f856788 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_398_MASA_DIRECTION_ALIGNMENT

parent 500bc9a5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ 
#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

#define FIX_419_ISM_MD_FIX                              /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */

#define FIX_I414_OOA_CNA                                /* VA: Issue 414: Fixing out-of-array write operation in stereo CNA */

lib_enc/ivas_masa_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -76,9 +76,7 @@ static uint8_t are_masa_subframes_similar( const MASA_METADATA_HANDLE frame1, co 


static void detect_framing_async( MASA_ENCODER_HANDLE hMasa );



#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

static void masa_metadata_direction_alignment( MASA_ENCODER_HANDLE hMasa );

#endif



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

 * Local constants
@@ -150,12 +148,10 @@ ivas_error ivas_masa_enc_open( 
    hMasa->data.sync_state.prev_offset = 0;

    hMasa->data.sync_state.frame_mode = MASA_FRAME_4SF;



#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

    set_zero( hMasa->data.dir_align_state.previous_azi_dir1, MASA_FREQUENCY_BANDS );

    set_zero( hMasa->data.dir_align_state.previous_ele_dir1, MASA_FREQUENCY_BANDS );

    set_zero( hMasa->data.dir_align_state.previous_azi_dir2, MASA_FREQUENCY_BANDS );

    set_zero( hMasa->data.dir_align_state.previous_ele_dir2, MASA_FREQUENCY_BANDS );

#endif



    st_ivas->hMasa = hMasa;
@@ -525,9 +521,7 @@ ivas_error ivas_masa_enc_config( 


    if ( ivas_format == MASA_FORMAT )

    {

#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

        masa_metadata_direction_alignment( hMasa );

#endif



        detect_framing_async( hMasa ); /* detect the offset, set 1sf/4sf mode based on this. potentially also shift the metadata using a history buffer */
@@ -2177,7 +2171,6 @@ static void detect_framing_async( 
}





#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

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

 * masa_metadata_direction_alignment()

 *
@@ -2339,4 +2332,3 @@ static void masa_metadata_direction_alignment( 


    return;

}
 
#endif

lib_enc/ivas_stat_enc.h

+0 −4
Original line number Diff line number Diff line
@@ -751,7 +751,6 @@ typedef struct ivas_mc_paramupmix_enc_data_structure 
 * MASA encoder structures

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



#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

typedef struct ivas_masa_dir_align_struct

{

    float previous_azi_dir1[MASA_FREQUENCY_BANDS];
@@ -761,7 +760,6 @@ typedef struct ivas_masa_dir_align_struct 
    float previous_ele_dir2[MASA_FREQUENCY_BANDS];



} MASA_DIR_ALIGN_STATE, *MASA_DIR_ALIGN_HANDLE;

#endif



/* structure storing MASA framing sync detection and compensation data */

typedef struct ivas_masa_sync_struct
@@ -791,9 +789,7 @@ typedef struct ivas_masa_encoder_data_struct 


    MASA_SYNC_STATE sync_state;



#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT

    MASA_DIR_ALIGN_STATE dir_align_state;

#endif



} MASA_ENCODER_DATA;