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

[cleanup] merge FIX_373_MASA_DELAY_COMP_MSAN into FIX_373_MASA_DELAY_COMP

parent 1cbc09db

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -956,10 +956,8 @@ typedef enum 


#ifdef FIX_350_MASA_DELAY_COMP

#define DELAY_MASA_PARAM_DEC_SFR                2                           /* Delay to be compensation for MASA parameters in the decoder (subframes) */

#ifdef FIX_373_MASA_DELAY_COMP_MSAN

#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 )                        /* Spherical index corresponding to front direction for setting as default value */

#endif

#endif



#define DIRAC_SLOT_NS                           1250000L                    /* time duration of a time slot, 1.25ms (==DELAY_RENERER_NS/MAX_PARAM_SPATIAL_SUBFRAMES) */

#define DIRAC_SLOT_ENC_NS                       5000000L

lib_com/ivas_masa_com.c

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ void masa_sample_rate_band_correction( 
    int16_t *band_mapping,            /* i/o: Band mapping used and modified        */

    IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification  */

    const int32_t sampling_rate       /* i  : Sampling rate                         */

#ifdef FIX_373_MASA_DELAY_COMP_MSAN

#ifdef FIX_373_MASA_DELAY_COMP

    ,

    MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */

#endif
@@ -390,7 +390,7 @@ void masa_sample_rate_band_correction( 
            hQMetaData->twoDirBands[band] = 0;

        }

    }

#ifdef FIX_373_MASA_DELAY_COMP_MSAN

#ifdef FIX_373_MASA_DELAY_COMP

    if ( hExtOutMeta != NULL )

    {

        /* in decoder, zero the EXT out MASA meta buffer */

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -4619,7 +4619,7 @@ void masa_sample_rate_band_correction( 
    int16_t *band_mapping,                                      /* i/o: Band mapping used and modified                  */

    IVAS_QMETADATA_HANDLE hQMetaData,                           /* i/o: QMetadata structure for modification            */

    const int32_t sampling_rate                                 /* i  : sampling rate                                   */

#ifdef FIX_373_MASA_DELAY_COMP_MSAN

#ifdef FIX_373_MASA_DELAY_COMP

    , MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta             /* i/o: MASA decoder metadata ext out buffer             */

#endif

);

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ 
/*#define SBA_HPF_TUNING_DEC*/



#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */

#define FIX_373_MASA_DELAY_COMP_MSAN                    /* Nokia: Issue 373: MASA audio/meta delay compensation. MSAN bugfix */



#define OTR_REFERENCE_VECTOR_TRACKING                 /* FhG: enables the reference position orientation tracking mode */

lib_dec/ivas_masa_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static ivas_error ivas_masa_dec_config( 


    ivas_set_qmetadata_maxbit_req( st_ivas->hQMetaData, st_ivas->ivas_format );



#ifdef FIX_373_MASA_DELAY_COMP_MSAN

#ifdef FIX_373_MASA_DELAY_COMP

    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

    {

        /* need to apply the sampling rate correction also for the EXT output MASA meta buffer */