Commit e287a7ad authored by multrus's avatar multrus
Browse files

Merge branch '373-msan-error-in-decoding-masa-to-ext' into 'main' 

Resolve "Msan error in decoding MASA to EXT"

See merge request !520
parents 6f413198 eba4f1a9

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

#ifdef FIX_350_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

#ifdef FIX_350_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

#ifdef FIX_350_MASA_DELAY_COMP

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

#endif

);

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

#ifdef FIX_350_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 */

lib_enc/ivas_masa_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ ivas_error ivas_masa_enc_config( 


    ivas_set_qmetadata_maxbit_req( hQMetaData, ivas_format );



#ifdef FIX_373_MASA_DELAY_COMP

#ifdef FIX_350_MASA_DELAY_COMP

    masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs, NULL );

#else

    masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs );