Commit 9039f6d1 authored by vaclav's avatar vaclav
Browse files

FIX_2649_RESET_ISM_METADATA

parent f51f2c58

lib_com/ivas_ism_com_fx.c

+8 −3
Original line number Diff line number Diff line
@@ -438,17 +438,17 @@ ivas_error ivas_ism_config_fx( 
        bitbudget_to_brate( bits_CoreCoder, total_brate, n_ISms );

    }





    return error;

}





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

 * ivas_ism_reset_metadata()

 *

 * Reset ISM metadata parameters

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



void ivas_ism_reset_metadata(

void ivas_ism_reset_metadata_fx(

    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle     */

)

{
@@ -488,6 +488,7 @@ void ivas_ism_reset_metadata( 
    return;

}



#ifndef FIX_2649_RESET_ISM_METADATA

void ivas_ism_reset_metadata_enc(

    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle     */

)
@@ -509,7 +510,7 @@ void ivas_ism_reset_metadata_enc( 


    return;

}



#endif



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

 * ivas_ism_reset_metadata_API()
@@ -521,7 +522,11 @@ void ivas_ism_reset_metadata_API( 
    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle     */

)

{

#ifdef FIX_2649_RESET_ISM_METADATA

    ivas_ism_reset_metadata_fx( hIsmMeta );

#else

    ivas_ism_reset_metadata_enc( hIsmMeta );

#endif



    return;

}

lib_com/ivas_prot_fx.h

+3 −2
Original line number Diff line number Diff line
@@ -5926,14 +5926,15 @@ void bitbudget_to_brate( 
    const Word16 N                                              /* i  : number of entries to be converted           */

);



void ivas_ism_reset_metadata(

void ivas_ism_reset_metadata_fx(

    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handles                        */

);



#ifndef FIX_2649_RESET_ISM_METADATA

void ivas_ism_reset_metadata_enc(

    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handle                         */

);



#endif

void ivas_ism_reset_metadata_API(

    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handles                        */

);

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC       /* FhG: harmonize generate_comfort_noise_dec_fx() and generate_comfort_noise_dec_ivas_fx() */

#define FIX_2649_RESET_ISM_METADATA                     /* VA: basop issue 2649: harmonize ISM metadata reset */



/* #################### End BE switches ################################## */

lib_dec/ivas_ism_metadata_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ void ivas_ism_reset_metadata_handle_dec_fx( 
    hIsmMeta->ism_md_lowrate_flag = 0;

    move16();



    ivas_ism_reset_metadata( hIsmMeta );

    ivas_ism_reset_metadata_fx( hIsmMeta );



    return;

}

lib_enc/ivas_ism_metadata_enc_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -982,7 +982,11 @@ ivas_error ivas_ism_metadata_enc_create_fx( 
        st_ivas->hIsmMetaData[ch]->q_elevation_old_fx = 0;

        move16();



#ifdef FIX_2649_RESET_ISM_METADATA

        ivas_ism_reset_metadata_fx( st_ivas->hIsmMetaData[ch] );

#else 

        ivas_ism_reset_metadata_enc( st_ivas->hIsmMetaData[ch] );

#endif



        st_ivas->hIsmMetaData[ch]->last_azimuth_fx = 0; // Q22

        move32();
@@ -1031,11 +1035,13 @@ ivas_error ivas_ism_metadata_enc_create_fx( 
    return IVAS_ERR_OK;

}





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

 * encode_radius()

 *

 * Radius index encoding

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



static void encode_radius_fx(

    BSTR_ENC_HANDLE hBstr,               /* i/o: bitstream handle               */

    Word16 *last_radius_idx,             /* i/o: last radius index              */